Elliott Hughes
5eebae46cb
am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '1543fdf616ddebee7819214437527f380e5c743b':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:30:35 +00:00
Elliott Hughes
0f0c0475cb
am e5b11446: am e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."
...
* commit 'e5b11446897176720f74dd79cfc2cae208ea7739':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:27:43 +00:00
Elliott Hughes
1144dc404c
am f6aec385: am b5e7eba6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit 'f6aec385829c376d8df116713a9f76846addb8ac':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:27:43 +00:00
Elliott Hughes
e5b1144689
am e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."
...
* commit 'e8d9057e3005f6f53f8ef2e876b43aea7a892292':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:23:25 +00:00
Elliott Hughes
f6aec38582
am b5e7eba6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit 'b5e7eba6d1b97e471996fcfe7dbde7cbba7512ef':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:22:28 +00:00
Elliott Hughes
e698a7b5cf
am e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."
...
* commit 'e8d9057e3005f6f53f8ef2e876b43aea7a892292':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:20:57 +00:00
Elliott Hughes
1543fdf616
Work around a bug in Immersion's libImmEmulatorJ.so.
...
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug: 17443936
(cherry picked from commit 7d3f553f989f830976efa92ddc3c84661d4d42aa)
Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
(cherry picked from commit b5e7eba6d1b97e471996fcfe7dbde7cbba7512ef)
2014-10-07 23:17:14 +00:00
Elliott Hughes
b5e7eba6d1
Work around a bug in Immersion's libImmEmulatorJ.so.
...
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug: 17443936
(cherry picked from commit 7d3f553f989f830976efa92ddc3c84661d4d42aa)
Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
2014-10-07 16:08:46 -07:00
Elliott Hughes
e8d9057e30
Merge "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-07 23:08:12 +00:00
Elliott Hughes
7d3f553f98
Work around a bug in Immersion's libImmEmulatorJ.so.
...
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug: 17443936
Change-Id: I3b63c9a3dd63db0833f21073e323b3236a13b47a
2014-10-07 16:02:11 -07:00
Elliott Hughes
cee722b1cb
am 9eb0d554: resolved conflicts for merge of ea8dea8c to lmp-mr1-dev-plus-aosp
...
* commit '9eb0d554bad86a62c370e7c31fa19b5f3dc90b36':
Improve <sys/cdefs.h>.
2014-10-07 20:37:10 +00:00
Elliott Hughes
9eb0d554ba
resolved conflicts for merge of ea8dea8c to lmp-mr1-dev-plus-aosp
...
Change-Id: I368c83e83c56a0c14d395540a715f5c42f8eafa8
2014-10-07 13:33:09 -07:00
Elliott Hughes
ea8dea8cb7
Merge "Improve <sys/cdefs.h>." into lmp-mr1-dev
2014-10-07 18:51:36 +00:00
Dan Albert
6ff5aa092b
am 24095148: am eeb9aa02: Merge "Use snprintf instead of sprintf."
...
* commit '24095148c9952d402380d0b0ab8eb5da2a0bbd9a':
Use snprintf instead of sprintf.
2014-10-07 18:51:01 +00:00
Dan Albert
24095148c9
am eeb9aa02: Merge "Use snprintf instead of sprintf."
...
* commit 'eeb9aa02b7f307a1d9b80731dd69ef9dd2f47e47':
Use snprintf instead of sprintf.
2014-10-07 18:47:04 +00:00
Dan Albert
7c955d7797
am eeb9aa02: Merge "Use snprintf instead of sprintf."
...
* commit 'eeb9aa02b7f307a1d9b80731dd69ef9dd2f47e47':
Use snprintf instead of sprintf.
2014-10-07 18:46:32 +00:00
Elliott Hughes
d87d401ab1
Improve <sys/cdefs.h>.
...
Fix and use __RENAME (and lose ___RENAME --- two underscores should be
enough for anybody). This was the point of this change, because I want
to use __RENAME to support the two basename variants and the two
strerror_r variants.
Lose a bunch of macros that weren't being used.
Lose three dead files from the DNS code.
Bug: 17784968
(cherry picked from commit 2cfb4e8e2e217ef0e4140dcbf9b3da809781158c)
Change-Id: I5e96146f92c0521248c78c0933bec5e9a9818222
2014-10-07 11:40:09 -07:00
Dan Albert
eeb9aa02b7
Merge "Use snprintf instead of sprintf."
2014-10-07 18:38:11 +00:00
Dan Albert
b0fd55608e
Use snprintf instead of sprintf.
...
At -O0, the attribute warning on sprintf is actually triggered (why
doesn't this happen with -Os?!) and promoted to an error by -Werror.
asctime64_r() is a non-standard function, but the IBM docs state that
the buffer is assumed to be at least 26 characters wide, and the
format string does limit to that (assuming a 4 digit year, also
defined by the IBM docs).
http://www-01.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/asctimer.htm
Change-Id: I1c884474a769aa16c53e985c3d8d694c478c1189
2014-10-07 11:28:47 -07:00
Christopher Ferris
c5d30c27e6
am ac6fc5be: (-s ours) am 4aace385: am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit 'ac6fc5befd152814398bccb0443da6704f614f0f':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 18:03:05 +00:00
Christopher Ferris
ac6fc5befd
am 4aace385: am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit '4aace3852d2a83067c5ef10e06e2a33c6903940f':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 17:54:11 +00:00
Christopher Ferris
4aace3852d
am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit '2cf155713aaba451065d593335d544f2ada24ddf':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 17:42:39 +00:00
Dmitriy Ivanov
929ec5c950
am c4d97f51: am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit 'c4d97f51476def0852693b4002e9ba65df8cd5a6':
Fix 2nd arch prefix application
2014-10-07 17:14:21 +00:00
Dmitriy Ivanov
9ec3d2e69a
am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
Fix 2nd arch prefix application
2014-10-07 17:12:58 +00:00
Dmitriy Ivanov
c4d97f5147
am 6d2dd6a7: Merge "Fix 2nd arch prefix application"
...
* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
Fix 2nd arch prefix application
2014-10-07 17:12:11 +00:00
Dmitriy Ivanov
6d2dd6a740
Merge "Fix 2nd arch prefix application"
2014-10-07 17:04:24 +00:00
Dmitriy Ivanov
75d66dd9a7
Fix 2nd arch prefix application
...
Bug: 17887283
Change-Id: I7b3b2332212fe416d6b5f5c2e5c1e07605ba09aa
2014-10-07 09:46:46 -07:00
Christopher Ferris
5ad21d60fb
am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit '2cf155713aaba451065d593335d544f2ada24ddf':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 15:31:51 +00:00
Christopher Ferris
2cf155713a
am 40bc7cd4: (-s ours) DO NOT MERGE Re-add .save directive for arm assembler code.
...
* commit '40bc7cd4ed9fb848a7b3d934f69669f64ceed707':
DO NOT MERGE Re-add .save directive for arm assembler code.
2014-10-07 15:27:36 +00:00
Elliott Hughes
97300b3878
am 106edd3f: am 6c4e16f6: Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
...
* commit '106edd3fa795f41bd8b527732a6c2be74ff4164a':
further cleanup memcpy fortify implementation
2014-10-07 01:02:57 +00:00
Christopher Ferris
8d0c9dfc2c
am a87052c9: resolved conflicts for merge of 27355aff to lmp-mr1-dev-plus-aosp
...
* commit 'a87052c9a3f71f6017c3a4657d9ce01d8923e969':
Force export symbols on all x86 variants in libc.
2014-10-07 00:58:44 +00:00
Elliott Hughes
106edd3fa7
am 6c4e16f6: Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
...
* commit '6c4e16f634a8ee07fc0c3cc5299c9f7f03c5f8bf':
further cleanup memcpy fortify implementation
2014-10-07 00:55:38 +00:00
Christopher Ferris
a87052c9a3
resolved conflicts for merge of 27355aff to lmp-mr1-dev-plus-aosp
...
Change-Id: Ice2d5d99788eb1fd9bcdfc288a36742f6e73d360
2014-10-06 17:53:54 -07:00
Elliott Hughes
6c4e16f634
Merge "further cleanup memcpy fortify implementation" into lmp-mr1-dev
2014-10-07 00:30:34 +00:00
Christopher Ferris
27355affc1
am d11eac34: Force export symbols on all x86 variants in libc.
...
* commit 'd11eac3455a059a092ceee92eda9905e1d661e94':
Force export symbols on all x86 variants in libc.
2014-10-07 00:20:10 +00:00
Christopher Ferris
a0da9f976a
am 015a48af: am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '015a48af3634b7337561a35544ecf2bc78549b0f':
Force export symbols on all x86 variants in libc.
2014-10-07 00:03:54 +00:00
Nick Kralevich
3ccb3fcba4
am d9813e3e: am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'd9813e3e7fbf02955d2dd9f9c9ef97a8719b15a3':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-07 00:03:44 +00:00
Nick Kralevich
77e5dd7720
am 75a932c5: resolved conflicts for merge of 7ad2147a to lmp-mr1-dev-plus-aosp
...
* commit '75a932c5dd959a1678929a7a8211d30a85a907fc':
string.h: remove unused variable
2014-10-06 23:58:37 +00:00
Christopher Ferris
fae2ad067e
am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '81fca35672df90e2f770e67bbf7e7735c6ff8bd8':
Force export symbols on all x86 variants in libc.
2014-10-06 23:51:43 +00:00
Christopher Ferris
015a48af36
am 81fca356: Merge "Force export symbols on all x86 variants in libc."
...
* commit '81fca35672df90e2f770e67bbf7e7735c6ff8bd8':
Force export symbols on all x86 variants in libc.
2014-10-06 23:50:42 +00:00
Christopher Ferris
81fca35672
Merge "Force export symbols on all x86 variants in libc."
2014-10-06 23:45:03 +00:00
Christopher Ferris
6869d26ad9
Force export symbols on all x86 variants in libc.
...
For silvermont, the __popcountsi2 symbol does not get exported by libc.
But for atom, this symbol is exported. Since we already exported this symbol
for previous releases, it's better to just follow through and force
the export, but only for 32 bit. x86 64 bit will not export this symbol.
Bug: 17681440
(cherry picked from commit d11eac3455a059a092ceee92eda9905e1d661e94)
Change-Id: I93704c721d98d569922f606f214069bda24872ba
2014-10-06 16:41:46 -07:00
Christopher Ferris
9a7d31eb9c
Merge "resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-10-06 23:32:53 +00:00
Christopher Ferris
d61d2b7b80
resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp
...
Change-Id: I3cd9056d5d689b783f4afa870397ad4d9de357f5
2014-10-06 16:30:45 -07:00
Nick Kralevich
2d04b5e09f
am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 23:29:04 +00:00
Nick Kralevich
d9813e3e7f
am b5cba608: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit 'b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 23:28:47 +00:00
Nick Kralevich
b5cba6081b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 23:21:04 +00:00
Nick Kralevich
db408bf421
further cleanup memcpy fortify implementation
...
Bug: 17784968
(cherry picked from commit b84f667e9312611536a564700daea11c12b6fcfa)
Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383
2014-10-06 16:18:32 -07:00
Christopher Ferris
d11eac3455
Force export symbols on all x86 variants in libc.
...
For silvermont, the __popcountsi2 symbol does not get exported by libc.
But for atom, this symbol is exported. Since we already exported this symbol
for previous releases, it's better to just follow through and force
the export, but only for 32 bit. x86 64 bit will not export this symbol.
Bug: 17681440
Change-Id: I6c62245f0960910f64baaaf6d9d090bf3ea5f435
2014-10-06 15:51:26 -07:00
Nick Kralevich
75a932c5dd
resolved conflicts for merge of 7ad2147a to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie43710f4e5b8d5638bce505e9bef80e6cdd065bc
2014-10-06 15:50:24 -07:00