Elliott Hughes
0a0865a954
am 28bba7b4: am e14086a8: am a9c940a6: Merge "Fix struct stat member types for x86-64."
...
* commit '28bba7b488200093db5ec8831605c07bf75b88c5':
Fix struct stat member types for x86-64.
2014-12-19 00:08:05 +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
Dan Albert
54ea1ed18a
am 6aed1a13: am ec3601cd: am 9dd5ab46: Merge "Disable ASAN for more of our libraries."
...
* commit '6aed1a1358a3395e10913ca2b008db823b8f1987':
Disable ASAN for more of our libraries.
2014-12-18 23:21:02 +00:00
Yabin Cui
3c902c64a4
am 858e2390: am 9a734138: am 370a3e57: Merge "Sync with upstream for gethnamaddr.c."
...
* commit '858e239094ba014ec36bee7bab43da29525bbe3a':
Sync with upstream for gethnamaddr.c.
2014-12-18 23:21:01 +00: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
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
437fa965af
am c24329c7: am 4c344aff: am 92b9cb2c: Merge "Add another test for weak-reference"
...
* commit 'c24329c710a9ce0d9d9ee3b3d2f6a16b32fabc6a':
Add another test for weak-reference
2014-12-16 22:16:12 +00: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
1b8e7b6cf8
am 50b6dc34: am 48bc703a: am 3a50b65f: Merge "Fix <net/route.h>."
...
* commit '50b6dc34f196fd7216a7395a4f82dedf68f2bac2':
Fix <net/route.h>.
2014-12-16 21:49:25 +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
2e507db0e2
am 63978dec: am 7de05306: am 16ea2790: Merge "Move the generic arm memcmp.S into the generic directory."
...
* commit '63978deca9582e98576d7b12601e5e6dd163a0bb':
Move the generic arm memcmp.S into the generic directory.
2014-12-15 22:22:18 +00:00
Elliott Hughes
30fcb99ecd
am c45b108d: am a2bfb531: am ad01c983: Merge "Remove arm assembler not referenced from any makefile."
...
* commit 'c45b108deb70f02902cb3309ea0b287ee99d5095':
Remove arm assembler not referenced from any makefile.
2014-12-15 22:04:09 +00: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
Yabin Cui
e247fd38f8
am bb3579f8: am 96cd50f2: am 0e32e39d: Merge "Fix pthread key num calculation."
...
* commit 'bb3579f8787fb6cafe5e6373c91e78556f100dfc':
Fix pthread key num calculation.
2014-12-15 18:46:49 +00:00
Elliott Hughes
9ab3b08829
am 1fc1c898: am 7dc71bb9: am 732d65c1: Merge "[MIPS] Add sgidefs.h for mips64"
...
* commit '1fc1c8981043f949313103b9532cbc19dc3dd919':
[MIPS] Add sgidefs.h for mips64
2014-12-15 18:46:31 +00: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
927d57adde
am 04c0d4cb: am 96794bd9: am 6d634f9b: Merge "make stack_protector_DeathTest work for gcc4.9"
...
* commit '04c0d4cb2235c29f65b6b52660ff34c28c10c93e':
make stack_protector_DeathTest work for gcc4.9
2014-12-12 02:02:56 +00: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