Elliott Hughes
3801189b58
am 7cff30c7: am b7f0693a: Merge "Remove bogus #include <endian.h> from <sys/stat.h>."
...
* commit '7cff30c7c67454e5b0f97c0dcc6261c73ae664c8':
Remove bogus #include <endian.h> from <sys/stat.h>.
2014-12-18 23:35:21 +00:00
Elliott Hughes
53544f5af6
am 7d4d2297: am 8597c2b3: Merge "Split the shared group data from the shared passwd data."
...
* commit '7d4d2297856106f132283c4e501b7210fc7b0bd8':
Split the shared group data from the shared passwd data.
2014-12-18 23:35:20 +00:00
Elliott Hughes
28bba7b488
am e14086a8: am a9c940a6: Merge "Fix struct stat member types for x86-64."
...
* commit 'e14086a8fc137c9900ad895556710385fc423e10':
Fix struct stat member types for x86-64.
2014-12-18 23:35:18 +00:00
Elliott Hughes
7cff30c7c6
am b7f0693a: Merge "Remove bogus #include <endian.h> from <sys/stat.h>."
...
* commit 'b7f0693aaac9907070443ee6e47fe1d594b42251':
Remove bogus #include <endian.h> from <sys/stat.h>.
2014-12-18 23:27:47 +00:00
Elliott Hughes
b7f0693aaa
Merge "Remove bogus #include <endian.h> from <sys/stat.h>."
2014-12-18 23:24:26 +00:00
Elliott Hughes
7d4d229785
am 8597c2b3: Merge "Split the shared group data from the shared passwd data."
...
* commit '8597c2b3f2ac3df9abe30378cdd3ecd559d995e7':
Split the shared group data from the shared passwd data.
2014-12-18 23:15:40 +00:00
Elliott Hughes
8597c2b3f2
Merge "Split the shared group data from the shared passwd data."
2014-12-18 23:12:45 +00:00
Elliott Hughes
0c92e8c3d1
Remove bogus #include <endian.h> from <sys/stat.h>.
...
Bug: 17062519
Change-Id: I3dc21ee8b90580f112c73c72aff5d3bec4778026
2014-12-18 15:10:19 -08:00
Elliott Hughes
e14086a8fc
am a9c940a6: Merge "Fix struct stat member types for x86-64."
...
* commit 'a9c940a69a5ad01a92620594d41e462c5d46186e':
Fix struct stat member types for x86-64.
2014-12-18 23:10:03 +00:00
Elliott Hughes
a9c940a69a
Merge "Fix struct stat member types for x86-64."
2014-12-18 23:05:20 +00:00
Elliott Hughes
1c52e6c926
Fix struct stat member types for x86-64.
...
Bug: 17062519
Change-Id: I93b1e8b1d4b6918ab7c3a985e2f7da277077375e
2014-12-18 15:03:33 -08:00
Elliott Hughes
7874f1d718
Split the shared group data from the shared passwd data.
...
Found by the toybox id(1) which calls both getpwuid(3) and getgrgid(3) before
looking at either result. The use of a shared buffer in this code meant that
even on a single thread, the data for any of the passwd functions would be
clobbered by the data for any of the group functions (or vice versa).
This might seem like an insufficient fix, but POSIX explicitly says (for
getpwnam) that the result "might be overwritten by a subsequent call to
getpwent(), getpwnam(), or getpwuid()" and likewise for other members of
that group, plus equivalent text for the group-related functions.
Change-Id: I2272f47e91f72e043fdaf7c169fa9f6978ff4370
2014-12-18 15:01:10 -08:00
Dan Albert
6aed1a1358
am ec3601cd: am 9dd5ab46: Merge "Disable ASAN for more of our libraries."
...
* commit 'ec3601cdf4730e5ec1559079486bbb4f9a43e042':
Disable ASAN for more of our libraries.
2014-12-18 21:50:34 +00:00
Yabin Cui
858e239094
am 9a734138: am 370a3e57: Merge "Sync with upstream for gethnamaddr.c."
...
* commit '9a734138138fcde0a2f0935e86246b9d7ff0ccb1':
Sync with upstream for gethnamaddr.c.
2014-12-18 21:49:52 +00:00
Dan Albert
ec3601cdf4
am 9dd5ab46: Merge "Disable ASAN for more of our libraries."
...
* commit '9dd5ab46194a3ef7992b0c08d18f2e30551f9331':
Disable ASAN for more of our libraries.
2014-12-18 16:10:45 +00:00
Dan Albert
9dd5ab4619
Merge "Disable ASAN for more of our libraries."
2014-12-18 16:07:15 +00:00
Dan Albert
da194780b1
Disable ASAN for more of our libraries.
...
Since ASAN depends on these libraries, we need to exclude them from
being instrumented.
Change-Id: I62005b6d04ee7b2283c4bd54ace5304386c67358
2014-12-18 08:03:49 -08:00
Yabin Cui
9a73413813
am 370a3e57: Merge "Sync with upstream for gethnamaddr.c."
...
* commit '370a3e573d1cdff6070c77322d4a07bd53e5db3c':
Sync with upstream for gethnamaddr.c.
2014-12-18 01:11:56 +00:00
Yabin Cui
370a3e573d
Merge "Sync with upstream for gethnamaddr.c."
2014-12-18 01:06:10 +00:00
Yabin Cui
58d33a51f3
Sync with upstream for gethnamaddr.c.
...
Bug: 18566967
Change-Id: I37e7410226b49eec67614e20b2c1d5e3e47817a5
2014-12-17 16:19:27 -08:00
Dmitriy Ivanov
c24329c710
am 4c344aff: am 92b9cb2c: Merge "Add another test for weak-reference"
...
* commit '4c344affba81b630241fd4e012e90fe594a7b196':
Add another test for weak-reference
2014-12-16 22:10:00 +00:00
Dmitriy Ivanov
4c344affba
am 92b9cb2c: Merge "Add another test for weak-reference"
...
* commit '92b9cb2c899c386954b8f9ad8111aa6c8c63e306':
Add another test for weak-reference
2014-12-16 22:06:05 +00:00
Dmitriy Ivanov
92b9cb2c89
Merge "Add another test for weak-reference"
2014-12-16 22:01:47 +00:00
Elliott Hughes
50b6dc34f1
am 48bc703a: am 3a50b65f: Merge "Fix <net/route.h>."
...
* commit '48bc703a3c30512f06f65f2660ed9d2841b0acce':
Fix <net/route.h>.
2014-12-16 20:35:01 +00:00
Dmitriy Ivanov
bfa88bca5c
Add another test for weak-reference
...
This one covers undefined weak reference in .so
referenced via JUMP_SLOT relocation.
Bug: 17526061
Change-Id: Ib8764bd30c1f686c4818ebbc6683cf42dee908b2
2014-12-16 19:46:45 +00:00
Elliott Hughes
48bc703a3c
am 3a50b65f: Merge "Fix <net/route.h>."
...
* commit '3a50b65fd152b4a50dc15ec33f19080e8724b02c':
Fix <net/route.h>.
2014-12-16 16:58:33 +00:00
Elliott Hughes
3a50b65fd1
Merge "Fix <net/route.h>."
2014-12-16 16:53:25 +00:00
Elliott Hughes
badd7e1a58
Fix <net/route.h>.
...
Previously it couldn't be included alone. Also add a header and include guard,
and fix its siblings' include guards.
Bug: https://code.google.com/p/android/issues/detail?id=82638
Change-Id: I32139a4bda0a6b015508a2319bf4e1a1453345f2
2014-12-15 18:47:14 -08:00
Elliott Hughes
63978deca9
am 7de05306: am 16ea2790: Merge "Move the generic arm memcmp.S into the generic directory."
...
* commit '7de05306c6f3b3077b025d5dd3eade2f125535d5':
Move the generic arm memcmp.S into the generic directory.
2014-12-15 21:32:11 +00:00
Elliott Hughes
7de05306c6
am 16ea2790: Merge "Move the generic arm memcmp.S into the generic directory."
...
* commit '16ea2790a84b1e65dc1e485c3ec494de787cc490':
Move the generic arm memcmp.S into the generic directory.
2014-12-15 19:38:34 +00:00
Elliott Hughes
16ea2790a8
Merge "Move the generic arm memcmp.S into the generic directory."
2014-12-15 19:32:42 +00:00
Elliott Hughes
c45b108deb
am a2bfb531: am ad01c983: Merge "Remove arm assembler not referenced from any makefile."
...
* commit 'a2bfb53107a7b770e9ad93287be5745271067786':
Remove arm assembler not referenced from any makefile.
2014-12-15 19:27:20 +00:00
Elliott Hughes
a2bfb53107
am ad01c983: Merge "Remove arm assembler not referenced from any makefile."
...
* commit 'ad01c9831918ecae815db2406022ef69e74f6e6d':
Remove arm assembler not referenced from any makefile.
2014-12-15 19:20:50 +00:00
Elliott Hughes
1ef6ec40e1
Move the generic arm memcmp.S into the generic directory.
...
Change-Id: I48e4d14a0dcddbb246edbac6d0329619574ab44d
2014-12-15 11:06:34 -08:00
Elliott Hughes
ad01c98319
Merge "Remove arm assembler not referenced from any makefile."
2014-12-15 18:46:16 +00:00
Elliott Hughes
f92cc30571
Remove arm assembler not referenced from any makefile.
...
I also suspect that libc/arch-arm/bionic/memcmp.S is supposed to like in the
generic directory these days, but this change just removes dead code.
Change-Id: I9072488df6e9b7261d79b6014914a0e937cb387b
2014-12-14 17:52:32 -08:00
Yabin Cui
bb3579f878
am 96cd50f2: am 0e32e39d: Merge "Fix pthread key num calculation."
...
* commit '96cd50f2fc33b0d342f1733894b06fd59a725519':
Fix pthread key num calculation.
2014-12-13 03:03:51 +00:00
Yabin Cui
96cd50f2fc
am 0e32e39d: Merge "Fix pthread key num calculation."
...
* commit '0e32e39df0e487ec86d86627f1d4b43d1c8c524d':
Fix pthread key num calculation.
2014-12-13 02:59:05 +00:00
Yabin Cui
0e32e39df0
Merge "Fix pthread key num calculation."
2014-12-13 02:51:27 +00:00
Yabin Cui
6c238f2926
Fix pthread key num calculation.
...
Bug: 18723085
Change-Id: Iba2c834b350e4cdba0b2d771b221560a3e5df952
2014-12-12 17:00:08 -08:00
Elliott Hughes
1fc1c89810
am 7dc71bb9: am 732d65c1: Merge "[MIPS] Add sgidefs.h for mips64"
...
* commit '7dc71bb9d5f73dc2ffe6e070efe29e69b88c14a7':
[MIPS] Add sgidefs.h for mips64
2014-12-13 00:41:40 +00:00
Elliott Hughes
7dc71bb9d5
am 732d65c1: Merge "[MIPS] Add sgidefs.h for mips64"
...
* commit '732d65c1b1d33b2eadb5d6f2b1771c6fc536e23f':
[MIPS] Add sgidefs.h for mips64
2014-12-13 00:34:13 +00:00
Elliott Hughes
732d65c1b1
Merge "[MIPS] Add sgidefs.h for mips64"
2014-12-13 00:28:57 +00:00
Duane Sand
50a3c6949b
[MIPS] Add sgidefs.h for mips64
...
Sgidefs.h is needed by strace.
Replaced now-duplicate arch-mips64/include directory
by symlink to arch-mips/include.
Change-Id: I7808602cfa452eca3ffbdb94903f4c5bdb33efa3
2014-12-12 16:25:36 -08:00
Yabin Cui
04c0d4cb22
am 96794bd9: am 6d634f9b: Merge "make stack_protector_DeathTest work for gcc4.9"
...
* commit '96794bd9713882a4cd1452b7bca62729d10dc94c':
make stack_protector_DeathTest work for gcc4.9
2014-12-12 01:56:09 +00:00
Yabin Cui
96794bd971
am 6d634f9b: Merge "make stack_protector_DeathTest work for gcc4.9"
...
* commit '6d634f9baaf804a91c97e019c832c1e9611a903a':
make stack_protector_DeathTest work for gcc4.9
2014-12-12 01:43:50 +00:00
Yabin Cui
6d634f9baa
Merge "make stack_protector_DeathTest work for gcc4.9"
2014-12-12 01:38:33 +00:00
Yabin Cui
562ae1e6e4
make stack_protector_DeathTest work for gcc4.9
...
Bug: 18721888
Change-Id: I5f0b5c84319f56dbc4efb88e9d828138944667ae
2014-12-11 17:24:55 -08:00
Christopher Ferris
887a9a485c
am 3b811c81: am 3115b34c: Merge "fix runtime issues for scripts"
...
* commit '3b811c814e4ebe6591992141040ba5997a12407a':
fix runtime issues for scripts
2014-12-11 18:55:56 +00:00
Elliott Hughes
a70d54786f
am 1dff030e: am e7b8bc4e: Merge "Clean up DNS proxying."
...
* commit '1dff030e6eb527eeb4e7ed163cf19641fdb3872b':
Clean up DNS proxying.
2014-12-11 18:55:55 +00:00