Elliott Hughes
3d773274ad
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
...
This reverts commit 7d3f553f989f830976efa92ddc3c84661d4d42aa.
Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0
2014-10-07 23:31:06 +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 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
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
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 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
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
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
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
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
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
Nick Kralevich
1aaa17802c
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
Change-Id: I93bececa7444d965f18c7c27d46e7abce5c49a02
2014-10-06 15:11:52 -07:00
Dan Albert
8049eb7578
am 9969feca: Merge "Add compile time test infrastructure for bionic."
...
* commit '9969fecad23edebcbc4f32a50dc65a2876a2478f':
Add compile time test infrastructure for bionic.
2014-10-06 19:54:37 +00:00
Dan Albert
9969fecad2
Merge "Add compile time test infrastructure for bionic."
2014-10-06 19:45:32 +00:00
Dmitriy Ivanov
bc7ecf7af2
am f4320e86: Merge "Resolve "unused DT entry" warnings for x86_64"
...
* commit 'f4320e867cbc7764d2f1fa8ac64da9cc38cba733':
Resolve "unused DT entry" warnings for x86_64
2014-10-06 19:28:49 +00:00
Dmitriy Ivanov
f4320e867c
Merge "Resolve "unused DT entry" warnings for x86_64"
2014-10-06 19:07:58 +00:00
Dan Albert
f04a8bc226
Add compile time test infrastructure for bionic.
...
Actual tests to follow...
Bug: 17782583
Change-Id: I22857f19899c3b39dbc2e5473ad3be1a8a291139
2014-10-06 11:38:01 -07:00
Dmitriy Ivanov
513e29e16f
Resolve "unused DT entry" warnings for x86_64
...
Change-Id: I3a2c87bf6e6259313cd9203389623f13b7405ef3
2014-10-06 11:32:19 -07:00
Dmitriy Ivanov
bfbe68fc24
am 6d569b92: Merge "Add file_offset parameter to android_extinfo"
...
* commit '6d569b92012543a297dccf2dfeaa648d07b3c133':
Add file_offset parameter to android_extinfo
2014-10-06 17:29:06 +00:00
Dmitriy Ivanov
6d569b9201
Merge "Add file_offset parameter to android_extinfo"
2014-10-06 17:19:39 +00:00
Nick Kralevich
7ad2147a08
string.h: remove unused variable
...
(cherry picked from commit 48be71d02b6cc4e6493d38cdd6b7779032c38901)
Bug: 17784968
Change-Id: Iac7732fb4f7fe42977cb9f62472bb636e17e5232
2014-10-06 10:17:01 -07:00
Dmitriy Ivanov
07e5bc152d
Add file_offset parameter to android_extinfo
...
Bug: 17762003
Change-Id: I8fb267a3155acef3dba534038cf5d1ef00d7154b
2014-10-06 10:02:34 -07:00
Nick Kralevich
e88b00c51d
am a6eef3be: Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
...
* commit 'a6eef3be105fb34161fd1b1d513f7d03b5f1bbe9':
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:44:49 +00:00
Nick Kralevich
a6eef3be10
Merge "Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions""
2014-10-06 00:40:07 +00:00
Nick Kralevich
884a3de60f
Revert "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
Broke the build.
In file included from frameworks/rs/cpu_ref/rsCpuCore.cpp:36:
system/core/include/cutils/properties.h:118:1: error: unknown attribute '__artificial__' ignored [-Werror,-Wunknown-attributes]
__BIONIC_FORTIFY_INLINE
^
bionic/libc/include/sys/cdefs.h:537:110: note: expanded from macro '__BIONIC_FORTIFY_INLINE'
#define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline)) __attribute__((__artificial__))
^
1 error generated.
make: *** [out/target/product/generic/obj/SHARED_LIBRARIES/libRSCpuRef_intermediates/rsCpuCore.o] Error 1
This reverts commit 9b543ffeac216189cc8125f7624da9a8cbcbe2e4.
Change-Id: I6a1198747505dcb402b722887c1bfbc3a628a8b8
2014-10-06 00:39:47 +00:00
Nick Kralevich
5ba8094f8b
am 558ec810: Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
...
* commit '558ec8103bad6eed78c3e372fc9b2535a3486745':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-06 00:17:23 +00:00
Nick Kralevich
558ec8103b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:10:48 +00:00
Nick Kralevich
32cfbb7605
am db6fea86: Merge "further cleanup memcpy fortify implementation"
...
* commit 'db6fea86a5cb70c5aaad61ef6c126557f36e138b':
further cleanup memcpy fortify implementation
2014-10-05 16:54:37 +00:00
Nick Kralevich
db6fea86a5
Merge "further cleanup memcpy fortify implementation"
2014-10-05 16:43:24 +00:00
Nick Kralevich
b84f667e93
further cleanup memcpy fortify implementation
...
Change-Id: I0380f3c8ca8f9bb8a206accd839c32c9daf13c56
2014-10-05 06:52:24 -07:00