OSDN Git Service
Christopher Ferris [Thu, 21 Jan 2016 18:38:13 +0000 (18:38 +0000)]
Merge "Remove dependency on zipalign."
am:
be4f7429ca
* commit '
be4f7429ca66d0652f31fc78fd88de5ee958f890':
Remove dependency on zipalign.
Christopher Ferris [Thu, 21 Jan 2016 18:31:12 +0000 (18:31 +0000)]
Merge "Remove dependency on zipalign."
Dimitry Ivanov [Thu, 21 Jan 2016 05:35:36 +0000 (05:35 +0000)]
Merge "Do not unmap reserved region on dlclose"
am:
3e3b992469
* commit '
3e3b992469ef7a415882ed11305c916d29870452':
Do not unmap reserved region on dlclose
Dimitry Ivanov [Thu, 21 Jan 2016 05:30:31 +0000 (05:30 +0000)]
Merge "Do not unmap reserved region on dlclose"
Dimitry Ivanov [Fri, 15 Jan 2016 19:13:35 +0000 (11:13 -0800)]
Do not unmap reserved region on dlclose
dlclose used to unmap the part of the reserved region
for ANDROID_DLEXT_RESERVED_ADDRESS that was neccessary
to map PT_LOAD segments. With this change dlclose
replaces mapped PT_LOAD segments with a PROT_NONE,
MAP_ANONYMOUS | MAP_NORESERVE.
Previously caller was unmapping the reserved region after
the failed dlclose which led to race condition when someone
else reused the region freed by dlclose but before the unmap
by the chromium code.
Bug: http://code.google.com/p/chromium/issues/detail?id=568880
Change-Id: I0f5eaa2bf6641f83dde469b631c518482acc59a2
Christopher Ferris [Wed, 20 Jan 2016 04:32:37 +0000 (20:32 -0800)]
Remove dependency on zipalign.
Roll our own version of zipalign so that we can break the dependency
on the build tools zipalign. This breaks the transitive dependency
on androidfw so that building bionic unit tests in brillo works again.
Also modify the DlExtTest.ExtInfoUseFdWithOffset test so it dynamically
gets the offset of the shared library inside of the zip instead of
hard-coding the value.
Bug:
25446938
Change-Id: Idfb5d3089960a94eefa2c76e03da1ad2f4d7fb2f
Elliott Hughes [Thu, 21 Jan 2016 00:50:23 +0000 (00:50 +0000)]
Merge "Move stdio implementation details around a little."
am:
5f1ff279ea
* commit '
5f1ff279ea6aa4c35c59a81018131810e35b2bff':
Move stdio implementation details around a little.
Colin Cross [Wed, 20 Jan 2016 23:23:41 +0000 (23:23 +0000)]
Merge "Update Android.bp to match Android.mk"
am:
0904e878ae
* commit '
0904e878aed336b95512f12948fd4dcc56100d00':
Update Android.bp to match Android.mk
Elliott Hughes [Wed, 20 Jan 2016 23:07:50 +0000 (23:07 +0000)]
Merge "Move stdio implementation details around a little."
Colin Cross [Wed, 20 Jan 2016 21:10:34 +0000 (21:10 +0000)]
Merge "Update Android.bp to match Android.mk"
Colin Cross [Wed, 20 Jan 2016 20:09:06 +0000 (20:09 +0000)]
Merge "Update Android.bp to match Android.mk"
am:
18dea9b8d4
* commit '
18dea9b8d41a05597f0f5e05cb82b1f347059a26':
Update Android.bp to match Android.mk
Colin Cross [Wed, 20 Jan 2016 20:01:19 +0000 (12:01 -0800)]
Update Android.bp to match Android.mk
Change-Id: Ia14a7af94d6220b3078b8d37b76990454b16703c
Colin Cross [Wed, 20 Jan 2016 19:58:16 +0000 (19:58 +0000)]
Merge "Update Android.bp to match Android.mk"
Elliott Hughes [Wed, 20 Jan 2016 00:28:15 +0000 (16:28 -0800)]
Move stdio implementation details around a little.
Change-Id: I24594426d5479bdd55cbef0ab1b7d76c249dbd0c
Elliott Hughes [Wed, 20 Jan 2016 00:18:21 +0000 (00:18 +0000)]
Merge "Make FILE*s less usable after fclose(3)."
am:
8b49f53a5e
* commit '
8b49f53a5e3b4073c9341a5be6c9deb9a1666e7e':
Make FILE*s less usable after fclose(3).
Elliott Hughes [Wed, 20 Jan 2016 00:13:45 +0000 (00:13 +0000)]
Merge "Make FILE*s less usable after fclose(3)."
Elliott Hughes [Tue, 19 Jan 2016 23:46:05 +0000 (15:46 -0800)]
Make FILE*s less usable after fclose(3).
BSD doesn't invalidate the fd stored in struct FILE, which can make
it possible (via fileno(3), for example), to perform operations on
an fd you didn't intend to (rather than just failing with EBADF).
Fixing this makes the code slightly simpler anyway, and might help
catch bad code before it ships.
Bug: http://stackoverflow.com/questions/
10816837/fclose-works-differently-on-android-and-linux
Change-Id: I9db74584038229499197a2695c70b58ed0372a87
Colin Cross [Tue, 19 Jan 2016 20:50:20 +0000 (12:50 -0800)]
Update Android.bp to match Android.mk
Change-Id: Ib6ab28c5b4569c9537c4647b3661166fdb82544a
Chih-hung Hsieh [Tue, 19 Jan 2016 20:14:30 +0000 (20:14 +0000)]
Merge "Switch libc default to clang."
am:
50e0c388ac
* commit '
50e0c388ac8a7b6985947e5028f1e828d4b15fb8':
Switch libc default to clang.
Chih-hung Hsieh [Tue, 19 Jan 2016 20:04:47 +0000 (20:04 +0000)]
Merge "Switch libc default to clang."
Chih-Hung Hsieh [Tue, 19 Jan 2016 18:59:34 +0000 (10:59 -0800)]
Switch libc default to clang.
* Default to clang when USE_CLANG_PLATFORM_BUILD is not set
and the target has no clang bug.
BUG:
26102335
Change-Id: Ied6c9dc5593bfbadbb8d8b38e66ea237d649bae5
Elliott Hughes [Tue, 19 Jan 2016 17:52:21 +0000 (17:52 +0000)]
Merge "Fix GCC build breakage."
am:
579f42b789
* commit '
579f42b78922d8c70e19ea77d2818ec17d0dc6a7':
Fix GCC build breakage.
Elliott Hughes [Tue, 19 Jan 2016 17:48:28 +0000 (17:48 +0000)]
Merge "Fix GCC build breakage."
Elliott Hughes [Tue, 19 Jan 2016 17:47:47 +0000 (09:47 -0800)]
Fix GCC build breakage.
Change-Id: I0339f525c68af942fb97f4bffc771717e67e0e07
Elliott Hughes [Tue, 19 Jan 2016 17:28:38 +0000 (17:28 +0000)]
Merge "Add more fortify symbols to the expected differences from glibc."
am:
94ddc29c0e
* commit '
94ddc29c0ebb0ba8493c070d40efb5d68260982d':
Add more fortify symbols to the expected differences from glibc.
Elliott Hughes [Tue, 19 Jan 2016 17:28:32 +0000 (17:28 +0000)]
Merge "Implement if_nameindex(3)/if_freenameindex(3)."
am:
89f4e09d8d
* commit '
89f4e09d8da120d12f0e530aa5bc465c0ff0803f':
Implement if_nameindex(3)/if_freenameindex(3).
Elliott Hughes [Tue, 19 Jan 2016 17:25:01 +0000 (17:25 +0000)]
Merge "Add more fortify symbols to the expected differences from glibc."
Elliott Hughes [Tue, 19 Jan 2016 17:24:16 +0000 (17:24 +0000)]
Merge "Implement if_nameindex(3)/if_freenameindex(3)."
Elliott Hughes [Sat, 16 Jan 2016 05:02:56 +0000 (21:02 -0800)]
Implement if_nameindex(3)/if_freenameindex(3).
This is just a subset of the recently-implemented getifaddrs(3), though if
we want to handle interfaces (such as "rmnet_*") that don't have an address,
we need to either expose ifaddrs_storage and keep track of which interfaces
we've already seen (which is pretty messy), or refactor the netlink code so
we can reuse it and just extract the information we need for if_nameindex(3).
This patch goes the latter route.
Also clean up if_nametoindex(3) and if_indextoname(3).
Change-Id: I5ffc5df0bab62286cdda2e7af06f032c767119a8
Yi Kong [Sun, 17 Jan 2016 22:57:17 +0000 (22:57 +0000)]
Merge "Add more tests for getifaddrs(3)"
am:
a6c25829f1
* commit '
a6c25829f1cf5ff0ede68ba0fcbf152dd6db19b0':
Add more tests for getifaddrs(3)
Yi Kong [Sun, 17 Jan 2016 22:48:36 +0000 (22:48 +0000)]
Merge "Add more tests for getifaddrs(3)"
Elliott Hughes [Sat, 16 Jan 2016 03:54:31 +0000 (19:54 -0800)]
Add more fortify symbols to the expected differences from glibc.
Change-Id: I6266b2e6cbea3c014b4ea30a7100186965e40cf1
Elliott Hughes [Sat, 16 Jan 2016 03:05:49 +0000 (03:05 +0000)]
Merge "Sync with upstream OpenBSD."
am:
68d0150221
* commit '
68d0150221eb505a576f6ad5ca1f367b4ce547a0':
Sync with upstream OpenBSD.
Elliott Hughes [Sat, 16 Jan 2016 03:02:06 +0000 (03:02 +0000)]
Merge "Sync with upstream OpenBSD."
Dan Willemsen [Sat, 16 Jan 2016 00:52:48 +0000 (00:52 +0000)]
Merge "Align Soong builds closer to Make"
am:
6ec2d5fbb5
* commit '
6ec2d5fbb52687d01b11280390dd6eb7162454b1':
Align Soong builds closer to Make
Dan Willemsen [Sat, 16 Jan 2016 00:47:39 +0000 (00:47 +0000)]
Merge "Align Soong builds closer to Make"
Elliott Hughes [Sat, 16 Jan 2016 00:30:18 +0000 (16:30 -0800)]
Sync with upstream OpenBSD.
Also some minor build cleanup.
Change-Id: Ibd20602d7ea45685f0c47fceb00ffd6c7ae35954
Dan Willemsen [Sat, 16 Jan 2016 00:00:57 +0000 (16:00 -0800)]
Align Soong builds closer to Make
This moves the Android.bp file to use wildcards in the same places that
they're using in the Android.mk file. It also fixes a file that was in a
different order.
Make and Soong still produce binaries with object files in different
orders, but that's due to Make reordering the object files based on
compile type. Soong keeps the original specified order. It's not
possible to emulate the reordered files in the Android.bp, since the
arch-specific files won't interleave properly.
Change-Id: I9052b3ed7c523c13df5cbe606f913c32c88c7c5f
Christopher Ferris [Thu, 14 Jan 2016 20:18:25 +0000 (20:18 +0000)]
Merge "Add comment for [p]select_smoke tests STDIN issue."
am:
299798fe02
* commit '
299798fe02cd43c21e62352f11d7be30d85e0f96':
Add comment for [p]select_smoke tests STDIN issue.
Christopher Ferris [Thu, 14 Jan 2016 20:04:29 +0000 (20:04 +0000)]
Merge "Add comment for [p]select_smoke tests STDIN issue."
Christopher Ferris [Thu, 14 Jan 2016 19:12:38 +0000 (11:12 -0800)]
Add comment for [p]select_smoke tests STDIN issue.
Change-Id: I59cde8b5aaac3e27419ca86d16f85e5af568acf9
Yi Kong [Wed, 13 Jan 2016 11:28:14 +0000 (11:28 +0000)]
Add more tests for getifaddrs(3)
This adds the following two checks:
* getifaddrs sees the same list of interfaces as /sys/class/net.
* IPv4 addresses we get from netdevice(7) agrees with results from
getifaddrs.
Change-Id: I2f6d79d0b5cde6d98a0f671d1623b6b2bc75b60f
Dan Willemsen [Thu, 14 Jan 2016 08:20:09 +0000 (08:20 +0000)]
Merge "Fix Soong mips builds"
am:
1307831ba4
* commit '
1307831ba4528168ef0f9fc7df90583e5e49aa0c':
Fix Soong mips builds
Dan Willemsen [Thu, 14 Jan 2016 08:16:02 +0000 (08:16 +0000)]
Merge "Fix Soong mips builds"
Dan Willemsen [Thu, 14 Jan 2016 07:22:22 +0000 (23:22 -0800)]
Fix Soong mips builds
Change-Id: I6ae8208e077d831969b08e7abd232deaa20ceca1
Christopher Ferris [Thu, 14 Jan 2016 07:08:44 +0000 (07:08 +0000)]
Merge "Fix select failures when STDIN is ready."
am:
2576ce9442
* commit '
2576ce9442b1745977b138aff77c159faecbd894':
Fix select failures when STDIN is ready.
Christopher Ferris [Thu, 14 Jan 2016 07:04:53 +0000 (07:04 +0000)]
Merge "Fix select failures when STDIN is ready."
Christopher Ferris [Thu, 14 Jan 2016 06:38:09 +0000 (22:38 -0800)]
Fix select failures when STDIN is ready.
The select_smoke and pselect_smoke test can fail if STDIN has data ready
to be read. The easiest way to see the failure is to type on the command
line while running the tests.
To avoid this, allow the return value to be 2 or 3 and check which fds
are ready to be read.
Change-Id: Iafba332c5f3ed1943e3d34501f123dd45f06a8c4
Dan Albert [Thu, 14 Jan 2016 06:16:36 +0000 (06:16 +0000)]
Merge "Escape failure messages in XML test output."
am:
323900cd7d
* commit '
323900cd7dc2a2dc561563f6963806625d89e397':
Escape failure messages in XML test output.
Dan Albert [Thu, 14 Jan 2016 06:12:32 +0000 (06:12 +0000)]
Merge "Escape failure messages in XML test output."
Dan Albert [Thu, 14 Jan 2016 05:48:56 +0000 (21:48 -0800)]
Escape failure messages in XML test output.
The gtest XML format requires escaped HTML characters in the test
results.
Change-Id: Ieb9519a55cb52093dfb10a88e883b569bc372cdb
Christopher Ferris [Thu, 14 Jan 2016 05:19:56 +0000 (05:19 +0000)]
Merge "Add method to run fortified versions of funcs."
am:
c3aa3d892b
* commit '
c3aa3d892b1ead8a6c3a71b128045c62dad7edb3':
Add method to run fortified versions of funcs.
Christopher Ferris [Thu, 14 Jan 2016 05:16:33 +0000 (05:16 +0000)]
Merge "Add method to run fortified versions of funcs."
Christopher Ferris [Wed, 13 Jan 2016 21:47:58 +0000 (13:47 -0800)]
Add method to run fortified versions of funcs.
Add a way to turn fortify off for the files that test fortify functions.
This method involves simply compiling the same file with fortify off and
changing the test name slightly.
It's not very pretty, and it assumes that only these few files test
functions that can be fortified.
Bug:
15195631
Change-Id: Iba9db1d508b7d28a1d6968019cb70fe08864827b
Dan Willemsen [Wed, 13 Jan 2016 21:58:23 +0000 (21:58 +0000)]
Merge "Fix Soong x86 builds"
am:
df2f5fbe6f
* commit '
df2f5fbe6f3d3937c3caf95138e43ee15f6d8497':
Fix Soong x86 builds
Dan Willemsen [Wed, 13 Jan 2016 21:45:14 +0000 (21:45 +0000)]
Merge "Fix Soong x86 builds"
Dan Willemsen [Wed, 13 Jan 2016 21:36:11 +0000 (13:36 -0800)]
Fix Soong x86 builds
Change-Id: Ida3f3584f832d61caf7200557ea57be799eaf38e
Dimitry Ivanov [Wed, 13 Jan 2016 20:43:32 +0000 (20:43 +0000)]
Merge "Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc""
am:
126d5ab779
* commit '
126d5ab779d8d4b34e7450a36db4641629f15d29':
Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc"
Colin Cross [Wed, 13 Jan 2016 20:37:02 +0000 (20:37 +0000)]
Merge "Rearrange build files to support USE_SOONG=true"
am:
2487f3e15f
* commit '
2487f3e15f19cd370f2e45b466c577cbb4db23f8':
Rearrange build files to support USE_SOONG=true
Dan Willemsen [Wed, 13 Jan 2016 20:36:58 +0000 (20:36 +0000)]
Merge "Fix Soong x86 atom builds"
am:
5d10e69bea
* commit '
5d10e69bea2381317c70861cf9984275906c81b4':
Fix Soong x86 atom builds
Colin Cross [Wed, 13 Jan 2016 20:36:54 +0000 (20:36 +0000)]
Merge "Update Android.bp for changes to Android.mk"
am:
c292f57ec7
* commit '
c292f57ec74469c3202e74d171c5079b687869d1':
Update Android.bp for changes to Android.mk
Dimitry Ivanov [Wed, 13 Jan 2016 20:35:25 +0000 (20:35 +0000)]
Merge "Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc""
Dimitry Ivanov [Wed, 13 Jan 2016 20:32:12 +0000 (20:32 +0000)]
Revert "Move __system_property* to LIBC_PRIVATE for lp64 libc"
This reverts commit
ff14fb5a1f809d87125fa0d14f08d486b6bf1ea1.
Bug: http://b/
26497521
Change-Id: Id7131b37a31e936db0e72ef9969e1f13d2dd578f
Colin Cross [Wed, 13 Jan 2016 20:32:09 +0000 (20:32 +0000)]
Merge "Rearrange build files to support USE_SOONG=true"
Dan Willemsen [Wed, 13 Jan 2016 20:32:07 +0000 (20:32 +0000)]
Merge "Fix Soong x86 atom builds"
Colin Cross [Wed, 13 Jan 2016 20:31:39 +0000 (20:31 +0000)]
Merge "Update Android.bp for changes to Android.mk"
Dan Willemsen [Wed, 13 Jan 2016 03:35:40 +0000 (19:35 -0800)]
Fix Soong x86 atom builds
Change-Id: Ie92e605c499f128335a8da7cfefa7e6ae367a223
Elliott Hughes [Tue, 12 Jan 2016 23:22:25 +0000 (23:22 +0000)]
Merge "Fix <sys/sysmacros.h>."
am:
9817c6c0cf
* commit '
9817c6c0cfa01f6bf7e0700e2b7aab2c1220fe28':
Fix <sys/sysmacros.h>.
Elliott Hughes [Tue, 12 Jan 2016 23:16:00 +0000 (23:16 +0000)]
Merge "Fix <sys/sysmacros.h>."
Elliott Hughes [Tue, 12 Jan 2016 22:43:27 +0000 (14:43 -0800)]
Fix <sys/sysmacros.h>.
1. The definitions were wrong.
2. The definitions were inline functions.
3. The definitions were polluting the namespace even for code that doesn't
want BSD cruft.
Note that everybody will still get these by default, because you still get
all the BSD stuff by default.
Bug: http://b/
12706131
Change-Id: I062ecd09feef7a6e8ba1922d465b96a9c4bf4f4e
Colin Cross [Mon, 11 Jan 2016 20:28:17 +0000 (12:28 -0800)]
Rearrange build files to support USE_SOONG=true
Building with USE_SOONG=true will build with an Android.bp file if it is
present in the directory, otherwise an Android.mk file. Only a few of
the bionic directories compile with soong, so include all of them from
the top level Android.mk file and remove the top level Android.bp file.
Individual subdirectories with Android.bp files will use soong with
USE_SOONG=true.
Change-Id: Idf8d7977ea4668fa646be25b543bf9d3773de615
Elliott Hughes [Tue, 12 Jan 2016 21:04:07 +0000 (21:04 +0000)]
Merge "Add a getifaddrs(3) debugging tool."
am:
906e67fdba
* commit '
906e67fdba54459983bfa6bc29e02253a6990144':
Add a getifaddrs(3) debugging tool.
Elliott Hughes [Tue, 12 Jan 2016 20:57:48 +0000 (20:57 +0000)]
Merge "Add a getifaddrs(3) debugging tool."
Chih-hung Hsieh [Tue, 12 Jan 2016 19:51:13 +0000 (19:51 +0000)]
Merge "Explicit binary op order for both gcc and clang/llvm."
am:
2c7d1e67e0
* commit '
2c7d1e67e02816cade2bc7a89b5ea42523840b8e':
Explicit binary op order for both gcc and clang/llvm.
Chih-hung Hsieh [Tue, 12 Jan 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Explicit binary op order for both gcc and clang/llvm."
Chih-Hung Hsieh [Tue, 12 Jan 2016 17:48:09 +0000 (09:48 -0800)]
Explicit binary op order for both gcc and clang/llvm.
* gcc assembler parses (1 << n - 1) as ((1 << n) - 1)
* llvm assembler parses (1 << n - 1) as (1 << (n - 1))
BUG:
26289334
Change-Id: Iaaa3d07f59c0f87cb1b80b9a1c4e765b66846791
Elliott Hughes [Tue, 12 Jan 2016 05:30:07 +0000 (21:30 -0800)]
Add a getifaddrs(3) debugging tool.
...disguised as a test, because that's the easiest way to keep an eye on it.
Change-Id: Iec2531183790d12aec561d27645e5d400f69efbf
Colin Cross [Mon, 11 Jan 2016 21:20:55 +0000 (13:20 -0800)]
Update Android.bp for changes to Android.mk
Change-Id: Ie01e326e2776c699237b156155610d08801c0cd4
Elliott Hughes [Mon, 11 Jan 2016 21:47:11 +0000 (21:47 +0000)]
Merge "Add basic tests for <net/if.h>."
am:
6b5139856d
* commit '
6b5139856d291b89526b1f85c0533e42727b7af8':
Add basic tests for <net/if.h>.
Elliott Hughes [Mon, 11 Jan 2016 21:43:58 +0000 (21:43 +0000)]
Merge "Add basic tests for <net/if.h>."
Elliott Hughes [Mon, 11 Jan 2016 21:23:30 +0000 (21:23 +0000)]
Merge "Handle AF_PACKET in getifaddr(3)."
am:
8d809f18c7
* commit '
8d809f18c7db9431b52e79f32be24dd87bdc2dea':
Handle AF_PACKET in getifaddr(3).
Elliott Hughes [Mon, 11 Jan 2016 21:18:20 +0000 (13:18 -0800)]
Add basic tests for <net/if.h>.
Bug: http://b/
26447711
Change-Id: I9bbcdffc07e99c98e367a63de861ddc7b274d579
Elliott Hughes [Mon, 11 Jan 2016 21:16:42 +0000 (21:16 +0000)]
Merge "Handle AF_PACKET in getifaddr(3)."
Yi Kong [Tue, 22 Dec 2015 17:07:23 +0000 (17:07 +0000)]
Handle AF_PACKET in getifaddr(3).
Also fix a bug where we were mutating the address/broadcast address
of an existing entry rather than the new entry, and use 'const' to
ensure we don't make that mistake again.
Change-Id: I31c127a5d21879b52c85cd0f7ed2e66554a21e39
Elliott Hughes [Fri, 8 Jan 2016 18:57:56 +0000 (18:57 +0000)]
Merge "Defend against -fstack-protector in libc startup."
am:
195b85a80f
* commit '
195b85a80faadcb4180f7f8192fc8ae162165892':
Defend against -fstack-protector in libc startup.
Elliott Hughes [Fri, 8 Jan 2016 18:54:01 +0000 (18:54 +0000)]
Merge "Defend against -fstack-protector in libc startup."
Dimitry Ivanov [Fri, 8 Jan 2016 18:53:48 +0000 (18:53 +0000)]
Merge "Move __aeabi* symbols to LIBC_N version"
am:
2afe5af77f
* commit '
2afe5af77ff01e2ecf2c21e39bdb9b029c7e2cf4':
Move __aeabi* symbols to LIBC_N version
Dimitry Ivanov [Fri, 8 Jan 2016 18:50:13 +0000 (18:50 +0000)]
Merge "Move __aeabi* symbols to LIBC_N version"
Dimitry Ivanov [Fri, 8 Jan 2016 18:06:44 +0000 (10:06 -0800)]
Move __aeabi* symbols to LIBC_N version
We had these symbols incorrectly versioned as LIBC_PRIVATE
in M release. This change moves __aeabi* symbols from LIBC
to LIBC_N and adds __gnu_Unwind_Find_exidx to the list
Bug: https://github.com/android-ndk/ndk/issues/1
Change-Id: I0b353012adeacb00ae29ea10c63b9d1cf1cadbe7
Elliott Hughes [Thu, 7 Jan 2016 03:51:43 +0000 (19:51 -0800)]
Defend against -fstack-protector in libc startup.
Exactly which functions get a stack protector is up to the compiler, so
let's separate the code that sets up the environment stack protection
requires and explicitly build it with -fno-stack-protector.
Bug: http://b/
26276517
Change-Id: I8719e23ead1f1e81715c32c1335da868f68369b5
Josh Gao [Wed, 6 Jan 2016 22:54:11 +0000 (22:54 +0000)]
Merge "Kill BOARD_MALLOC_ALIGNMENT."
am:
988e71b2b2
* commit '
988e71b2b22117b0f7e994cbe764066630494125':
Kill BOARD_MALLOC_ALIGNMENT.
Josh Gao [Wed, 6 Jan 2016 22:49:30 +0000 (22:49 +0000)]
Merge "Kill BOARD_MALLOC_ALIGNMENT."
Josh Gao [Wed, 6 Jan 2016 22:06:55 +0000 (14:06 -0800)]
Kill BOARD_MALLOC_ALIGNMENT.
Bug: http://b/
26403338
Change-Id: Iba4006277fdb7c7ca60542c517634ae86c847b4f
Josh Gao [Wed, 6 Jan 2016 20:30:34 +0000 (20:30 +0000)]
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
am:
e1f8c66d0b
* commit '
e1f8c66d0b5806b4080d120723de2deec561a3ef':
Replace MALLOC_IMPL with MALLOC_SVELTE.
Josh Gao [Wed, 6 Jan 2016 20:08:13 +0000 (20:08 +0000)]
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
Elliott Hughes [Wed, 6 Jan 2016 19:57:04 +0000 (19:57 +0000)]
Merge "Temporary hack to avoid stack protector crashes."
am:
32388ba4dc
* commit '
32388ba4dc765619e89dac5b71a68372019da58e':
Temporary hack to avoid stack protector crashes.
Elliott Hughes [Wed, 6 Jan 2016 19:52:43 +0000 (19:52 +0000)]
Merge "Temporary hack to avoid stack protector crashes."
Tom Cherry [Wed, 6 Jan 2016 19:19:44 +0000 (19:19 +0000)]
Merge "Revert "system_properties.cpp: special case ro.* properties""
am:
9353089262
* commit '
9353089262b21f88a2dca6516f03a4dd39a5dbd1':
Revert "system_properties.cpp: special case ro.* properties"
Tom Cherry [Wed, 6 Jan 2016 19:16:31 +0000 (19:16 +0000)]
Merge "Revert "system_properties.cpp: special case ro.* properties""
Tom Cherry [Wed, 6 Jan 2016 18:52:52 +0000 (18:52 +0000)]
Revert "system_properties.cpp: special case ro.* properties"
This reverts commit
c5fd81ab2524a06be907d9c5234e79346bbbbd7c.
Bug:
26416032
Change-Id: Id2d6761fdf55efa28c0b08b597daaa5cd381d758