Dimitry Ivanov
5238eb0984
Merge "Implement load at fixed address feature"
2015-10-27 19:03:53 +00:00
Dmitriy Ivanov
126af757c6
Implement load at fixed address feature
...
Bug: http://b/24683631
Change-Id: I3a39ab526c8f9e213339b60e135e5459d0f41381
2015-10-27 11:27:34 -07:00
Elliott Hughes
3b9b14830b
Merge "Fix <utmp.h> declarations." am: 60752a2eea
...
am: 6e780f2f47
* commit '6e780f2f47655ce264cfe90c4a721eb609fdbfec':
Fix <utmp.h> declarations.
2015-10-27 15:15:10 +00:00
Elliott Hughes
6e780f2f47
Merge "Fix <utmp.h> declarations."
...
am: 60752a2eea
* commit '60752a2eeab8cd0b344b27c67a47e30628962211':
Fix <utmp.h> declarations.
2015-10-27 15:11:58 +00:00
Elliott Hughes
60752a2eea
Merge "Fix <utmp.h> declarations."
2015-10-27 15:07:12 +00:00
Elliott Hughes
9216a64c90
Fix <utmp.h> declarations.
...
If we're going to keep this useless header -- and I think it's too late to
remove it -- it may as well be correct.
Bug: http://b/17700469
Change-Id: Ifec4f8f1a984483d7fa7d81d47786f75b70ff4ba
2015-10-26 19:29:12 -07:00
Elliott Hughes
164bd7349b
Merge "Remove swap16/swap32/swap64 header pollution." am: a2cf3783d4
...
am: 00e9bfe523
* commit '00e9bfe523a045131142b13a766774f1ee43555e':
Remove swap16/swap32/swap64 header pollution.
2015-10-27 02:14:39 +00:00
Elliott Hughes
00e9bfe523
Merge "Remove swap16/swap32/swap64 header pollution."
...
am: a2cf3783d4
* commit 'a2cf3783d4e9a4008ed468ef3204593f8f549934':
Remove swap16/swap32/swap64 header pollution.
2015-10-27 02:11:17 +00:00
Elliott Hughes
a2cf3783d4
Merge "Remove swap16/swap32/swap64 header pollution."
2015-10-27 02:07:35 +00:00
Elliott Hughes
bf4c32df6b
Remove swap16/swap32/swap64 header pollution.
...
This seems to be obsolete BSD stuff, and the only references to it in the
tree are people #undef'ing it.
Bug: http://b/2735009
Change-Id: Icde523ae2d15cf1025357d861f97b415e89e4f9a
2015-10-26 17:51:42 -07:00
Dimitry Ivanov
159f0d4013
Merge "Implement Library Load Order Randomization" am: 6a4ddeb56e
...
am: 3d784087cd
* commit '3d784087cd292f5ed10f9560f28152db3c4d550e':
Implement Library Load Order Randomization
2015-10-26 22:43:06 +00:00
Dimitry Ivanov
3d784087cd
Merge "Implement Library Load Order Randomization"
...
am: 6a4ddeb56e
* commit '6a4ddeb56ef2144e98437ae82f84b09ea785e411':
Implement Library Load Order Randomization
2015-10-26 22:38:01 +00:00
Dimitry Ivanov
6a4ddeb56e
Merge "Implement Library Load Order Randomization"
2015-10-26 22:30:35 +00:00
Christopher Ferris
382524878a
Merge "Fix arm64 fenv warnings, and make warnings errors." am: 1ab8251030
...
am: 25a7efa7e9
* commit '25a7efa7e9a4bee5cae872c59a5edab8cae147da':
Fix arm64 fenv warnings, and make warnings errors.
2015-10-24 16:10:07 +00:00
Christopher Ferris
25a7efa7e9
Merge "Fix arm64 fenv warnings, and make warnings errors."
...
am: 1ab8251030
* commit '1ab8251030407ec397009b46db025f8e9688abc8':
Fix arm64 fenv warnings, and make warnings errors.
2015-10-24 16:06:17 +00:00
Christopher Ferris
1ab8251030
Merge "Fix arm64 fenv warnings, and make warnings errors."
2015-10-24 16:00:29 +00:00
Christopher Ferris
fa7752986d
Fix arm64 fenv warnings, and make warnings errors.
...
Even though the control registers being read/written in fenv.c only
have 32 bits that are used, the instructions take a 64 bit register.
Make sure the inline assembler in the macros use 64 bit values.
Verified that before the change and after the change, the disassembly
is exactly the same.
In addition, add -Werror to the cflags.
Change-Id: I6603779327488c23e3aab13300edf2e02b101916
2015-10-23 16:41:17 -07:00
Christopher Ferris
c9ad2274b2
Merge "Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC." am: ca430d9787
...
am: c5b9c4d72f
* commit 'c5b9c4d72f141fea8b03561c0c8f5f7068ea93ea':
Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC.
2015-10-23 21:08:31 +00:00
Dimitry Ivanov
172cdd79a5
Merge "refactoring: introduce MappedFileFragment" am: e08ab4b414
...
am: 67e282d511
* commit '67e282d5111fd8920b271dd1bbbb7348e06f719f':
refactoring: introduce MappedFileFragment
2015-10-23 21:08:26 +00:00
Christopher Ferris
c5b9c4d72f
Merge "Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC."
...
am: ca430d9787
* commit 'ca430d9787f1c11c2df8e908c64fe2ef2e6d54ed':
Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC.
2015-10-23 21:02:56 +00:00
Dimitry Ivanov
67e282d511
Merge "refactoring: introduce MappedFileFragment"
...
am: e08ab4b414
* commit 'e08ab4b4144b8c4c920221b403daa220b43df2fb':
refactoring: introduce MappedFileFragment
2015-10-23 21:02:51 +00:00
Christopher Ferris
ca430d9787
Merge "Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC."
2015-10-23 20:56:09 +00:00
Dimitry Ivanov
e08ab4b414
Merge "refactoring: introduce MappedFileFragment"
2015-10-23 20:54:00 +00:00
Christopher Ferris
a818445622
Rename LIBC64_HIDDEN to LIBC32_LEGACY_PUBLIC.
...
Change-Id: If4da9e46398ca5524f6f0680d70588e3dc7e80b4
2015-10-23 12:32:52 -07:00
Andreas Gampe
bdff4ce8ed
resolve merge conflicts of 216bff9ff3 to mnc-dr-dev.
...
am: 807032d0e1
* commit '807032d0e12877a4c92ac7f6072d5dd9e1f76f3c':
Sync with upstream NetBSD lib/libc/regex.
2015-10-23 05:39:52 +00:00
Andreas Gampe
807032d0e1
resolve merge conflicts of 216bff9ff3 to mnc-dr-dev.
...
Change-Id: I63c4f3a4e56f30d6f476ad2c623c23ee7e1a3778
android-6.0.1_r10
android-6.0.1_r9
android-6.0.1_r8
android-6.0.1_r7
android-6.0.1_r3
android-6.0.1_r1
android-6.0.0_r41
2015-10-22 22:15:26 -07:00
Yabin Cui
12b46fb00e
Merge "Use bionic lock in pthread_internal_t." am: c45f3bf3e6
...
am: 0507b6e9e6
* commit '0507b6e9e65132a95bc0e366faa0df729b219b43':
Use bionic lock in pthread_internal_t.
2015-10-23 04:36:12 +00:00
Yabin Cui
0507b6e9e6
Merge "Use bionic lock in pthread_internal_t."
...
am: c45f3bf3e6
* commit 'c45f3bf3e691f48af63c5ea2bf7a348a698013ac':
Use bionic lock in pthread_internal_t.
2015-10-23 04:32:44 +00:00
Yabin Cui
c45f3bf3e6
Merge "Use bionic lock in pthread_internal_t."
2015-10-23 04:26:54 +00:00
Yabin Cui
d26e780df6
Use bionic lock in pthread_internal_t.
...
It removes calling to pthread_mutex_lock() at the beginning of new
thread, which helps to support thread sanitizer.
Change-Id: Ia3601c476de7976a9177b792bd74bb200cee0e13
2015-10-22 20:14:33 -07:00
Dmitriy Ivanov
4f7a7ad3fe
Implement Library Load Order Randomization
...
Bug: http://b/24047022
Change-Id: I36e05b403bfbaae8542a95147f9114a8b9c8ac0e
2015-10-22 18:26:07 -07:00
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