OSDN Git Service
Dmitriy Ivanov [Sun, 2 Nov 2014 01:02:31 +0000 (18:02 -0700)]
resolved conflicts for merge of
926797a8 to lmp-mr1-dev-plus-aosp
Change-Id: I3b46a714fd1236431fa08872f280e4ac4c4880d1
Dmitriy Ivanov [Sat, 1 Nov 2014 03:00:56 +0000 (03:00 +0000)]
am
75cd66aa: am
38ff8822: Merge "Revert "Use local copy of the library name on dlopen""
* commit '
75cd66aaf60f47e04359738a9c8d92588a1f7834':
Revert "Use local copy of the library name on dlopen"
Dmitriy Ivanov [Sat, 1 Nov 2014 02:35:51 +0000 (02:35 +0000)]
am
38ff8822: Merge "Revert "Use local copy of the library name on dlopen""
* commit '
38ff8822763a30d4c9033a38ec8b71fcd17aba87':
Revert "Use local copy of the library name on dlopen"
Dmitriy Ivanov [Sat, 1 Nov 2014 02:32:22 +0000 (02:32 +0000)]
Merge "Revert "Use local copy of the library name on dlopen""
Dmitriy Ivanov [Sat, 1 Nov 2014 02:30:38 +0000 (02:30 +0000)]
Revert "Use local copy of the library name on dlopen"
This reverts commit
da8e591c3996879e41dc5f70b77d1b0fe6f9c225.
Change-Id: I3fd6f235b18c232af5cc5ecd481851486d7d68f6
Dmitriy Ivanov [Sat, 1 Nov 2014 00:27:02 +0000 (17:27 -0700)]
Fix arm64 and arm builds.
Bug:
18186310
(cherry picked from commit
4e446b19d8710cd2004785db4a00f18f249fe73f)
Change-Id: Ibc77a9ade36dc6b9bf5a316b5ab9ae5f0a70e826
Dmitriy Ivanov [Sat, 1 Nov 2014 00:39:45 +0000 (00:39 +0000)]
am
6cba0e35: am
36ffc73e: Merge "Fix arm64 and arm builds."
* commit '
6cba0e35ec62e86689556142a08f547f27b703dd':
Fix arm64 and arm builds.
Dmitriy Ivanov [Sat, 1 Nov 2014 00:36:23 +0000 (00:36 +0000)]
am
36ffc73e: Merge "Fix arm64 and arm builds."
* commit '
36ffc73e992de77cc4bc397e41767b69ed9ac917':
Fix arm64 and arm builds.
Dmitriy Ivanov [Sat, 1 Nov 2014 00:33:29 +0000 (00:33 +0000)]
Merge "Fix arm64 and arm builds."
Dmitriy Ivanov [Sat, 1 Nov 2014 00:27:02 +0000 (17:27 -0700)]
Fix arm64 and arm builds.
Change-Id: I2c8c41626768e792f27a2616f2cd5ae66606319d
Dmitriy Ivanov [Thu, 28 Aug 2014 21:12:12 +0000 (14:12 -0700)]
Fix symbol lookup order during relocation
Relocate symbol against DF_1_GLOBAL shared libraries
loaded before this shared library. This includes
main executable, ld_preloads and other libraries
that have DF_1_GLOBAL flag set.
Bug:
2643900
Bug:
15432753
Bug:
18186310
(cherry picked from commit
d225a5e65223b375a63548c4b780f04d8f3d7b60)
Change-Id: I4e889cdf2dfbf8230b0790053d311ee6b0d0ee2d
Dmitriy Ivanov [Thu, 23 Oct 2014 21:34:12 +0000 (14:34 -0700)]
Fix mips build
Bug:
18186310
(cherry picked from commit
90b74fb8671db6f5512821a033e12a6248e5c804)
Change-Id: I8d4ed254e5c421b65b62c401abdb1ee07e5dc3b2
Dmitriy Ivanov [Thu, 23 Oct 2014 21:19:07 +0000 (14:19 -0700)]
Remove unnecessary lookups during relocations
local_group includes this library and its dependencies.
Bug:
18186310
(cherry picked from commit
e47b3f8456fc34ac136e9fddef59a9ae37febcbe)
Change-Id: I93c2d873e924df7319569307444bf603d7d27bf0
Dmitriy Ivanov [Tue, 21 Oct 2014 16:23:18 +0000 (09:23 -0700)]
Fix relocation to look for symbols in local group
The local group is a sequence of libraries in default (breadth-first)
order. It allows RTLD_LOCALLY loaded library to correctly relocate
symbols within its group (see test-cases).
Local group lookup is performed after main executable and ld_preloads.
Bug:
2643900
Bug:
15432753
Bug:
18186310
(cherry picked from commit
cfa97f172dc1b10d650fefbb6ccffd88ce72a5fb)
Change-Id: I5fa8c673f929e4652c738912c7ae078d7ec286d2
Dmitriy Ivanov [Fri, 17 Oct 2014 18:47:18 +0000 (11:47 -0700)]
Correct way to specify additional dependencies
Previous one was not covering all the targets
Bug:
17548097
Bug:
18186310
(cherry picked from commit
4a9e1937c56511aef579312bf39ab345f9179230)
Change-Id: I2cd9e58893555d16cbfe291b2d1279621489d5ad
Dmitriy Ivanov [Fri, 31 Oct 2014 06:42:45 +0000 (23:42 -0700)]
Add dlfcn_test to glibc test suite.
Bug:
18186310
(cherry picked from commit
eb27bbae8f0edc6b62ca2db73256c7fb53b9e9bf)
Change-Id: I1d608dfa12dbafbdcdb8bc6d818c5872404c19e0
Dmitriy Ivanov [Wed, 15 Oct 2014 21:59:01 +0000 (14:59 -0700)]
Ignore DT_BIND_NOW (0x18)
Bug:
18186310
Bug:
17552334
(cherry picked from commit
ea6eae182ad64312f80b9adddac511d8938e23e7)
Change-Id: I07d6f6fbb462fea329581d0da02f6d88be1c262f
Dmitriy Ivanov [Mon, 6 Oct 2014 18:30:43 +0000 (11:30 -0700)]
Resolve "unused DT entry" warnings for x86_64
Bug:
18186310
(cherry picked from commit
513e29e16f16a6ffa1636ba282d599fd6b437aeb)
Change-Id: I1e4c5af2cdc09dc978c7a78fcdcf8796c919751e
Dmitriy Ivanov [Mon, 19 May 2014 22:06:58 +0000 (15:06 -0700)]
Add RTLD_NODELETE flag support
Bug:
18186310
Bug: https://code.google.com/p/android/issues/detail?id=64069
(cherry picked from commit
1b20dafdbe65e43b9f4c95057e8482380833ea91)
Change-Id: Ic02eec22a7c322ece65eb40730a3404f611526b1
Dmitriy Ivanov [Tue, 30 Sep 2014 23:30:22 +0000 (16:30 -0700)]
Fix mips build
Bug:
18186310
(cherry picked from commit
ecf532fa1cfe91ca946243c11ef154c602870ba6)
Change-Id: Ia12f2fa28c8cd3204eb7d6b4c7d872f4e81fb8ef
Dmitriy Ivanov [Tue, 30 Sep 2014 02:14:45 +0000 (19:14 -0700)]
Fix unused DT entry warnings.
DT_STRSZ Implement strtab boundary checks
DT_FLAGS_1 Warn if flags other than DF_1_NOW|DF_1_GLOBAL are set
Bug:
17552334
Bug:
18186310
(cherry picked from commit
6cdeb5234d7f4523fe9d83974f265d80f10512a6)
Change-Id: I7ffc7bc600798308a77ad949a644949b64250ae2
Dmitriy Ivanov [Mon, 29 Sep 2014 19:10:36 +0000 (12:10 -0700)]
Return has_DT_SYMBOLIC flag.
This reverts commit
8f61d991831f0ea515fa50a5c38dbbcfbab0dd28
Despite the fact that static linker does all the work while linking
-Bsymbolic executables, according to the SCO doc following DT_SYMBOLIC
and DF_SYMBOLIC flags is still a requirement for the dynamic linker
as well.
(see http://www.sco.com/developers/gabi/2012-12-31/ch5.dynamic.html)
Bug:
18186310
(cherry picked from commit
96bc37f2e1093416a432135265fd7a4db6c3df17)
Change-Id: Ie217be4f3305d877066e4cfe91975ae1c7768330
Elliott Hughes [Tue, 23 Sep 2014 00:43:09 +0000 (17:43 -0700)]
Fix a couple more cases of missing CLOEXEC.
The debuggerd case can probably never happen, because you're crashing at this
point anyway. The system property one seems possible though.
Bug:
18186310
(cherry picked from commit
0dc39f9952c5e3a3121ea77357bb264ef0f8ded7)
Change-Id: I3e84488fc246f6c28cbd82e96d0cd4343a12c28a
Dmitriy Ivanov [Wed, 17 Sep 2014 23:46:40 +0000 (16:46 -0700)]
Temporary disable DL_WARNs for unused DT_*
Bug:
17552334
Bug:
18186310
(cherry picked from commit
1b77423eff21e916186fcb208f138e436e9f3052)
Change-Id: I8a9d05195a862bc287fff7156913606f0311b8bb
Dmitriy Ivanov [Wed, 17 Sep 2014 06:34:20 +0000 (23:34 -0700)]
Fix 64bit build
Bug:
18186310
(cherry picked from commit
f240aa8089ea1574a7d799720efb66528f6ceb99)
Change-Id: Id46f1f9be90a17a58fb44d3540095c8c685c9726
Dmitriy Ivanov [Tue, 16 Sep 2014 22:51:25 +0000 (15:51 -0700)]
Fix some unused DT_ warnings
* DT_PLTGOT - ignored for non-mips
* DT_RELCOUNT/RELACOUNT - ignored
* DT_RELENT/RELAENT - sanity checks
* DT_SYMENT - sanity check
* DT_SONAME - ignore for now.
Bug:
18186310
(cherry picked from commit
4a6e9a835a84aca965f0170f604381dae7f130be)
Change-Id: Ib40095f0770d65628fc7abac5a471378de35ebe7
Dmitriy Ivanov [Tue, 16 Sep 2014 21:31:06 +0000 (14:31 -0700)]
Remove has_DT_SYMBOLIC flag
From the elf-spec: "Symbolically bound shared objects are
identified by the .dynamic entry DT_SYMBOLIC. This tag is
informational only; the runtime linker processes symbol
lookups from these objects in the same manner as any
other object."
Bug:
18186310
(cherry picked from commit
8f61d991831f0ea515fa50a5c38dbbcfbab0dd28)
Change-Id: I37024799ac8d1837993c8ae78780a448bedd6539
Dmitriy Ivanov [Tue, 16 Sep 2014 00:00:10 +0000 (17:00 -0700)]
Fix dlsym() to take into account RTLD_GLOBAL/LOCAL
Symbols from libraries opened with RTLD_LOCAL (default)
should not be visible via dlsym(RLTD_DEFAULT/RTLD_NEXT, .)
Bug:
17512583
Bug:
18186310
(cherry picked from commit
e8ba50fe0d51fbefee1a8f5bb62bf51d841512c8)
Change-Id: Idf6bbe2233fb2bfc0c88677e7d1fc518fb3f7a8b
Dmitriy Ivanov [Fri, 12 Sep 2014 16:43:13 +0000 (09:43 -0700)]
Reformatting
No functional changes.
Bug:
18186310
(cherry picked from commit
6abf624d122bec8c80cc9fe1b692265bf1b28b1b)]
Change-Id: I0acf52d8ee7fe2d4f44bc832cbe9fabe1782f03f
Dmitriy Ivanov [Fri, 31 Oct 2014 23:57:29 +0000 (23:57 +0000)]
am
a334934f: am
f33ad400: Merge "Fix symbol lookup order during relocation"
* commit '
a334934f66386ecdf3ec07daf0b651fcf3b8dcce':
Fix symbol lookup order during relocation
Dmitriy Ivanov [Fri, 31 Oct 2014 23:54:20 +0000 (23:54 +0000)]
am
f33ad400: Merge "Fix symbol lookup order during relocation"
* commit '
f33ad400230fa1f16ba4501efb60a1b6035e06ca':
Fix symbol lookup order during relocation
Dmitriy Ivanov [Fri, 31 Oct 2014 23:51:18 +0000 (23:51 +0000)]
Merge "Fix symbol lookup order during relocation"
Dmitriy Ivanov [Fri, 31 Oct 2014 22:57:06 +0000 (22:57 +0000)]
am
703581a3: am
74c0ccd4: Merge "Use local copy of the library name on dlopen"
* commit '
703581a3220123a4fc44acbf3a94c835a7cf5ed0':
Use local copy of the library name on dlopen
Dmitriy Ivanov [Fri, 31 Oct 2014 22:51:38 +0000 (22:51 +0000)]
am
74c0ccd4: Merge "Use local copy of the library name on dlopen"
* commit '
74c0ccd49b2f0a94078b565b60c10ecba1e9424e':
Use local copy of the library name on dlopen
Dmitriy Ivanov [Fri, 31 Oct 2014 22:47:24 +0000 (22:47 +0000)]
Merge "Use local copy of the library name on dlopen"
Dmitriy Ivanov [Fri, 31 Oct 2014 20:46:42 +0000 (13:46 -0700)]
Use local copy of the library name on dlopen
Bug:
18052100
Change-Id: Idbc2a3691db3b5525d4e9bca81d78d5f29bc438f
Dmitriy Ivanov [Thu, 28 Aug 2014 21:12:12 +0000 (14:12 -0700)]
Fix symbol lookup order during relocation
Relocate symbol against DF_1_GLOBAL shared libraries
loaded before this shared library. This includes
main executable, ld_preloads and other libraries
that have DF_1_GLOBAL flag set.
Bug:
2643900
Bug:
15432753
Change-Id: Ia788748be59b739d1c7e62b978e7e255f9e65c7b
Dan Albert [Fri, 31 Oct 2014 06:12:21 +0000 (06:12 +0000)]
am
653263a9: Only use <atomic> for C++11 and newer.
* commit '
653263a96459c5c1811623bd84201c324a870280':
Only use <atomic> for C++11 and newer.
Dan Albert [Thu, 16 Oct 2014 14:52:51 +0000 (07:52 -0700)]
Only use <atomic> for C++11 and newer.
Any pre-C++11 clients of stdatomic.h that use libc++ are being forced
over to <atomic>, which they don't have the language support to use.
Bug:
17736764
Change-Id: I62445c1f2541410a1569498c09433c7196635537
(cherry picked from commit
3ce0769aa5f9a991af1d167f730d987dd002253c)
Elliott Hughes [Thu, 30 Oct 2014 16:52:50 +0000 (09:52 -0700)]
Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge
Elliott Hughes [Thu, 30 Oct 2014 16:08:28 +0000 (16:08 +0000)]
am
25f4bb98: am
e38bf839: Merge "limits.h: add define for HOST_NAME_MAX"
* commit '
25f4bb984cf9a27ebfac0e8f0ab5481ce3bebf15':
limits.h: add define for HOST_NAME_MAX
Elliott Hughes [Thu, 30 Oct 2014 16:02:29 +0000 (16:02 +0000)]
am
e38bf839: Merge "limits.h: add define for HOST_NAME_MAX"
* commit '
e38bf839837d11542e7d1deb00d81542a0ef55b7':
limits.h: add define for HOST_NAME_MAX
Elliott Hughes [Thu, 30 Oct 2014 15:56:44 +0000 (15:56 +0000)]
Merge "limits.h: add define for HOST_NAME_MAX"
Yongqin Liu [Wed, 29 Oct 2014 06:47:47 +0000 (14:47 +0800)]
limits.h: add define for HOST_NAME_MAX
according to the rules defined here:
http://pubs.opengroup.org/onlinepubs/
009695399/basedefs/limits.h.html
add the definition for HOST_NAME_MAX to limits.h file,
and set the default value to _POSIX_HOST_NAME_MAX as 255
Change-Id: Iddd5c6c569f4e0a14994c7a7c54985f3e7809fc4
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Elliott Hughes [Wed, 29 Oct 2014 23:22:30 +0000 (23:22 +0000)]
Merge changes I0feda6b2,I22d13fde,I49d7d09d,Ice490bfe into lmp-mr1-dev
* changes:
Fix the type of u_ar0 in <sys/user.h>.
Add greg_t for arm64.
POSIX says <signal.h> gets you ucontext_t.
Add in_port_t and move it and in_addr_t to the correct header file.
Elliott Hughes [Wed, 29 Oct 2014 20:56:29 +0000 (20:56 +0000)]
am
4c29b1c2: am
f362e9fb: Merge "Remove an unused file."
* commit '
4c29b1c266aa7ac81a7b67a6170f52c12aca712d':
Remove an unused file.
Elliott Hughes [Wed, 29 Oct 2014 20:51:27 +0000 (20:51 +0000)]
am
f362e9fb: Merge "Remove an unused file."
* commit '
f362e9fb33722f89cebe65ddf2f07d2b07e4390e':
Remove an unused file.
Elliott Hughes [Wed, 29 Oct 2014 20:46:30 +0000 (20:46 +0000)]
Merge "Remove an unused file."
Elliott Hughes [Wed, 29 Oct 2014 20:42:23 +0000 (13:42 -0700)]
Remove an unused file.
We don't have any FreeBSD stdio left.
Bug:
17154680
Change-Id: I145627f564364ac8d4707d431d451cc3115c1c6a
Elliott Hughes [Wed, 29 Oct 2014 20:42:10 +0000 (20:42 +0000)]
am
24464b04: am
d50495a5: Merge "Extra strtod/strtof tests."
* commit '
24464b04a0d5a7645b8e751c6a9ef0c6574d52c2':
Extra strtod/strtof tests.
Yabin Cui [Wed, 29 Oct 2014 19:42:32 +0000 (19:42 +0000)]
am
63edd69e: am
cbb4606a: Merge "change unsigned int to uint32_t for api arc4random/arc4random_uniform"
* commit '
63edd69e576a9f1faebc493bc6d4e4729c70b02c':
change unsigned int to uint32_t for api arc4random/arc4random_uniform
Elliott Hughes [Wed, 29 Oct 2014 19:42:31 +0000 (19:42 +0000)]
am
91bfaed2: am
13dcb88b: Merge "Disable tzdata in ."
* commit '
91bfaed26a1e4595c387a27a789a71ec0eebfa73':
Disable tzdata in $ANDROID_DATA.
Elliott Hughes [Wed, 29 Oct 2014 19:38:36 +0000 (12:38 -0700)]
resolved conflicts for merge of
912fe0a6 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1cc84f34ccaf27eae4f3c292d67d44a9f0276bc
Elliott Hughes [Sat, 25 Oct 2014 03:57:09 +0000 (20:57 -0700)]
Fix the type of u_ar0 in <sys/user.h>.
(cherry picked from commit
e03950fa0c5567edf70d011b856a027e03b1c0f7)
Bug:
18172268
Change-Id: I0feda6b253882f68f47bcf30fad998286cc7f620
Elliott Hughes [Fri, 19 Sep 2014 17:31:49 +0000 (10:31 -0700)]
Add greg_t for arm64.
This was already present for the other architectures. I think we skipped
this because glibc seems to have an incorrect definition (int rather than
long), but the kernel has the sane definition (just not in a uapi header).
(cherry picked from commit
8e4d371091e5738346f5c6ad395b8487c2a5ec67)
Bug:
18172268
Change-Id: I22d13fdeb6431ea122dd028a229782dcaf2286b2
Elliott Hughes [Sat, 13 Sep 2014 03:04:40 +0000 (20:04 -0700)]
POSIX says <signal.h> gets you ucontext_t.
POSIX also says that ucontext_t's uc_sigmask has type sigset_t.
MIPS64 strace needs this.
The #define is to keep chromium off our lawn; otherwise it tries to redefine
all this stuff itself. We should probably clean that up and remove the #define.
(cherry picked from commit
26a8eb50a84e131d34d10d5d167d67e9995399bd)
Bug:
18172268
Change-Id: I49d7d09dabfc6c6926a8e1f4b235d041e2f2fc4d
Elliott Hughes [Tue, 19 Aug 2014 19:43:50 +0000 (12:43 -0700)]
Add in_port_t and move it and in_addr_t to the correct header file.
No one's reported this, but I saw it in an Android port of fuser(1).
We still have lots of problems in our network headers because we
get most of the structs direct from the kernel, and it doesn't use
types like this (which is why we've got away without this one for
so long). One day we should probably look at cleaning that up, but
doing so can wait.
(cherry picked from commit
35d226e05d92824c6eb992e7a64ea22efc8bae03)
Bug:
18172268
Change-Id: Ice490bfe84afb04722d738128053d4c533b8a664
Christopher Ferris [Tue, 30 Sep 2014 18:53:13 +0000 (11:53 -0700)]
Add stpcpy assembler version.
For generic, continue to use the C version of the code.
Bug:
13746695
(cherry picked from commit
7d849ac378515efa1522e538e6e1d3b546cae97d)
Change-Id: Iae44785f37f9bb59103ab78fb9f74c92f8a95c7f
Elliott Hughes [Wed, 29 Oct 2014 17:46:53 +0000 (17:46 +0000)]
am
382938d0: am
ec58e29b: Merge "pthread_setname_np appears in glibc 2.12."
* commit '
382938d092c7427a74ae8a6507bbd49f01e5c2f9':
pthread_setname_np appears in glibc 2.12.
Elliott Hughes [Wed, 29 Oct 2014 17:46:53 +0000 (17:46 +0000)]
am
7dbb1cff: am
021b6412: Merge "Fix the type of u_ar0 in <sys/user.h>."
* commit '
7dbb1cff0b40b4f6a2792b73f24ac912cfe121d5':
Fix the type of u_ar0 in <sys/user.h>.
Elliott Hughes [Wed, 29 Oct 2014 17:46:52 +0000 (17:46 +0000)]
am
ee8faa5e: am
7f164f60: Merge "POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK."
* commit '
ee8faa5e74eadc12231f59f2bbe13cfa644922cd':
POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK.
Elliott Hughes [Wed, 29 Oct 2014 17:36:16 +0000 (17:36 +0000)]
am
d50495a5: Merge "Extra strtod/strtof tests."
* commit '
d50495a56760fdc116b7484bcdf1183c76db9b37':
Extra strtod/strtof tests.
Elliott Hughes [Wed, 29 Oct 2014 17:22:33 +0000 (17:22 +0000)]
Merge "Extra strtod/strtof tests."
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:49 +0000 (17:13 +0000)]
am
3a3a4b8a: am
e23f564b: Merge "Fix *tests-run-on-host target"
* commit '
3a3a4b8ae6c03b58c59717ab3c3be85099939d3b':
Fix *tests-run-on-host target
Elliott Hughes [Wed, 29 Oct 2014 17:13:49 +0000 (17:13 +0000)]
am
44331e8b: am
c716dd1e: Merge "bionic tests: migrate test for mutex type from system/extras"
* commit '
44331e8bb0ba17be0387e9353d2309f980136273':
bionic tests: migrate test for mutex type from system/extras
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:32 +0000 (17:13 +0000)]
am
85d77021: am
f56a2f5e: Merge "Remove unnecessary reinterpret_cast"
* commit '
85d770211b33ede2d7bf1b37a6e01bcb308cb666':
Remove unnecessary reinterpret_cast
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:13:31 +0000 (17:13 +0000)]
am
f3b0d9cd: am
57c5a556: Merge "Disable clang compilation due to lack of ifunc."
* commit '
f3b0d9cd79574ac43d41e50bf81f57016c620624':
Disable clang compilation due to lack of ifunc.
Elliott Hughes [Wed, 29 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
1dd65cc3: am
c83837ec: Merge "Make the netdb unit tests work on the host."
* commit '
1dd65cc30c43921f9a0fc604597701b349e3e028':
Make the netdb unit tests work on the host.
Elliott Hughes [Wed, 29 Oct 2014 17:13:29 +0000 (17:13 +0000)]
am
3f5d8a00: am
cad8d226: Merge "Use mxcr_mask instead of mxcsr_mask to match glibc."
* commit '
3f5d8a00e4b57fdf7ec8cc01cc33fbfab5ae1316':
Use mxcr_mask instead of mxcsr_mask to match glibc.
Elliott Hughes [Wed, 29 Oct 2014 17:13:26 +0000 (17:13 +0000)]
am
43ec1fb7: am
a4c0b756: Merge "Add mkfifoat(3)."
* commit '
43ec1fb76c679738011adc0706e6ef2e01058e79':
Add mkfifoat(3).
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:25 +0000 (17:13 +0000)]
am
3db80168: am
f33a7d7f: Merge "Fix mips build"
* commit '
3db80168ff376c08f1faa948b9a41a0c823c9631':
Fix mips build
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:24 +0000 (17:13 +0000)]
am
fee054f3: am
398eb5a7: Merge "Remove unnecessary lookups during relocations"
* commit '
fee054f3ecd7c26705f544ecf0d76ce4ec57a2d4':
Remove unnecessary lookups during relocations
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:23 +0000 (17:13 +0000)]
am
1babff27: am
566f2bc6: Merge "Fix relocation to look for symbols in local group"
* commit '
1babff27fd0e62bd719d04e789da01adbb0b01cd':
Fix relocation to look for symbols in local group
Elliott Hughes [Wed, 29 Oct 2014 17:13:22 +0000 (17:13 +0000)]
am
ac5df33e: am
6c5694b6: Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
* commit '
ac5df33e091c079d667354d225ed37d23326a270':
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
Elliott Hughes [Wed, 29 Oct 2014 17:10:58 +0000 (17:10 +0000)]
am
7f558f60: am
cf8ea37f: Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
* commit '
7f558f60cb51c54782f6d51cd3537082e00970bc':
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
Elliott Hughes [Wed, 29 Oct 2014 16:42:51 +0000 (16:42 +0000)]
am
96a6f401: am
e516321d: Merge "Update bionic to tzdata2014i."
* commit '
96a6f40163b5a2b97c470894ef81041e18265192':
Update bionic to tzdata2014i.
Christopher Ferris [Wed, 29 Oct 2014 16:42:50 +0000 (16:42 +0000)]
am
274f5e73: am
efd2ec8f: Merge "Fix race condition in timer disarm/delete."
* commit '
274f5e737dcae3c9d328f89f4f7df29acee41230':
Fix race condition in timer disarm/delete.
Yabin Cui [Wed, 29 Oct 2014 12:32:36 +0000 (12:32 +0000)]
am
cbb4606a: Merge "change unsigned int to uint32_t for api arc4random/arc4random_uniform"
* commit '
cbb4606ad00f084f984c92a8674400a112ea200e':
change unsigned int to uint32_t for api arc4random/arc4random_uniform
Elliott Hughes [Wed, 29 Oct 2014 12:32:23 +0000 (12:32 +0000)]
am
13dcb88b: Merge "Disable tzdata in ."
* commit '
13dcb88b0f8ce238456059fdc0b6c946caed1e3a':
Disable tzdata in $ANDROID_DATA.
Elliott Hughes [Wed, 29 Oct 2014 12:31:52 +0000 (12:31 +0000)]
am
f96eaf62: Merge "[x86,x86_64] Fix libgcc unwinding through signal"
* commit '
f96eaf6202351a1b5153cfaad3137e4b63846f8f':
[x86,x86_64] Fix libgcc unwinding through signal
Christopher Ferris [Mon, 29 Sep 2014 22:34:20 +0000 (15:34 -0700)]
Cleanup arm assembly.
Remove the old arm directives.
Change the non-local labels to .L labels.
Add cfi directives to strcpy.S.
Bug:
18157900
(cherry picked from commit
c8bd2abab24afe563240297018c4fa79944f193b)
Change-Id: Ifa1c3d16553d142eaa0d744af040f0352538106c
Elliott Hughes [Wed, 29 Oct 2014 00:54:23 +0000 (17:54 -0700)]
Extra strtod/strtof tests.
Check that libc doesn't suffer from a couple of bugs that affected
Java in the past.
Bug:
2206701
Change-Id: I9eb64d7ff2fa0b79e93079b897a5fb78bef866be
Elliott Hughes [Tue, 28 Oct 2014 23:58:11 +0000 (16:58 -0700)]
Fix merge-induced makefile error.
Change-Id: I6ac7e5e3b9d55108681916044cf2de0e01bca0b2
Christopher Ferris [Thu, 25 Sep 2014 00:05:20 +0000 (17:05 -0700)]
Add __memcpy_chk assembly for 64 bit.
Bug:
17623887
(cherry picked from commit
8cf61dab5f11ed5654a5760ab47cec0239caafe0)
Change-Id: I91e66ca0c26f04b50308059f9c89d388d55f6e3a
Elliott Hughes [Tue, 28 Oct 2014 23:01:58 +0000 (16:01 -0700)]
Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge
Conflicts:
libc/arch-arm/bionic/__restore.S
libc/arch-arm/cortex-a15/bionic/stpcpy.S
libc/arch-arm/cortex-a9/bionic/stpcpy.S
libc/arch-arm64/generic/bionic/memcpy_base.S
libc/arch-x86/bionic/__restore.S
libc/arch-x86/x86.mk
libc/arch-x86_64/bionic/__restore_rt.S
tests/stack_unwinding_test.cpp
tests/stack_unwinding_test_impl.c
Change-Id: I2cb250ad78e9da6f390bc279aec742564b75e6c7
Yabin Cui [Tue, 28 Oct 2014 22:58:39 +0000 (22:58 +0000)]
Merge "change unsigned int to uint32_t for api arc4random/arc4random_uniform"
Elliott Hughes [Wed, 17 Sep 2014 02:06:31 +0000 (19:06 -0700)]
Clean up the architecture-specific makefiles.
Group things appropriately and name each group.
Bug:
18160821
(cherry picked from commit
7c02d9428ca18ac600f7ba7d51bb24ca71e733f6)
Change-Id: I863242515af44058154d03e2d8c34678e682d66a
Elliott Hughes [Tue, 16 Sep 2014 23:27:35 +0000 (16:27 -0700)]
No arm source refers to SOFTFLOAT.
So why bother #defining it?
Bug:
18160821
(cherry picked from commit
b1a6c319c40674d71e30313040d3b33b8bddf24b)
Change-Id: I9cd9c144ba7071fddda12fa16d1232ad861b66be
Elliott Hughes [Thu, 4 Sep 2014 22:43:10 +0000 (15:43 -0700)]
Fix mips signed/unsigned signal_test.cpp build breakage.
(cherry picked from commit
aa13e839f06231b9299bb683a71abd954294b49b)
Bug:
17436734
Change-Id: I167fc5d74c49cca7031c5739bc53fdf3bde71887
Yabin Cui [Tue, 28 Oct 2014 19:04:02 +0000 (12:04 -0700)]
change unsigned int to uint32_t for api arc4random/arc4random_uniform
Bug:
17894480
Change-Id: Ia4b5a7cd2b2c6002ed70955f86f7780d26d15e26
Elliott Hughes [Tue, 28 Oct 2014 19:28:35 +0000 (19:28 +0000)]
am
ec58e29b: Merge "pthread_setname_np appears in glibc 2.12."
* commit '
ec58e29b276b0f98eb624430fb70703dc32057bf':
pthread_setname_np appears in glibc 2.12.
Elliott Hughes [Tue, 28 Oct 2014 19:28:34 +0000 (19:28 +0000)]
am
021b6412: Merge "Fix the type of u_ar0 in <sys/user.h>."
* commit '
021b6412f7b7ce73b383480b25a8e5d69323f78c':
Fix the type of u_ar0 in <sys/user.h>.
Elliott Hughes [Tue, 28 Oct 2014 19:28:32 +0000 (19:28 +0000)]
am
7f164f60: Merge "POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK."
* commit '
7f164f6052b6dcee1c2cc70accdfac4b2c790b19':
POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK.
Christopher Ferris [Wed, 24 Sep 2014 01:31:45 +0000 (18:31 -0700)]
Remove the unnecessary generic-neon code.
Bug:
18156619
(cherry picked from commit
2169e17482da91865e412e55b52b88d7c8db47f6)
Change-Id: I4a7f5bb9ad4c27b274f3a3c86c1617ca0578b98f
Dmitriy Ivanov [Tue, 28 Oct 2014 17:34:12 +0000 (17:34 +0000)]
am
e23f564b: Merge "Fix *tests-run-on-host target"
* commit '
e23f564b52fed0dce661cf6db25cf3a89bd66f18':
Fix *tests-run-on-host target
Elliott Hughes [Tue, 28 Oct 2014 17:34:01 +0000 (17:34 +0000)]
am
c716dd1e: Merge "bionic tests: migrate test for mutex type from system/extras"
* commit '
c716dd1e21438ac6585be79fb799b3135e9b381f':
bionic tests: migrate test for mutex type from system/extras
Elliott Hughes [Tue, 28 Oct 2014 16:34:45 +0000 (16:34 +0000)]
Merge "Disable tzdata in $ANDROID_DATA."
Elliott Hughes [Mon, 27 Oct 2014 20:38:21 +0000 (13:38 -0700)]
Disable tzdata in $ANDROID_DATA.
(cherry picked from
4c30130a2155c37e80af4c3b53bf4f6ce832e760.)
Bug:
18139284
Change-Id: I2670dc1791d635139a5d39a438dc08777439476b
Elliott Hughes [Tue, 28 Oct 2014 15:36:55 +0000 (15:36 +0000)]
Merge "Don't mask out SA_RESTORER from sa_flags." into lmp-mr1-dev
Elliott Hughes [Tue, 28 Oct 2014 15:06:30 +0000 (15:06 +0000)]
Merge "Disable tzdata in $ANDROID_DATA." into lmp-mr1-dev