Dmitriy Ivanov
cf1cbbe432
refactoring: introduce MappedFileFragment
...
Change-Id: I97b0c1131711ed0ac13ab33e3357e99e0b6b1a4e
2015-10-22 18:01:56 -07:00
Christopher Ferris
216bff9ff3
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
...
am: afff4442ae
* commit 'afff4442ae092469f298a71862d61c65ceb67b03':
Sync with upstream NetBSD lib/libc/regex.
2015-10-22 22:27:54 +00:00
Christopher Ferris
afff4442ae
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
...
Change-Id: I56c1bb2adb4b6a48733c928415e788e689b4944e
2015-10-21 14:56:52 -07:00
Elliott Hughes
d676080a37
Sync with upstream NetBSD lib/libc/regex.
...
am: 055a66c9b1
* commit '055a66c9b1017c01b82c12b65a571bf9efad8b19':
Sync with upstream NetBSD lib/libc/regex.
2015-10-21 21:45:01 +00:00
Dan Willemsen
258a775d75
Merge "Switch to LOCAL_SRC_FILES_EXCLUDE" am: 5edf077c5b
...
am: 788eae7286
* commit '788eae728675bcf59f2b0809e85532c6ac357e2c':
Switch to LOCAL_SRC_FILES_EXCLUDE
2015-10-20 20:58:25 +00:00
Dan Willemsen
788eae7286
Merge "Switch to LOCAL_SRC_FILES_EXCLUDE"
...
am: 5edf077c5b
* commit '5edf077c5b92f0db212e45ed5402339a6e4c7334':
Switch to LOCAL_SRC_FILES_EXCLUDE
2015-10-20 20:52:01 +00:00
Dan Willemsen
5edf077c5b
Merge "Switch to LOCAL_SRC_FILES_EXCLUDE"
2015-10-20 20:44:29 +00:00
Dan Willemsen
268a673bd1
Switch to LOCAL_SRC_FILES_EXCLUDE
...
This moves the generic arm/arm64/x86 settings into the main makefiles
and makes the rest of them derivatives. This better aligns with how
soong handles arch/cpu variants.
Also updates the Android.bp to make it consistent with the make
versions.
Change-Id: I5a0275d992bc657459eb6fe1697ad2336731d122
2015-10-20 11:58:28 -07:00
Mike Frysinger
4e0c4032d1
Merge "dlfcn: update ifdef around old_name_" am: 5c495dacda
...
am: 0fb6704e82
* commit '0fb6704e82fef450a01cca3b13d2fa02f66d47a5':
dlfcn: update ifdef around old_name_
2015-10-20 18:42:59 +00:00
Mike Frysinger
0fb6704e82
Merge "dlfcn: update ifdef around old_name_"
...
am: 5c495dacda
* commit '5c495dacdadff9dfbe48be31d4b30c5fe75ac7db':
dlfcn: update ifdef around old_name_
2015-10-20 18:31:32 +00:00
Mike Frysinger
5c495dacda
Merge "dlfcn: update ifdef around old_name_"
2015-10-20 18:23:22 +00:00
Mike Frysinger
747d30ebf3
dlfcn: update ifdef around old_name_
...
Commit 9185e04f72c16d2a66d92ac89b38ee926d7f706b changed the ifdef around
old_name_ from __arm__ to __work_around_b_###__, but missed one place in
dlfcn.cpp. So if you do a build w/out that workaround for arm, you end
up with a build failure:
bionic/linker/dlfcn.cpp:275:27: error: no member named 'old_name_' in 'soinfo'
strlcpy(__libdl_info->old_name_, __libdl_info->soname_, sizeof(__libdl_info->old_name_));
~~~~~~~~~~~~ ^
bionic/linker/dlfcn.cpp:275:82: error: no member named 'old_name_' in 'soinfo'
strlcpy(__libdl_info->old_name_, __libdl_info->soname_, sizeof(__libdl_info->old_name_));
~~~~~~~~~~~~ ^
Bug: 24425865
Change-Id: Idbe1cc1c28083afeee6d90203c221f30f661c69c
2015-10-20 14:06:25 -04:00
Josh Gao
56ecb9bf2a
Merge "Remove deprecated use of ldm/stm in ARM setjmp." am: f5ea085844
...
am: 053867ded8
* commit '053867ded82271f3f2795f3dcf62b4e7735619c8':
Remove deprecated use of ldm/stm in ARM setjmp.
2015-10-20 01:48:47 +00:00
Josh Gao
053867ded8
Merge "Remove deprecated use of ldm/stm in ARM setjmp."
...
am: f5ea085844
* commit 'f5ea085844c66e7a65709edd7485a49396e556ce':
Remove deprecated use of ldm/stm in ARM setjmp.
2015-10-20 01:30:32 +00:00
Josh Gao
f5ea085844
Merge "Remove deprecated use of ldm/stm in ARM setjmp."
2015-10-20 01:01:19 +00:00
Josh Gao
b24d743f62
Remove deprecated use of ldm/stm in ARM setjmp.
...
ARM deprecates using the SP register in the register lists for ldm
and stm, which LLVM emits a warning for.
Bug: http://b/25017080
Change-Id: Ib427e3dfd5740e251f1ad91ebb66534e0d7b72a9
2015-10-19 17:13:51 -07:00
Elliott Hughes
64f628f8d3
am 43b1f823: am 1a61896b: am 98384649: am 75316283: am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '43b1f823b5a739437cbe14e24d8449028e3c8f6e':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 17:46:59 +00:00
Elliott Hughes
055a66c9b1
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
(cherry-picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
2015-10-19 10:42:31 -07:00
Elliott Hughes
43b1f823b5
am 1a61896b: am 98384649: am 75316283: am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '1a61896b1bc470f9377eeeafec461aba0d0dda6c':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 17:32:59 +00:00
Elliott Hughes
1a61896b1b
am 98384649: am 75316283: am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '98384649b2d3f3eb5b03077bc0004e14a99a4d55':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 17:29:49 +00:00
Elliott Hughes
98384649b2
am 75316283: am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '753162836a0d3a82739611c9e30aa872363558b1':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 17:25:29 +00:00
Elliott Hughes
753162836a
am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '2d23418e68acdab7e142cc75db2850a54aa829aa':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 10:14:41 -07:00
Elliott Hughes
2d23418e68
am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '18442e023536c5cf205b820ed5d74b972b710acb':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 10:07:34 -07:00
Elliott Hughes
18442e0235
am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit 'beb6e08abf1393663151afde2742bb23eccab4e1':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 15:34:19 +00:00
Elliott Hughes
630855a6d5
am 6764e0b5: am d29ba555: Merge "Opt Brillo out of the ndk cruft."
...
* commit '6764e0b5e546c318d13fcac0ddbf0bea88271768':
Opt Brillo out of the ndk cruft.
2015-10-17 03:16:47 +00:00
Elliott Hughes
6764e0b5e5
am d29ba555: Merge "Opt Brillo out of the ndk cruft."
...
* commit 'd29ba555130f1e61164cf6186cd6a29c7aa14719':
Opt Brillo out of the ndk cruft.
2015-10-16 20:10:48 -07:00
Elliott Hughes
d29ba55513
Merge "Opt Brillo out of the ndk cruft."
2015-10-17 03:06:41 +00:00
Elliott Hughes
beb6e08abf
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
(cherry-picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
2015-10-16 17:52:55 -07:00
Dimitry Ivanov
a60b1aebb7
am 114605b0: am 5fd94dfe: Merge "Replace auto -> const auto&/auto&&"
...
* commit '114605b03666230f11113990b828356bfe692278':
Replace auto -> const auto&/auto&&
2015-10-16 20:48:32 +00:00
Dimitry Ivanov
56cd1962b2
am c0e917ab: am 9c2122e8: Merge "Fix R_AARCH64_ABS/PREL relocations"
...
* commit 'c0e917abe5e94ce9729a8302b5ef3cb318003ea5':
Fix R_AARCH64_ABS/PREL relocations
2015-10-16 20:48:30 +00:00
Dimitry Ivanov
114605b036
am 5fd94dfe: Merge "Replace auto -> const auto&/auto&&"
...
* commit '5fd94dfe3b36ee56e54d2002ad3a5e0fa8bff683':
Replace auto -> const auto&/auto&&
2015-10-16 13:41:45 -07:00
Dimitry Ivanov
c0e917abe5
am 9c2122e8: Merge "Fix R_AARCH64_ABS/PREL relocations"
...
* commit '9c2122e803a01c80bef550eac2b24b5a79635a2a':
Fix R_AARCH64_ABS/PREL relocations
2015-10-16 13:41:44 -07:00
Dimitry Ivanov
5fd94dfe3b
Merge "Replace auto -> const auto&/auto&&"
2015-10-16 20:37:34 +00:00
Dimitry Ivanov
9c2122e803
Merge "Fix R_AARCH64_ABS/PREL relocations"
2015-10-16 20:36:25 +00:00
Dmitriy Ivanov
77f91c6d99
Fix R_AARCH64_ABS/PREL relocations
...
According to specification arm64 relocations
should not use *reloc value.
See http://infocenter.arm.com/help/topic/com.arm.doc.ihi0056b/IHI0056B_aaelf64.pdf
section 4.6.5
Bug: http://b/24977219
Bug: http://b/24527155
Change-Id: I3813255771f408ba957963c6ad56ed08e5110d83
2015-10-16 10:42:16 -07:00
Neil Fuller
3676052ce7
am 842866bd: Merge "Update timezone data to 2015g" into mnc-dr-dev
...
* commit '842866bd00220119e03fd8d2e6b77d7187b4b38c':
Update timezone data to 2015g
2015-10-15 09:21:59 +00:00
Neil Fuller
842866bd00
Merge "Update timezone data to 2015g" into mnc-dr-dev
2015-10-15 08:25:58 +00:00
Dmitriy Ivanov
845dd0266b
resolved conflicts for 95ac6dbb to mnc-dr-dev-plus-aosp
...
Change-Id: I8937cd33aa375824965d4f919038a99b30ab75ea
2015-10-14 18:41:36 -07:00
Dimitry Ivanov
c70d479dc6
am 8c9cb682: am 074efa02: Merge "Ensure that readlink has access to /proc/self/fd"
...
* commit '8c9cb6820fca3f73414219d816e10355a7052dbd':
Ensure that readlink has access to /proc/self/fd
2015-10-15 01:37:37 +00:00
Dimitry Ivanov
8c9cb6820f
am 074efa02: Merge "Ensure that readlink has access to /proc/self/fd"
...
* commit '074efa02a7de67589c36f75222e3b45c3f15206a':
Ensure that readlink has access to /proc/self/fd
2015-10-15 01:31:15 +00:00
Christopher Ferris
9e2d37ccae
am 3c30a156: Merge "Sync with upstream NetBSD lib/libc/regex." into mnc-dr-dev
...
* commit '3c30a156523f40250361e6ed8791919d1c71a4bb':
Sync with upstream NetBSD lib/libc/regex.
2015-10-15 01:29:05 +00:00
Dimitry Ivanov
074efa02a7
Merge "Ensure that readlink has access to /proc/self/fd"
2015-10-15 01:27:17 +00:00
Dmitriy Ivanov
4e50d0247b
Ensure that readlink has access to /proc/self/fd
...
/proc/self/fd is not available when PR_DUMPABLE is set to 0
which is default for the user builds. It leads to permission
denials on readlink.
This change fixes the problem by setting PR_DUMPABLE flag to 1
for readlink and restoring it's previous value after the call.
Bug: http://b/24912743
Change-Id: I3fd179c5c6b56af96d6a15ee597024ccb15e1a13
(cherry picked from commit cf92738fa5dee24050028a1235f815f2a0fd33b5)
2015-10-14 18:24:54 -07:00
Dimitry Ivanov
95ac6dbbb2
Merge "Ensure that readlink has access to /proc/self/fd" into mnc-dr-dev
2015-10-15 01:17:55 +00:00
Christopher Ferris
3c30a15652
Merge "Sync with upstream NetBSD lib/libc/regex." into mnc-dr-dev
2015-10-15 01:15:22 +00:00
Josh Gao
b16f1b4b89
am 559d9cf5: am c433a36f: Merge "Move malloc dispatch table to __libc_globals."
...
* commit '559d9cf5fa6d5339d1578530a73ecb81a91c27d9':
Move malloc dispatch table to __libc_globals.
2015-10-14 23:54:59 +00:00
Josh Gao
559d9cf5fa
am c433a36f: Merge "Move malloc dispatch table to __libc_globals."
...
* commit 'c433a36fb5fb8a1050e8ecbd94d215123b829e07':
Move malloc dispatch table to __libc_globals.
2015-10-14 23:50:51 +00:00
Josh Gao
c433a36fb5
Merge "Move malloc dispatch table to __libc_globals."
2015-10-14 23:47:41 +00:00
Elliott Hughes
9a9572d577
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
(cherry picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
Change-Id: I4a914f0594a66f38efb3026b7ba9d28a4887cb2d
2015-10-14 16:30:08 -07:00
Dmitriy Ivanov
cf92738fa5
Ensure that readlink has access to /proc/self/fd
...
/proc/self/fd is not available when PR_DUMPABLE is set to 0
which is default for the user builds. It leads to permission
denials on readlink.
This change fixes the problem by setting PR_DUMPABLE flag to 1
for readlink and restoring it's previous value after the call.
Bug: http://b/24912743
Change-Id: I3fd179c5c6b56af96d6a15ee597024ccb15e1a13
2015-10-14 11:15:45 -07:00