OSDN Git Service
dimitry [Tue, 18 Jul 2017 23:00:05 +0000 (23:00 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44 am:
ee7deb734d am:
46dfffdc67 am:
43475fdae4 am:
ac62e82856 am:
e3c809f863
am:
6c960cde6d
Change-Id: I7489adebbee754ebb4c25a89aab69bb1bac14f78
dimitry [Tue, 18 Jul 2017 22:43:58 +0000 (22:43 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44 am:
ee7deb734d am:
46dfffdc67 am:
43475fdae4 am:
ac62e82856
am:
e3c809f863
Change-Id: Ia52ceaf0609d026cfd9fa8459f159c9e2c82583a
dimitry [Tue, 18 Jul 2017 22:41:11 +0000 (22:41 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44 am:
ee7deb734d am:
46dfffdc67 am:
43475fdae4
am:
ac62e82856
Change-Id: I85aa7c0068125a60238629fdb31b325e0eca49a3
dimitry [Tue, 18 Jul 2017 22:37:42 +0000 (22:37 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44 am:
ee7deb734d am:
46dfffdc67
am:
43475fdae4
Change-Id: Ia526ffd192f8830efcc5768c62d0758df2109da4
dimitry [Tue, 18 Jul 2017 22:30:40 +0000 (22:30 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44 am:
ee7deb734d
am:
46dfffdc67
Change-Id: I3a1e3dfa091c3e43c1e73700db6d6c9c686b54ef
dimitry [Tue, 18 Jul 2017 22:27:52 +0000 (22:27 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31 am:
2542cfdb44
am:
ee7deb734d
Change-Id: If8881fa07f5f050dc0c15af7177d003801dd0269
dimitry [Tue, 18 Jul 2017 22:24:09 +0000 (22:24 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971 am:
9bc88caa31
am:
2542cfdb44
Change-Id: Ie9bce8dfd0722e50026a0aa5d1d81c70725fcd28
dimitry [Tue, 18 Jul 2017 22:22:09 +0000 (22:22 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62 am:
8666246971
am:
9bc88caa31
Change-Id: I89d5e919ef7bc13df36df63baaeaff7517c0b962
dimitry [Tue, 18 Jul 2017 22:20:10 +0000 (22:20 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa am:
781c67bd62
am:
8666246971
Change-Id: Id6f8e6908119ba309f555501b6bab6181cf16bec
dimitry [Tue, 18 Jul 2017 22:18:14 +0000 (22:18 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326 am:
6cb0d4b2aa
am:
781c67bd62
Change-Id: I2da0ca80ec42389add7b786a66e9a8d4fdc83254
dimitry [Tue, 18 Jul 2017 22:15:17 +0000 (22:15 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours am:
3c77ef5326
am:
6cb0d4b2aa
Change-Id: I5a2b6fcb300b86ab15c2d8fe8cf253e5f2ce03b2
dimitry [Tue, 18 Jul 2017 22:11:40 +0000 (22:11 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0 am:
a5f74a4a80 -s ours
am:
3c77ef5326
Change-Id: I812f929ce4704bd374e9267aeecca957e1d92d5c
dimitry [Tue, 18 Jul 2017 22:05:09 +0000 (22:05 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670 am:
d6b25861d0
am:
a5f74a4a80 -s ours
Change-Id: Ic277a838f4c2c974aa37514bbd073413c117f8e5
dimitry [Tue, 18 Jul 2017 21:48:06 +0000 (21:48 +0000)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670
am:
d6b25861d0
Change-Id: If9f751cf09c6551aababec28b6100fd77c3b510d
TreeHugger Robot [Tue, 18 Jul 2017 19:55:09 +0000 (19:55 +0000)]
Merge "Remove weaker _POSIX_THREAD_PROCESS_SHARED test."
Elliott Hughes [Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32." am:
a571e9e748 am:
1498e806c9 am:
86c1846e23
am:
c022475d4f
Change-Id: Id2b92a2ff66c3122f0473666cdc8cf528548a5c2
Elliott Hughes [Tue, 18 Jul 2017 18:30:32 +0000 (18:30 +0000)]
Merge "Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32." am:
a571e9e748 am:
1498e806c9
am:
86c1846e23
Change-Id: I50d6f2cf31dcbe0e7bce925ce7de71d148b24418
Elliott Hughes [Tue, 18 Jul 2017 18:26:00 +0000 (18:26 +0000)]
Merge "Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32." am:
a571e9e748
am:
1498e806c9
Change-Id: I1c1e5df9917b56e9942858e76246bf8aa2e644d9
Elliott Hughes [Tue, 18 Jul 2017 18:20:11 +0000 (18:20 +0000)]
Merge "Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32."
am:
a571e9e748
Change-Id: I6f646e36ae2de0a50dac703fcac385fb116035e3
Elliott Hughes [Tue, 18 Jul 2017 18:04:25 +0000 (18:04 +0000)]
Merge "Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32."
Elliott Hughes [Tue, 18 Jul 2017 00:14:02 +0000 (17:14 -0700)]
Remove weaker _POSIX_THREAD_PROCESS_SHARED test.
This branch (master, which will be o-mr1) already has a stronger test
than this one (which was added for o-dr, which doesn't have its own API
level).
Bug: http://b/
62424597
Test: ran tests
Change-Id: Icfb7b50fa3c5b6d256d378add12c854a899a1c92
Elliott Hughes [Mon, 17 Jul 2017 22:37:03 +0000 (22:37 +0000)]
Merge "Loosen _POSIX_THREAD_PROCESS_SHARED test. am:
7b41aaf3d5 am:
e69278094a" into oc-dr1-dev-plus-aosp
am:
43bf301553
Change-Id: Ia7bb6ea599bcce05fa7116fbd64fd1ff5e45cd4a
Elliott Hughes [Mon, 17 Jul 2017 22:36:49 +0000 (22:36 +0000)]
Loosen _POSIX_THREAD_PROCESS_SHARED test. am:
7b41aaf3d5 am:
f58c401672
am:
a3abe4b3ac
Change-Id: I602285464d04fce37d50a8ae6cba20278caecc87
Android Build Merger (Role) [Mon, 17 Jul 2017 22:34:39 +0000 (22:34 +0000)]
Merge "Loosen _POSIX_THREAD_PROCESS_SHARED test. am:
7b41aaf3d5 am:
e69278094a" into oc-dr1-dev-plus-aosp
Elliott Hughes [Mon, 17 Jul 2017 22:34:30 +0000 (22:34 +0000)]
Loosen _POSIX_THREAD_PROCESS_SHARED test. am:
7b41aaf3d5
am:
e69278094a
Change-Id: Ie69c304454c7fd31b8d69bcf316cd9f4cf8988bd
Elliott Hughes [Mon, 17 Jul 2017 22:34:16 +0000 (22:34 +0000)]
Loosen _POSIX_THREAD_PROCESS_SHARED test. am:
7b41aaf3d5
am:
f58c401672
Change-Id: I82012d0143b4548144d37926acb58ba89680fb6b
Elliott Hughes [Mon, 17 Jul 2017 22:31:46 +0000 (22:31 +0000)]
Loosen _POSIX_THREAD_PROCESS_SHARED test.
am:
7b41aaf3d5
Change-Id: I7f8920c2dfa00dfe7de504c41caefa9d1c8dc727
Elliott Hughes [Mon, 17 Jul 2017 22:31:46 +0000 (22:31 +0000)]
Loosen _POSIX_THREAD_PROCESS_SHARED test.
am:
7b41aaf3d5
Change-Id: Ieb17d253ea1e421219c04ffdb804c2e8460d997e
Elliott Hughes [Mon, 17 Jul 2017 22:02:14 +0000 (22:02 +0000)]
Merge "Make _scan_nan a bit less visible for libandroid_support users." am:
fbd8762e6e am:
b00d0984fd am:
9ef11a7fc4
am:
4f383811e5
Change-Id: Ide2a3d9211b2046d6ceb6fc295413c5497cb6ba1
Elliott Hughes [Wed, 12 Jul 2017 22:02:20 +0000 (15:02 -0700)]
Document the intricacies of `_FILE_OFFSET_BITS=32` for LP32.
Bug: https://github.com/android-ndk/ndk/issues/453
Test: N/A
Change-Id: I5c00e63c861b19071229d2eae737dfbeb550e7e8
Elliott Hughes [Mon, 17 Jul 2017 21:59:44 +0000 (21:59 +0000)]
Merge "Make _scan_nan a bit less visible for libandroid_support users." am:
fbd8762e6e am:
b00d0984fd
am:
9ef11a7fc4
Change-Id: I5a9b6b4cd09c5ff48bad3461780a5964c649d162
Elliott Hughes [Mon, 17 Jul 2017 21:57:14 +0000 (21:57 +0000)]
Merge "Make _scan_nan a bit less visible for libandroid_support users." am:
fbd8762e6e
am:
b00d0984fd
Change-Id: Ibedfe6af4148d1d06db5845304ff2b9102f6d150
Elliott Hughes [Mon, 17 Jul 2017 21:54:43 +0000 (21:54 +0000)]
Merge "Make _scan_nan a bit less visible for libandroid_support users."
am:
fbd8762e6e
Change-Id: I6e8ad0611f54790d76663ebc427866d5737ae6b5
Elliott Hughes [Mon, 17 Jul 2017 21:45:46 +0000 (21:45 +0000)]
Merge "Make _scan_nan a bit less visible for libandroid_support users."
Elliott Hughes [Mon, 17 Jul 2017 18:23:02 +0000 (11:23 -0700)]
Make _scan_nan a bit less visible for libandroid_support users.
Bug: N/A
Test: readelf
Change-Id: Ibb5fbf09f6ae589a3e789107a641013fc6bc375b
dimitry [Mon, 17 Jul 2017 09:24:54 +0000 (11:24 +0200)]
loader: fix dlopen performance regression caused by fix for CVE-2017-0670
Fix for CVE-2017-0670 in lmp-mr1 branch caused significant slowdowns
on dlopens for libraries with large dependency trees. Modified
is_recursive check led to unecessary check of already linked libraries.
This change excludes already loaded and linked libraries from this check
since it is redundant - linker already did it while loading these
libraries.
Bug:
63658102
Test: run bionic-unit-tests --gtest_filter=dl*:Dl*
Test: manually check load times for libraries with large dependency trees.
Change-Id: Idf25376f4889c4430442ff16a16e1d79ccb77b27
Elliott Hughes [Sat, 15 Jul 2017 03:33:16 +0000 (03:33 +0000)]
Merge "Hide various mbstate implementation details." am:
dcdd0e3760 am:
452c185a0b am:
7267c89021
am:
65cad047d5
Change-Id: I9120ec32e519e6a98acd01e5d27f7d3cc06ef9bc
Elliott Hughes [Sat, 15 Jul 2017 03:28:17 +0000 (03:28 +0000)]
Merge "Hide various mbstate implementation details." am:
dcdd0e3760 am:
452c185a0b
am:
7267c89021
Change-Id: I9f2527098d402a44e5b8027ad1f205d4802d4566
Elliott Hughes [Sat, 15 Jul 2017 03:23:47 +0000 (03:23 +0000)]
Merge "Hide various mbstate implementation details." am:
dcdd0e3760
am:
452c185a0b
Change-Id: Ic0e08363041365345232755d678d9caf2a2c4541
Elliott Hughes [Sat, 15 Jul 2017 03:19:16 +0000 (03:19 +0000)]
Merge "Hide various mbstate implementation details."
am:
dcdd0e3760
Change-Id: I4f2941939f40c04344f3f9dcfd5debe7780d9275
Treehugger Robot [Sat, 15 Jul 2017 03:12:36 +0000 (03:12 +0000)]
Merge "Hide various mbstate implementation details."
Elliott Hughes [Sat, 15 Jul 2017 01:24:19 +0000 (01:24 +0000)]
Merge "Allow passing filenames to generate-NOTICE.py." am:
65cebf0804 am:
18f0ad8b86 am:
9be4255829
am:
7b97ed787f
Change-Id: I0be3409298d0d284dad02d1b697ec944df7d10d3
Elliott Hughes [Sat, 15 Jul 2017 01:20:52 +0000 (01:20 +0000)]
Merge "Allow passing filenames to generate-NOTICE.py." am:
65cebf0804 am:
18f0ad8b86
am:
9be4255829
Change-Id: Ia9b2eda7cd3a196112a8d1f9d160963c3defb376
Elliott Hughes [Sat, 15 Jul 2017 01:16:38 +0000 (01:16 +0000)]
Merge "Allow passing filenames to generate-NOTICE.py." am:
65cebf0804
am:
18f0ad8b86
Change-Id: I254d4fbb8fb2efffec04288c3b313e3a7285988b
Elliott Hughes [Sat, 15 Jul 2017 01:12:39 +0000 (01:12 +0000)]
Merge "Allow passing filenames to generate-NOTICE.py."
am:
65cebf0804
Change-Id: Iaa397d7a3065ae6514e26c2c4d5e69eb0ca04ede
Treehugger Robot [Sat, 15 Jul 2017 01:07:39 +0000 (01:07 +0000)]
Merge "Allow passing filenames to generate-NOTICE.py."
Elliott Hughes [Sat, 15 Jul 2017 00:00:05 +0000 (17:00 -0700)]
Hide various mbstate implementation details.
...by inlining them.
Also fix a couple of harmless bugs in passing. I've added tests, but in
both cases I don't think it was actually possible to hit the bad behavior:
we'd hit another test and fail immediately after in an externally
indistinguishable way.
Bug: N/A
Test: readelf
Change-Id: I8466050b0bfe2b7b94c76b383cf10c1d9d28debd
Elliott Hughes [Fri, 14 Jul 2017 17:00:32 +0000 (10:00 -0700)]
Allow passing filenames to generate-NOTICE.py.
For the libandroid_support NOTICE file, we need to combine all the files
in that directory, plus the specific files pulled from bionic.
Also cleaned up some of the Python style.
Bug: N/A
Test: used for libandroid_support
Change-Id: If433e3a0f0478f06d99a9b3556e99dde06a7e5e1
Jiyong Park [Fri, 14 Jul 2017 22:27:14 +0000 (22:27 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am:
b1c3da1d89 am:
510d9236dd am:
89db25a0a0
am:
6542e1b906
Change-Id: I45e51291b51661d37e7ee26f43742ce23a05876d
Jiyong Park [Fri, 14 Jul 2017 22:23:17 +0000 (22:23 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am:
b1c3da1d89 am:
510d9236dd
am:
89db25a0a0
Change-Id: Id2d0206490dca5ed0b971bd11adc146a1fffe86b
Jiyong Park [Fri, 14 Jul 2017 22:19:14 +0000 (22:19 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients" am:
b1c3da1d89
am:
510d9236dd
Change-Id: I31c4f6a26932e9f6564704a82016a629483a3d5b
Jiyong Park [Fri, 14 Jul 2017 22:15:53 +0000 (22:15 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients"
am:
b1c3da1d89
Change-Id: Ib34c688064d470a5f7fe546013bae0a83985d66a
Treehugger Robot [Fri, 14 Jul 2017 22:09:50 +0000 (22:09 +0000)]
Merge "__cfi_slowpath[_diag] are available to NDK and VNDK clients"
Elliott Hughes [Fri, 14 Jul 2017 19:06:15 +0000 (19:06 +0000)]
Merge "libm symbol cleanup." am:
4ebed99e25 am:
8d21ab4fda am:
3cefa966ef
am:
6c031d1c12
Change-Id: I412a3ea79fd362c922e7ba0507dee87a0abdef6b
Elliott Hughes [Fri, 14 Jul 2017 19:02:42 +0000 (19:02 +0000)]
Merge "libm symbol cleanup." am:
4ebed99e25 am:
8d21ab4fda
am:
3cefa966ef
Change-Id: I8f408ca57cabc94da60296e131c99cb78fa3de2d
Elliott Hughes [Fri, 14 Jul 2017 18:59:11 +0000 (18:59 +0000)]
Merge "libm symbol cleanup." am:
4ebed99e25
am:
8d21ab4fda
Change-Id: I8b7d3451e165e7d696cbaa9a3f314f909c3d6b0f
Elliott Hughes [Fri, 14 Jul 2017 18:55:42 +0000 (18:55 +0000)]
Merge "libm symbol cleanup."
am:
4ebed99e25
Change-Id: I1019918ae9598c91300749619a90fddb74796b64
Treehugger Robot [Fri, 14 Jul 2017 18:51:03 +0000 (18:51 +0000)]
Merge "libm symbol cleanup."
Elliott Hughes [Fri, 14 Jul 2017 00:30:06 +0000 (17:30 -0700)]
libm symbol cleanup.
Some of this code is used in the NDK libandroid_support now, as a static
library, so just being HIDDEN in the ELF sense isn't sufficient.
Rename digittoint to __libm_digittoint so we don't trample anyone's toes.
Also remove imprecise_powl and imprecise_tgammal. It turns out (to my
surprise) that we don't even have ld128 implementations of powl and tgammal,
so even LP64 was just using the "fake_long_double.c" hack in effect. Since
that's the case, let's *actually* do that because then we're not polluting
with the internal names in addition to the aliases.
Bug: N/A
Test: readelf
Change-Id: I273cc8fdc7ce53f9b8dfd4ef7796e358fe901837
Elliott Hughes [Thu, 13 Jul 2017 17:28:21 +0000 (10:28 -0700)]
Loosen _POSIX_THREAD_PROCESS_SHARED test.
Bug: http://b/
62424597
Test: bionic unistd.sysconf test
Change-Id: I4adb6d227f761360e9d3fe084a45c386bc6944da
Elliott Hughes [Thu, 13 Jul 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test." am:
03e9c498d4 am:
5a99bd4ea7 am:
1e4853a6df
am:
accad92a3b
Change-Id: Id2a430753c0980d124fb9b7618b85261f3defded
Dan Albert [Thu, 13 Jul 2017 19:44:43 +0000 (19:44 +0000)]
Merge "Move wchar _l functions out of wchar.cpp." am:
78c8b306ee am:
021d7ca543 am:
aa47998465
am:
cc44261d4e
Change-Id: If1b050fe01495397b9f7eb241bd85b0fe310a06f
Elliott Hughes [Thu, 13 Jul 2017 19:39:57 +0000 (19:39 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test." am:
03e9c498d4 am:
5a99bd4ea7
am:
1e4853a6df
Change-Id: I0cbe6646ff90d037e5af482acd5666a9c37a9564
Dan Albert [Thu, 13 Jul 2017 19:39:44 +0000 (19:39 +0000)]
Merge "Move wchar _l functions out of wchar.cpp." am:
78c8b306ee am:
021d7ca543
am:
aa47998465
Change-Id: Ib946f3cf772a7cd51dda1462ee92fd9959fe7b1d
Elliott Hughes [Thu, 13 Jul 2017 19:32:55 +0000 (19:32 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test." am:
03e9c498d4
am:
5a99bd4ea7
Change-Id: Ib3afe4345722a39f96cbc0084fc579e2d3d6997b
Dan Albert [Thu, 13 Jul 2017 19:32:42 +0000 (19:32 +0000)]
Merge "Move wchar _l functions out of wchar.cpp." am:
78c8b306ee
am:
021d7ca543
Change-Id: Ie09981f2021f77a32491640f84d85cc4ff39fecb
Elliott Hughes [Thu, 13 Jul 2017 19:27:58 +0000 (19:27 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test."
am:
03e9c498d4
Change-Id: I751bc797ae578760664b51859c7b9a1711709adb
Dan Albert [Thu, 13 Jul 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Move wchar _l functions out of wchar.cpp."
am:
78c8b306ee
Change-Id: Ia871cf273fde5c70737378b0a7634f2a634d5587
Treehugger Robot [Thu, 13 Jul 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Fix unistd._POSIX_macros_smoke test."
Treehugger Robot [Thu, 13 Jul 2017 19:21:11 +0000 (19:21 +0000)]
Merge "Move wchar _l functions out of wchar.cpp."
Dan Albert [Thu, 13 Jul 2017 17:29:20 +0000 (10:29 -0700)]
Move wchar _l functions out of wchar.cpp.
We don't need these in libandroid_support, but we do need the other
parts of wchar.cpp, and they're not really related.
Test: make checkbuild
Bug: None
Change-Id: I40f3089b034abfd4873e81c0b6216a7cfd977d8d
Elliott Hughes [Thu, 13 Jul 2017 17:20:41 +0000 (10:20 -0700)]
Fix unistd._POSIX_macros_smoke test.
We now claim _POSIX2_VERSION, but the test wasn't updated.
Bug: N/A
Test: ran tests
Change-Id: Idb3369b3df4b964f585597f0d37962ae619322d2
Dan Albert [Thu, 13 Jul 2017 08:45:04 +0000 (08:45 +0000)]
Merge changes from topic 'locale-android-support' am:
2d585e0070 am:
5f78abdbd8 am:
c3f90fb45a
am:
e209c7e28b
Change-Id: Ib79e8e616fa4444c97f0193a21e86b06217d539b
Dan Albert [Thu, 13 Jul 2017 08:42:34 +0000 (08:42 +0000)]
Merge changes from topic 'locale-android-support' am:
2d585e0070 am:
5f78abdbd8
am:
c3f90fb45a
Change-Id: Ib3bedde420933002f992f9c9e0e24d9ddd5047ae
Dan Albert [Thu, 13 Jul 2017 08:40:04 +0000 (08:40 +0000)]
Merge changes from topic 'locale-android-support' am:
2d585e0070
am:
5f78abdbd8
Change-Id: I3716fa367e78b41548c75b7fdb7bf9c68ffb9173
Dan Albert [Thu, 13 Jul 2017 08:37:05 +0000 (08:37 +0000)]
Merge changes from topic 'locale-android-support'
am:
2d585e0070
Change-Id: I993d7f4c2bd448aa11f0ad30d6db4cba625cb590
Dan Albert [Thu, 13 Jul 2017 08:34:57 +0000 (08:34 +0000)]
Merge changes from topic 'locale-android-support'
* changes:
Add a non-TLS slot implementation of locale.cpp.
Move non-locale.h APIs out of locale.cpp.
Christopher Ferris [Thu, 13 Jul 2017 06:25:25 +0000 (06:25 +0000)]
Merge "Really fix the mac build." am:
ada33eb9b4 am:
a95aade379 am:
8259929a3d
am:
15b2e07c92
Change-Id: Ib4c82053dc60b4e60efa32dd52cf5c5b7b37cfe5
Christopher Ferris [Thu, 13 Jul 2017 06:22:56 +0000 (06:22 +0000)]
Merge "Really fix the mac build." am:
ada33eb9b4 am:
a95aade379
am:
8259929a3d
Change-Id: Iafa1539afdd28b1721afdea11c90201fd3a88fb4
Christopher Ferris [Thu, 13 Jul 2017 06:20:25 +0000 (06:20 +0000)]
Merge "Really fix the mac build." am:
ada33eb9b4
am:
a95aade379
Change-Id: I737b32cb43842c859bd7fc4eec7c5b7ab390b511
Christopher Ferris [Thu, 13 Jul 2017 06:17:26 +0000 (06:17 +0000)]
Merge "Really fix the mac build."
am:
ada33eb9b4
Change-Id: I131c705329ac3c85509c677a8b0caf3b08cf78b4
Christopher Ferris [Thu, 13 Jul 2017 06:13:14 +0000 (06:13 +0000)]
Merge "Really fix the mac build."
Christopher Ferris [Thu, 13 Jul 2017 06:10:07 +0000 (23:10 -0700)]
Really fix the mac build.
I forgot an underscore.
Test: Builds.
Change-Id: Ib7da13dea315822af89c53a569fb0a0c2fd5d321
Christopher Ferris [Thu, 13 Jul 2017 04:41:49 +0000 (04:41 +0000)]
Merge "Fix max build." am:
b1e4cc31a4 am:
3b33f6f9c1 am:
ccf5bfe492
am:
9f77a93739
Change-Id: I444c2b055fcda4e19ad29b3a5b16420cfa60df0d
Christopher Ferris [Thu, 13 Jul 2017 04:39:50 +0000 (04:39 +0000)]
Merge "Fix max build." am:
b1e4cc31a4 am:
3b33f6f9c1
am:
ccf5bfe492
Change-Id: I5824183eb48f254f435a3094e12b225a4279bbff
Christopher Ferris [Thu, 13 Jul 2017 04:37:20 +0000 (04:37 +0000)]
Merge "Fix max build." am:
b1e4cc31a4
am:
3b33f6f9c1
Change-Id: I26a4c1d1d7883c45b941c6c2cc1d3f1a4cf3d796
Christopher Ferris [Thu, 13 Jul 2017 04:34:49 +0000 (04:34 +0000)]
Merge "Fix max build."
am:
b1e4cc31a4
Change-Id: I9862bab5128a1854aa39c1ed0ef762a582d40eb6
Treehugger Robot [Thu, 13 Jul 2017 04:32:33 +0000 (04:32 +0000)]
Merge "Fix max build."
Christopher Ferris [Thu, 13 Jul 2017 02:33:32 +0000 (19:33 -0700)]
Fix max build.
Test: Built properly.
Change-Id: I37b8ac7d42653617be6611b640a883066257214c
Jiyong Park [Fri, 30 Jun 2017 06:36:12 +0000 (15:36 +0900)]
__cfi_slowpath[_diag] are available to NDK and VNDK clients
When a vendor lib (or vendor-available platform lib) is built with
sanitizer on, __cfi_slowpath_diag is required. However, when building
for those libs, the llndk stub of libdl.so is provided for them and
__cfi_slowpath_diag is not exposed to the stub. In order to make the
sanitizing build successful, expose the symbol.
These symbols are also exposed to NDK clients since we may want to CFI
for unbundled apps.
Bug:
63053790
Bug:
63342219
Test: BOARD_VNDK_VERSION=current m -j libstagefright_foundation.vendor
Change-Id: I081deddb4f66354aaecec4b395d4e17e5566c578
Christopher Ferris [Wed, 12 Jul 2017 23:12:45 +0000 (23:12 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp" am:
61b7e114dd am:
635d055914 am:
83edf6a849
am:
2df2fbd170
Change-Id: Ia5a5a347985aa5eab1852a47b7ffa098d98f60f4
Christopher Ferris [Wed, 12 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp" am:
61b7e114dd am:
635d055914
am:
83edf6a849
Change-Id: Ib17426b083e35c97587511e27351eb902991c00a
Christopher Ferris [Wed, 12 Jul 2017 23:08:28 +0000 (23:08 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp" am:
61b7e114dd
am:
635d055914
Change-Id: I21f4e20118e02c24f3d761aad7aab19a193fb1d1
Christopher Ferris [Wed, 12 Jul 2017 23:05:36 +0000 (23:05 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp"
am:
61b7e114dd
Change-Id: I9d30d388d564078169bb89412e27407eeb475962
Christopher Ferris [Wed, 12 Jul 2017 22:56:13 +0000 (22:56 +0000)]
Merge "Support memory alignment tests for string_benchmark.cpp"
Dan Albert [Wed, 12 Jul 2017 20:47:42 +0000 (13:47 -0700)]
Add a non-TLS slot implementation of locale.cpp.
libandroid_support shouldn't be using Bionic's TLS slot. Add a
thread_local based implementation. We can't use the thread_local
implementation in bionic because the linker needs this and pthread
thread-locals (which is how thread_local is implemented) doesn't work
that early.
Test: make checkbuild
Test: adb shell /data/nativetest/bionic-unit-tests/bionic-unit-tests
Bug: https://github.com/android-ndk/ndk/issues/300
Change-Id: I7dcbf554ade2264d541d722fa3f86df04926e67a
Anders Lewis [Fri, 23 Jun 2017 22:53:59 +0000 (15:53 -0700)]
Support memory alignment tests for string_benchmark.cpp
Test: Manually verify that benchmark times are similar and add a unit test.
Change-Id: Idaaeb4c8c3629f797ffd8d0c86c8d7b7b9653181
Dan Albert [Tue, 11 Jul 2017 21:27:07 +0000 (14:27 -0700)]
Move non-locale.h APIs out of locale.cpp.
libandroid_support only needs the locale.h stuff.
Test: make checkbuild
Bug: None
Change-Id: I0c53fe9d2df4f9ff4b99771727034508bc89cb32
Elliott Hughes [Tue, 11 Jul 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff." am:
3537331942 am:
3c2f2d9685 am:
6595225696
am:
9544aae0f8
Change-Id: I6177cc3ac7824a07fa4092747d0fa20f4af0160e
Elliott Hughes [Tue, 11 Jul 2017 21:51:08 +0000 (21:51 +0000)]
Merge "Sync with upstream OpenBSD: trivial stuff." am:
3537331942 am:
3c2f2d9685
am:
6595225696
Change-Id: I8da0b1fd06a5131a93dbc97227e61ce507279c39
OSDN Git Service
