Dan Albert
aca5f36de3
am 035c00d0: am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '035c00d09ce2b6b04d2c278b8dfadc302acc3de1':
Add basic compile time tests for sn?printf.
2014-10-08 20:17:24 +00:00
Dan Albert
035c00d09c
am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '5cc5c5ea0b7a5a2d523ea35c645a42b222929276':
Add basic compile time tests for sn?printf.
2014-10-08 20:13:35 +00:00
Dan Albert
5cc5c5ea0b
Merge "Add basic compile time tests for sn?printf."
2014-10-08 20:04:27 +00:00
Dan Albert
2fbb1b653e
Add basic compile time tests for sn?printf.
...
Bug: 17782583
Change-Id: I6443537c643d1cc6b4a8f2dab5c364f2fbc1faa3
2014-10-08 13:02:53 -07:00
Elliott Hughes
94b0a1f08e
am 3430ec18: am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '3430ec18a45830cde56393cf67ec34ad4169c9e1':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:53:54 +00:00
Elliott Hughes
3430ec18a4
am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '5a3ca374583f7605672d9e8f9098011de240f7c4':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:49:35 +00:00
Elliott Hughes
5a3ca37458
Merge "Revert "Work around a bug in Immersion's libImmEmulatorJ.so.""
2014-10-08 16:40:58 +00:00
Elliott Hughes
abb31de8f3
am 07b7385f: am e5d4fc39: am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '07b7385fc08055478cd7ec418cf160fbafae4d59':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 07:59:31 +00:00
Dan Albert
1c81bdfd3f
am d084b8d6: resolved conflicts for merge of 55ee845b to lmp-mr1-dev-plus-aosp
...
* commit 'd084b8d6b8c08fb399ba1127063c15a8c970c710':
Inline helpers need to be exported unmangled.
2014-10-08 07:52:09 +00:00
Elliott Hughes
07b7385fc0
am e5d4fc39: am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit 'e5d4fc39e3f26920f3413070d1175a0afd14a66f':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 07:51:01 +00:00
Dan Albert
d084b8d6b8
resolved conflicts for merge of 55ee845b to lmp-mr1-dev-plus-aosp
...
Change-Id: I134ec170a5fa1da065256b2da2e9c139db61b030
2014-10-08 00:07:03 -07:00
Elliott Hughes
e5d4fc39e3
am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '1543fdf616ddebee7819214437527f380e5c743b':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 05:24:46 +00:00
Dan Albert
55ee845b8e
Inline helpers need to be exported unmangled.
...
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
(cherry-pick of 658727e111 with conflicts
in stdio.h and string.h.)
Bug: 17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
2014-10-07 18:51:24 -07:00
Nick Kralevich
efa8136df9
am 8ec71579: am ce92b41a: cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
* commit '8ec715796f3eef76edfe7ae18dc8b8a9e2be4b47':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-08 00:57:28 +00:00
Nick Kralevich
8ec715796f
am ce92b41a: cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
* commit 'ce92b41a00fb86656055eceab9648a858721c3b1':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-08 00:51:24 +00:00
Dan Albert
f1afba2aca
am 187fd4d7: am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit '187fd4d7abd802b77a57e28f3b3c9ce5c3d95e96':
Inline helpers need to be exported unmangled.
2014-10-08 00:16:26 +00:00
Dan Albert
187fd4d7ab
am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit 'c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
2014-10-08 00:13:09 +00:00
Dan Albert
c9e4f2de0a
Merge "Inline helpers need to be exported unmangled."
2014-10-08 00:01:08 +00:00
Dan Albert
658727e111
Inline helpers need to be exported unmangled.
...
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
Bug: 17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
2014-10-07 16:46:47 -07:00
Nick Kralevich
ce92b41a00
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
Otherwise the gcc compiler warning doesn't show up.
Add -Wno-error to fortify related tests. Fortify related tests
are expected to be examples of bad programs, and in many
cases shouldn't compile cleanly. Rewriting them to compile
cleanly isn't feasible nor desirable.
Bug: 17784968
(cherry picked from commit 1aaa17802c )
Change-Id: Ib6df1a3f44b55b1fff222e78395c10c51cd39817
2014-10-07 16:37:04 -07:00
Elliott Hughes
3d773274ad
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
...
This reverts commit 7d3f553f98 .
Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0
2014-10-07 23:31:06 +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
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 7d3f553f98 )
Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
(cherry picked from commit b5e7eba6d1 )
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 7d3f553f98 )
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
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 2cfb4e8e2e )
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
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
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