OSDN Git Service
Yabin Cui [Mon, 30 Nov 2015 22:01:36 +0000 (22:01 +0000)]
Merge "Don\'t use __thread in __cxa_thread_finalize()."
am:
28d3f00cf4
* commit '
28d3f00cf4545812503c835ea906fa83309e48ed':
Don't use __thread in __cxa_thread_finalize().
Yabin Cui [Mon, 30 Nov 2015 21:59:47 +0000 (21:59 +0000)]
Merge "Don't use __thread in __cxa_thread_finalize()."
Yabin Cui [Mon, 30 Nov 2015 21:42:42 +0000 (21:42 +0000)]
Merge "Fix pthread_test according to tsan report."
am:
aec13988da
* commit '
aec13988dab7ff32cb005f42b952e3b9b55a4779':
Fix pthread_test according to tsan report.
Yabin Cui [Mon, 30 Nov 2015 21:38:59 +0000 (21:38 +0000)]
Merge "Fix pthread_test according to tsan report."
Chih-hung Hsieh [Mon, 30 Nov 2015 19:02:05 +0000 (19:02 +0000)]
Merge "Consider when building libc_thread_atexit_impl module"
am:
2bb85c848a
* commit '
2bb85c848abb89951ec01342d6c8278311346395':
Consider $(use_clang) when building libc_thread_atexit_impl module
Chih-hung Hsieh [Mon, 30 Nov 2015 18:58:59 +0000 (18:58 +0000)]
Merge "Consider $(use_clang) when building libc_thread_atexit_impl module"
Nikola Veljkovic [Wed, 25 Nov 2015 18:03:12 +0000 (19:03 +0100)]
Consider $(use_clang) when building libc_thread_atexit_impl module
Change-Id: Ia369d94979f418198a2ee891385942d9bc5604d7
Yabin Cui [Wed, 25 Nov 2015 01:24:06 +0000 (17:24 -0800)]
Don't use __thread in __cxa_thread_finalize().
Currently we use __thread variable to store thread_local_dtors,
which makes tsan test fork_atexit.cc hang. The problem is as below:
The main thread creates a worker thread, the worker thread calls
pthread_exit() -> __cxa_thread_finalize() -> __emutls_get_address()
-> pthread_once(emutls_init) -> emutls_init().
Then the main thread calls fork(), the child process cals
exit() -> __cxa_thread_finalize() -> __emutls_get_address()
-> pthread_once(emutls_init).
So the child process is waiting for pthread_once(emutls_init)
to finish which will never occur.
It might be the test's fault because POSIX standard says if a
multi-threaded process calls fork(), the new process may only
execute async-signal-safe operations until exec functions are
called. And exit() is not async-signal-safe. But we can make
bionic more reliable by not using __thread in
__cxa_thread_finalize().
Bug:
25392375
Change-Id: Ife403dd7379dad8ddf1859c348c1c0adea07afb3
Colin Cross [Tue, 24 Nov 2015 21:41:22 +0000 (21:41 +0000)]
Merge "Remove cflags and ldflags from crt defaults"
am:
a01108d9bf
* commit '
a01108d9bf415854b9d36334483133adff3d7405':
Remove cflags and ldflags from crt defaults
Colin Cross [Tue, 24 Nov 2015 21:33:54 +0000 (21:33 +0000)]
Merge "Remove cflags and ldflags from crt defaults"
Colin Cross [Tue, 24 Nov 2015 20:24:24 +0000 (20:24 +0000)]
Merge "move arch variant structs down a level"
am:
8bd27182c5
* commit '
8bd27182c505cdc8031ab23fea5d1dccb6b7405a':
move arch variant structs down a level
Colin Cross [Tue, 24 Nov 2015 20:21:20 +0000 (20:21 +0000)]
Merge "move arch variant structs down a level"
Colin Cross [Mon, 23 Nov 2015 22:12:19 +0000 (14:12 -0800)]
Remove cflags and ldflags from crt defaults
After ToolchainCflags were added to soong crt no longer needs to try to
recreate the bare minimum cflags for compiling for each architecture.
Also always use GCC to match crt.mk
Change-Id: I01a833ab70d989033c84f072e3660d060189688c
Dimitry Ivanov [Tue, 24 Nov 2015 02:45:14 +0000 (02:45 +0000)]
Merge "Introduce anonymous namespace"
am:
db8caa740a
* commit '
db8caa740a409c2ce75f875df84857e6be69eb9f':
Introduce anonymous namespace
Dimitry Ivanov [Tue, 24 Nov 2015 02:23:34 +0000 (02:23 +0000)]
Merge "Introduce anonymous namespace"
Dmitriy Ivanov [Mon, 23 Nov 2015 19:26:35 +0000 (11:26 -0800)]
Introduce anonymous namespace
The anonymous namespace is introduced to
handle cases when linker can not find the
caller. This usually happens when caller
code was not loaded by dynamic linker;
for example mono-generated code.
Bug: http://b/
25844435
Bug: http://b/
22548808
Change-Id: I9e5b1d23c1c75bc78548d68e79216a6a943a33cf
Colin Cross [Mon, 23 Nov 2015 22:12:15 +0000 (14:12 -0800)]
move arch variant structs down a level
Use blueprint's new anonymous embedded struct feature to move the arch
variant properties down a level, replacing arch.cortex_a9.srcs with
arch.arm.cortex_a9.srcs, while still supporting top-level properties
like arch.arm.srcs.
Change-Id: Ib41c80e3549440d5efdfd293a15cffa3f51a0fe4
Yabin Cui [Mon, 23 Nov 2015 19:02:08 +0000 (19:02 +0000)]
Merge "Change _stdio_handles_locking into _caller_handles_locking."
am:
17554356cc
* commit '
17554356cc865908e5cbd7814c8be7e47c9c4ec5':
Change _stdio_handles_locking into _caller_handles_locking.
Yabin Cui [Mon, 23 Nov 2015 18:57:26 +0000 (18:57 +0000)]
Merge "Change _stdio_handles_locking into _caller_handles_locking."
Dimitry Ivanov [Mon, 23 Nov 2015 07:33:23 +0000 (07:33 +0000)]
Merge "Handling invalid section headers"
am:
a7fc7f9909
* commit '
a7fc7f9909c221a0f64c5c5ecc5fadd5fba467c5':
Handling invalid section headers
Dimitry Ivanov [Mon, 23 Nov 2015 07:28:32 +0000 (07:28 +0000)]
Merge "Handling invalid section headers"
Dmitriy Ivanov [Sat, 21 Nov 2015 01:28:12 +0000 (17:28 -0800)]
Handling invalid section headers
The linker crashes if native library has invalid section
headers. This change adds boundary checks on target offsets
and generates dlerror instead of crash.
Bug: http://b/
25800330
Change-Id: Ibe282029997302b9b557637c3aad064d7d0febc5
Yabin Cui [Sat, 21 Nov 2015 01:55:27 +0000 (01:55 +0000)]
Merge "Use FUTEX_WAIT_BITSET to avoid converting timeouts."
am:
74ed96d597
* commit '
74ed96d59731aa3661494330804d866e825209d3':
Use FUTEX_WAIT_BITSET to avoid converting timeouts.
Yabin Cui [Sat, 21 Nov 2015 01:50:29 +0000 (01:50 +0000)]
Merge "Use FUTEX_WAIT_BITSET to avoid converting timeouts."
Yabin Cui [Thu, 19 Nov 2015 21:52:16 +0000 (13:52 -0800)]
Change _stdio_handles_locking into _caller_handles_locking.
It is reported by tsan that funlockfile() can unlock an unlocked mutex.
It happens when printf() is called before fopen() or other stdio stuff.
As FLOCKFILE(fp) is called before __sinit(), _stdio_handles_locking is false,
and _FLOCK(fp) will not be locked. But then cantwrite(fp) in __vfprintf()
calls__sinit(), which makes _stdio_handles_locking become true, and
FUNLOCKFILE(fp) unlocks _FLOCK(fp).
Change _stdio_handles_locking into _caller_handles_locking,
so __sinit() won't change its value. Add test due to my previous fault.
Bug:
25392375
Change-Id: I483e3c3cdb28da65e62f1fd9615bf58c5403b4dd
Dimitry Ivanov [Fri, 20 Nov 2015 21:45:36 +0000 (21:45 +0000)]
Merge "Move some utility functions to linker_utils"
am:
fb3219fbd1
* commit '
fb3219fbd1dbb0a369d52cbd0200330fd8852bc1':
Move some utility functions to linker_utils
Dimitry Ivanov [Fri, 20 Nov 2015 21:42:18 +0000 (21:42 +0000)]
Merge "Move some utility functions to linker_utils"
Dmitriy Ivanov [Fri, 20 Nov 2015 21:34:11 +0000 (13:34 -0800)]
Move some utility functions to linker_utils
Also adds unit-tests for page_start, page_offset, and safe_add
Change-Id: Ia1325b4682d367328a01599a19848e4ffcd2c0ea
Dimitry Ivanov [Fri, 20 Nov 2015 19:19:40 +0000 (19:19 +0000)]
Merge "Improve error message for files with no sections"
am:
a1ab0d8ed1
* commit '
a1ab0d8ed1c4025233b0d816164eefb1b84159b9':
Improve error message for files with no sections
Dimitry Ivanov [Fri, 20 Nov 2015 19:16:14 +0000 (19:16 +0000)]
Merge "Improve error message for files with no sections"
Chih-hung Hsieh [Fri, 20 Nov 2015 18:57:17 +0000 (18:57 +0000)]
Merge "Disable clang for mips/mips64 libc."
am:
8d5fb0d787
* commit '
8d5fb0d78716379d07eddbd75c88c9b7082436ef':
Disable clang for mips/mips64 libc.
Dmitriy Ivanov [Fri, 20 Nov 2015 18:42:02 +0000 (10:42 -0800)]
Improve error message for files with no sections
Bug: http://b/
25801618
Change-Id: I4f4f368e727ff48c84781279e3d17d4ac2d1b6b0
Chih-hung Hsieh [Fri, 20 Nov 2015 18:27:14 +0000 (18:27 +0000)]
Merge "Disable clang for mips/mips64 libc."
Chih-Hung Hsieh [Fri, 20 Nov 2015 17:55:35 +0000 (09:55 -0800)]
Disable clang for mips/mips64 libc.
* Many processes, including adbd, failed to start in mips/mips64
emulator when libc.so was compiled by clang.
BUG:
25291096
Change-Id: If3434ebdca4a3a6bf6102b120ee838a7ab66cd74
Elliott Hughes [Fri, 20 Nov 2015 17:34:03 +0000 (17:34 +0000)]
Merge "mmap: fix calculation of is_private_anonymous variable"
am:
43c9045017
* commit '
43c90450174ab8839c05702ac01c4092f5b6cd19':
mmap: fix calculation of is_private_anonymous variable
Elliott Hughes [Fri, 20 Nov 2015 17:19:19 +0000 (17:19 +0000)]
Merge "mmap: fix calculation of is_private_anonymous variable"
Vitaly Vul [Thu, 24 Sep 2015 12:28:59 +0000 (14:28 +0200)]
mmap: fix calculation of is_private_anonymous variable
Currently is_private_anonymous is calculated as true if _either_
MAP_PRIVATE or MAP_ANONYMOUS is set, which is a mistake.
According to Documentation/vm/ksm.txt, "KSM only merges anonymous
(private) pages, never pagecache (file) pages". MAP_PRIVATE can
still be set on file cache pages so in order to not redundantly
set MADV_MERGEABLE on pages that are not fitted for it, both
MAP_PRIVATE and MAP_ANONYMOUS should be set.
Along with this fix, add an extra check that the mapped page is
not a stack page before setting MADV_MERGEABLE for it. Stack pages
change too quickly and always end up in KSM 'page_volatile' list.
Change-Id: If4954142852f17cc61f02985ea1cb625a7f3dec6
Josh Gao [Fri, 20 Nov 2015 02:00:16 +0000 (02:00 +0000)]
Merge changes I73a39c6d,Iab2af242
am:
f30170dfa5
* commit '
f30170dfa514266a0bf007091aa54a866920208c':
Fix test build break.
extend the PTRDIFF_MAX size check to mremap
Josh Gao [Fri, 20 Nov 2015 01:55:56 +0000 (01:55 +0000)]
Merge changes I73a39c6d,Iab2af242
* changes:
Fix test build break.
extend the PTRDIFF_MAX size check to mremap
Yabin Cui [Fri, 20 Nov 2015 00:48:40 +0000 (00:48 +0000)]
Merge "Fix tsan abort for lake of __libc_auxv initialization."
am:
79f8d64632
* commit '
79f8d64632a57ccd62315286b809819de09e0317':
Fix tsan abort for lake of __libc_auxv initialization.
Yabin Cui [Fri, 20 Nov 2015 00:40:00 +0000 (00:40 +0000)]
Merge "Fix tsan abort for lake of __libc_auxv initialization."
Colin Cross [Thu, 19 Nov 2015 22:58:20 +0000 (22:58 +0000)]
Merge "Update libc/Android.bp to match libc/Android.mk"
am:
9c6157c81d
* commit '
9c6157c81d123d8c6ba1aa8d7ee5c67b0840666c':
Update libc/Android.bp to match libc/Android.mk
Colin Cross [Thu, 19 Nov 2015 22:48:33 +0000 (22:48 +0000)]
Merge "Update libc/Android.bp to match libc/Android.mk"
Yabin Cui [Thu, 19 Nov 2015 22:24:06 +0000 (14:24 -0800)]
Fix tsan abort for lake of __libc_auxv initialization.
If tsan is used, the following callchain can happen:
__libc_preinit() -> __libc_init_globals() ->
__libc_init_vdso() -> strcmp() -> __tsan_init()
-> sysconf(_SC_PAGE_SIZE) -> getauxval().
But __libc_auxv is initialized in __libc_init_common(),
after __libc_init_globals(). One simple way to fix
this is to initialize __libc_auxv at __libc_init_globals().
Bug:
25392375
Change-Id: I3893b1f567d5f3b7a8c881c0c1b8234b06b7751b
Colin Cross [Thu, 19 Nov 2015 21:32:49 +0000 (13:32 -0800)]
Update libc/Android.bp to match libc/Android.mk
Change-Id: I4dfadc55688213f095949c56306e5071b2ab6135
Josh Gao [Thu, 19 Nov 2015 21:44:20 +0000 (13:44 -0800)]
Fix test build break.
Change-Id: I73a39c6d4bb9baebbfb5572e9259bcd405116039
Yabin Cui [Thu, 5 Nov 2015 23:36:08 +0000 (15:36 -0800)]
Use FUTEX_WAIT_BITSET to avoid converting timeouts.
Add unittests for pthread APIs with timeout parameter.
Bug:
17569991
Change-Id: I6b3b9b2feae03680654cd64c3112ce7644632c87
Hung-ying Tyan [Thu, 19 Nov 2015 16:45:08 +0000 (16:45 +0000)]
Merge "Add /odm/lib to shared lib search path"
am:
0ebe2f07c3
* commit '
0ebe2f07c35d4b764bc5d8b5226004e3db46da91':
Add /odm/lib to shared lib search path
Hung-ying Tyan [Thu, 19 Nov 2015 16:38:51 +0000 (16:38 +0000)]
Merge "Add /odm/lib to shared lib search path"
Daniel Micay [Sat, 7 Nov 2015 15:40:26 +0000 (10:40 -0500)]
extend the PTRDIFF_MAX size check to mremap
This removes another way to obtain objects larger than PTRDIFF_MAX. The
only known remaining hole is now jemalloc's merging of virtual memory
spans.
Technically this could be wrapped in an __LP64__ ifndef since it can't
occur on 64-bit due to the 1:1 split. It doesn't really matter either
way.
Change-Id: Iab2af242b775bc98a59421994d87aca0433215bd
Junichi Uekawa [Thu, 19 Nov 2015 12:51:01 +0000 (12:51 +0000)]
Merge "Do not depend on host bits to get the right size to write."
am:
313632db57
* commit '
313632db574d101275206ca025d21a5a3cd62150':
Do not depend on host bits to get the right size to write.
Junichi Uekawa [Thu, 19 Nov 2015 12:44:19 +0000 (12:44 +0000)]
Merge "Do not depend on host bits to get the right size to write."
Junichi Uekawa [Wed, 18 Nov 2015 01:18:59 +0000 (10:18 +0900)]
Do not depend on host bits to get the right size to write.
x86_64 32-bit or 64-bit relocations do not depend on ELF bit size, they
are 32-bit or 64-bit respectively.
Known compiler that emits such code is nacl-clang which emits
R_X86_64_PC32 which should write 32 bits but ended up writing 64 bits.
Change-Id: Ibb6b484c0fea6a7e291362148e8ac749d6674529
Yabin Cui [Thu, 19 Nov 2015 02:03:24 +0000 (02:03 +0000)]
Merge "Implement pthread spin."
am:
2c09e5de29
* commit '
2c09e5de299ca87a9e68807e2b4af41ba61710f3':
Implement pthread spin.
Yabin Cui [Thu, 19 Nov 2015 02:03:13 +0000 (02:03 +0000)]
Merge "Avoid tsan warning about pthread_mutex_destroy."
am:
ea5bb151af
* commit '
ea5bb151af5e1e364968cb1eac70c8a2c13ca7a7':
Avoid tsan warning about pthread_mutex_destroy.
Yabin Cui [Thu, 19 Nov 2015 01:55:37 +0000 (01:55 +0000)]
Merge "Implement pthread spin."
Yabin Cui [Thu, 19 Nov 2015 01:55:25 +0000 (01:55 +0000)]
Merge "Avoid tsan warning about pthread_mutex_destroy."
Yabin Cui [Wed, 18 Nov 2015 00:03:18 +0000 (16:03 -0800)]
Implement pthread spin.
In order to run tsan unit tests, we need to support pthread spin APIs.
Bug:
18623621
Bug:
25392375
Change-Id: Icbb4a74e72e467824b3715982a01600031868e29
Hung-ying Tyan [Thu, 12 Nov 2015 03:48:19 +0000 (11:48 +0800)]
Add /odm/lib to shared lib search path
ODM's shared libs should live in /odm/lib on the ODM partition.
BUG:
25654402
Change-Id: I3f5c26f208af87ff2817e490e51d0b4f5b8ec98e
Dimitry Ivanov [Wed, 18 Nov 2015 03:52:50 +0000 (03:52 +0000)]
Merge "Ignore target sdk version for the public namespace"
am:
63f0e0db76
* commit '
63f0e0db768ea9be4db3dd6a2fb62ea942afb9d6':
Ignore target sdk version for the public namespace
Dimitry Ivanov [Wed, 18 Nov 2015 03:43:59 +0000 (03:43 +0000)]
Merge "Ignore target sdk version for the public namespace"
Dmitriy Ivanov [Wed, 18 Nov 2015 02:36:50 +0000 (18:36 -0800)]
Ignore target sdk version for the public namespace
This fixes the bug with using the libraries loaded
prior to android_set_target_sdk_version call.
Bug: http://b/
22548808
Change-Id: I3ca2d367b0fa930a437bbb65f780834803d2ef0a
Yabin Cui [Tue, 17 Nov 2015 04:19:31 +0000 (20:19 -0800)]
Avoid tsan warning about pthread_mutex_destroy.
If calling pthread_mutex_trylock from pthread_mutex_destroy, tsan
warns about an attempt to destroy a locked mutex.
Bug:
25392375
Change-Id: I5feee20e7a0d0915adad24da874ec1ccce241381
Yabin Cui [Tue, 17 Nov 2015 05:06:16 +0000 (21:06 -0800)]
Fix pthread_test according to tsan report.
1. Fix leak threads and data races related to spin_flag.
2. Increase stack size to run under tsan.
This doesn't pass all pthread tests, as some tests are used
to run intentionally in race situations.
Bug:
25392375
Change-Id: Icfba3e141e7170abd890809586e89b99adc8bd02
Yabin Cui [Tue, 17 Nov 2015 00:28:20 +0000 (00:28 +0000)]
Merge "Implement pthread barrier."
am:
b804b9d67b
* commit '
b804b9d67b9e3a8c63471ff9892f6abea2a58684':
Implement pthread barrier.
Yabin Cui [Tue, 17 Nov 2015 00:22:54 +0000 (00:22 +0000)]
Merge "Implement pthread barrier."
Dimitry Ivanov [Mon, 16 Nov 2015 22:30:32 +0000 (22:30 +0000)]
Merge "Remove the warning about empty LD_LIBRARY_PATH"
am:
3c8c16022a
* commit '
3c8c16022a513a32eb6b92cf23f4ef43ccf7ad6d':
Remove the warning about empty LD_LIBRARY_PATH
Dimitry Ivanov [Mon, 16 Nov 2015 22:25:50 +0000 (22:25 +0000)]
Merge "Remove the warning about empty LD_LIBRARY_PATH"
Dmitriy Ivanov [Mon, 16 Nov 2015 22:23:37 +0000 (14:23 -0800)]
Remove the warning about empty LD_LIBRARY_PATH
Change-Id: I3eca11512d8055ab94dd0a6badcd83ce6440d675
Yabin Cui [Fri, 6 Nov 2015 06:06:09 +0000 (22:06 -0800)]
Implement pthread barrier.
Bug:
24341262
Change-Id: I5472549e5d7545c1c3f0bef78235f545557b9630
Chih-hung Hsieh [Mon, 16 Nov 2015 21:36:51 +0000 (21:36 +0000)]
Merge "Enable clang to compile more tests."
am:
949bfb9e3c
* commit '
949bfb9e3cceac7913fe1debc39617c9ec01ae5e':
Enable clang to compile more tests.
Chih-hung Hsieh [Mon, 16 Nov 2015 21:31:36 +0000 (21:31 +0000)]
Merge "Enable clang to compile more tests."
Dimitry Ivanov [Mon, 16 Nov 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Fix arm64 and x86 builds"
am:
61f186d067
* commit '
61f186d067a3efb6a86450092a567fb18c1641c3':
Fix arm64 and x86 builds
Dimitry Ivanov [Mon, 16 Nov 2015 21:23:18 +0000 (21:23 +0000)]
Merge "Fix arm64 and x86 builds"
Dmitriy Ivanov [Mon, 16 Nov 2015 21:17:27 +0000 (13:17 -0800)]
Fix arm64 and x86 builds
Change-Id: Ic3746b2f200f42218b6ac857c1631e873c767c17
Dimitry Ivanov [Mon, 16 Nov 2015 20:21:05 +0000 (20:21 +0000)]
Merge "Introducing linker namespaces"
am:
1f0ccbb59c
* commit '
1f0ccbb59cd32dfad0e6d9fd9619905e067076a6':
Introducing linker namespaces
Dimitry Ivanov [Mon, 16 Nov 2015 20:14:37 +0000 (20:14 +0000)]
Merge "Introducing linker namespaces"
Chih-Hung Hsieh [Mon, 16 Nov 2015 19:13:04 +0000 (11:13 -0800)]
Enable clang to compile more tests.
* Disable optimization only in gtest.h of atexit_test.c for arm/aarch64
to keep VTT for std::__1::basic_stringstream<char, std::__1::char_traits<char>,
std::__1::allocator<char> > to link with g++ compiled modules.
* bionic-unit-tests source files are not affected by clang x86_64 fp128 bug
so they can be compiled with clang.
BUG:
25643775
Change-Id: I3da2a0de61edcdca07b7fcd73a16de9da4a1f7d6
Dmitriy Ivanov [Fri, 30 Oct 2015 00:01:24 +0000 (17:01 -0700)]
Introducing linker namespaces
Bug: http://b/
22548808
Change-Id: Ia3af3c0a167f1d16447a3d83bb045d143319b1e1
Elliott Hughes [Fri, 13 Nov 2015 18:28:57 +0000 (18:28 +0000)]
Merge "Improve libc time zone fallback behavior."
am:
1b42c54471
* commit '
1b42c544711316281e09c5da25850fac531b27cb':
Improve libc time zone fallback behavior.
Elliott Hughes [Fri, 13 Nov 2015 18:24:41 +0000 (18:24 +0000)]
Merge "Improve libc time zone fallback behavior."
Elliott Hughes [Fri, 13 Nov 2015 16:38:48 +0000 (08:38 -0800)]
Improve libc time zone fallback behavior.
We should fall back to GMT if neither the environment variable nor the
system property is set. This is the case if you wipe a WiFi-only device,
because we currently only take the time zone from cell networks.
Bug: http://b/
24773112
Change-Id: I90d236d4d492b6562d75021bd312030b91c1e298
Elliott Hughes [Fri, 13 Nov 2015 03:04:31 +0000 (03:04 +0000)]
Merge "Fix strftime if tm_zone is null."
am:
5780f9d809
* commit '
5780f9d80963fbe7b93f501dd3dd7edc7fab46b0':
Fix strftime if tm_zone is null.
Elliott Hughes [Fri, 13 Nov 2015 02:58:30 +0000 (02:58 +0000)]
Merge "Fix strftime if tm_zone is null."
Nick Kralevich [Fri, 13 Nov 2015 01:12:41 +0000 (01:12 +0000)]
Merge "FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc"
am:
4ea67f6950
* commit '
4ea67f695066b73796b24563d83e8b5a9190334d':
FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc
Nick Kralevich [Fri, 13 Nov 2015 01:09:44 +0000 (01:09 +0000)]
Merge "FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc"
Elliott Hughes [Fri, 13 Nov 2015 00:51:31 +0000 (16:51 -0800)]
Fix strftime if tm_zone is null.
Upstream tzcode said "On platforms with tm_zone, strftime.c now assumes it
is not NULL". Which is fine for any struct tm generated by tzcode, but not
necessarily true of a struct tm constructed by arbitrary code. In particular,
Netflix on Nexus Player was failing to start because they format "%Z" with
a struct tm whose tm_zone is null (the other fields are valid, but, yeah,
that's probably not intentional).
glibc takes a null tm_zone to mean "the current time zone", so let's do that
too. (Historically Android would use the empty string, and POSIX doesn't
clarify which of this is the appropriate behavior when tm_zone is null.)
Bug: http://b/
25170306
Change-Id: Idbf68bfe90d143aca7dada8607742905188b1d33
Nick Kralevich [Thu, 12 Nov 2015 23:55:13 +0000 (15:55 -0800)]
FORTIFY_SOURCE: make sure gcc unittests are compiled with gcc
The default compiler is clang. We need to explicitly indicate
that we should use gcc.
Change-Id: I37859c2e303f2a86a2565fe72eda1fda7c557a59
Chih-hung Hsieh [Thu, 12 Nov 2015 20:51:05 +0000 (20:51 +0000)]
Merge "Still cannot compile with clang on arm64."
am:
7c10ee9473
* commit '
7c10ee9473b5c46da733b2d3d24cf90fb8ac7672':
Still cannot compile with clang on arm64.
Chih-hung Hsieh [Thu, 12 Nov 2015 20:45:48 +0000 (20:45 +0000)]
Merge "Still cannot compile with clang on arm64."
Chih-Hung Hsieh [Thu, 12 Nov 2015 20:39:13 +0000 (12:39 -0800)]
Still cannot compile with clang on arm64.
When __cxa_thread_atexit_impl.cpp is compiled with clang on arm64,
Android cannot boot up.
BUG:
25662915
Change-Id: If997b544f43e956172ce605d86fe147d42fd39e0
Chih-hung Hsieh [Thu, 12 Nov 2015 01:09:37 +0000 (01:09 +0000)]
Merge "Enable clang for modules failed with TLS."
am:
0c447053de
* commit '
0c447053de4b87d50ebec260c7e1d949fe934065':
Enable clang for modules failed with TLS.
Chih-hung Hsieh [Thu, 12 Nov 2015 01:04:51 +0000 (01:04 +0000)]
Merge "Enable clang for modules failed with TLS."
Elliott Hughes [Thu, 12 Nov 2015 01:04:38 +0000 (01:04 +0000)]
Merge "Clean up pthread_gettid_np test."
am:
dbc6398e95
* commit '
dbc6398e95df44a18715ce5ba19b8e1a93b969d4':
Clean up pthread_gettid_np test.
Elliott Hughes [Thu, 12 Nov 2015 00:59:08 +0000 (00:59 +0000)]
Merge "Clean up pthread_gettid_np test."
Chih-Hung Hsieh [Tue, 10 Nov 2015 19:15:43 +0000 (11:15 -0800)]
Enable clang for modules failed with TLS.
New 3.8 clang/llvm can compile TLS code now.
* For x86_64, still disable clang due to f128 bug.
* For b/
25643775, arm and arm64, disable clang in unit tests.
* Fix thread_local_test.cpp to compile with clang and
limit gcc workaround only to arm and aarch64.
BUG:
25643775
Change-Id: Iecd006bf1fc417dbcce2c63343a59c4bf1fa77ea
Josh Gao [Wed, 11 Nov 2015 22:25:42 +0000 (22:25 +0000)]
Merge "Add 100 column limit to .clang-format."
am:
b03e6bf924
* commit '
b03e6bf9247bb36162b9f4c61d07e488a18e126c':
Add 100 column limit to .clang-format.
Josh Gao [Wed, 11 Nov 2015 22:22:59 +0000 (22:22 +0000)]
Merge "Add 100 column limit to .clang-format."
Josh Gao [Wed, 11 Nov 2015 22:21:09 +0000 (14:21 -0800)]
Add 100 column limit to .clang-format.
Change-Id: I3c3fa5e61cfb2af7f2888dcee56229692ec1479c
Elliott Hughes [Wed, 11 Nov 2015 21:32:28 +0000 (13:32 -0800)]
Clean up pthread_gettid_np test.
Change-Id: I0fad26c7824981bfa3ad3a8a0b28a1984062dcd1