Elliott Hughes
75129ae9f3
Don't silently return EINVAL for a NULL sem_t*.
...
Bug: 17571197
Change-Id: Ied31d8de87fc10d20dc338be0457e9a4ddb9a0a5
2014-10-08 15:11:44 -07:00
Elliott Hughes
3ea4d56ed4
Use ln(1) rather than cp(1) to set up host /system for testing.
...
The trouble with cp is that if you're running a command directly (because
you're using gdb, say), you need to make sure you've copied the linker
and shell again if you've done a rebuild that caused a change there.
Change-Id: I312da30c0f92b515967e854e0faba272c961ecc7
2014-10-08 14:56:27 -07:00
Elliott Hughes
7083b23b1c
am 13641010: Merge "Fix compile-time tests for LP64."
...
* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
Fix compile-time tests for LP64.
2014-10-08 20:39:57 +00:00
Elliott Hughes
1364101067
Merge "Fix compile-time tests for LP64."
2014-10-08 20:31:10 +00:00
Elliott Hughes
b4b15c63a1
Fix compile-time tests for LP64.
...
Change-Id: Ib9bec5c6c77c55679d64c2bc15ab70979c40e66c
2014-10-08 13:21:29 -07:00
Dan Albert
1b06736d96
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:24 +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
b559513e08
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
Dan Albert
6c4a64e3e2
am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit 'c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
2014-10-08 00:12:32 +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
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
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
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
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
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
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
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
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
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
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
b5cba6081b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 23:21:04 +00: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
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
65c10a1477
am 9969feca: Merge "Add compile time test infrastructure for bionic."
...
* commit '9969fecad23edebcbc4f32a50dc65a2876a2478f':
Add compile time test infrastructure for bionic.
2014-10-06 19:54:52 +00:00
Dan Albert
9969fecad2
Merge "Add compile time test infrastructure for bionic."
2014-10-06 19:45:32 +00:00
Dmitriy Ivanov
b9d4a64866
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:14:51 +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
47388d8297
am 6d569b92: Merge "Add file_offset parameter to android_extinfo"
...
* commit '6d569b92012543a297dccf2dfeaa648d07b3c133':
Add file_offset parameter to android_extinfo
2014-10-06 17:28:54 +00:00
Dmitriy Ivanov
6d569b9201
Merge "Add file_offset parameter to android_extinfo"
2014-10-06 17:19:39 +00: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
0fd98ec4d7
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
036cd686af
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:24 +00:00
Nick Kralevich
558ec8103b
Merge "cdefs.h: add artificial attribute to FORTIFY_SOURCE functions"
2014-10-06 00:10:48 +00:00