Christopher Ferris
5c8647665c
Merge "add 64-bit bionic implementation for denver arch"
2014-06-17 21:42:00 +00:00
Nick Kralevich
8a7cffc85d
Merge "Reenable support for non-PIE executables"
2014-06-17 21:42:00 +00:00
Nick Kralevich
d81b3b275d
Reenable support for non-PIE executables
...
On Nakasi builds, /system/bin/tf_daemon is a pre-compiled
vendor supplied binary. When support for non-PIE executables
was removed, that daemon failed to start, which induced
a number of bugs.
* keystore is broken
* CTS runs will hang after a certain period of time
Temporarily reenable non-PIE support for 32-bit platforms
until Nakasi is fixed.
This rolls back the following commits:
Cleanup: updated comments
* 6275f2083415d22a6ce0de55645079cd47e0cc80
Cleanup: remove AARCH/ARM_COPY relocation support
* b906e13c55c9fe9b4157ba548534a0230434882b
And restricts the following patch to 64 bit only:
Remove support for non-PIE executables
* 2aebf5429bb1241a3298b5b642d38f73124c2026
Bug: 14566672
Bug: 15086752
Bug: 15732002
Change-Id: Ia2501aa14bd30feb4a6ce66bdb7c9f066dba0b5f
2014-06-19 09:09:54 -07:00
Christopher Ferris
0b09153c12
Merge "Move common macros into bionic_macros.h."
2014-06-17 21:42:00 +00:00
Christopher Ferris
03eebcb6e8
Move common macros into bionic_macros.h.
...
Bug: 15590152
Change-Id: I730636613ef3653f68c5ab1d43b53beaf8e0dc25
2014-06-18 14:23:46 -07:00
Dan Albert
49d5399bbc
Merge "Hide __atexit and remove __atexit_invalid."
2014-06-17 21:42:00 +00:00
Dan Albert
11f715c62e
Hide __atexit and remove __atexit_invalid.
...
Bug: 11156955
Change-Id: I8c72edee8ecb92b75a282384277253bae19f7455
2014-06-18 13:19:22 -07:00
Dmitriy Ivanov
64dfbd242c
Merge "Fix weak function lookups"
2014-06-17 21:07:34 +00:00
Dmitriy Ivanov
ce44166c73
Fix weak function lookups
...
* Linker now correctly resolves function defined
with __attribute__((weak)).
Bug: https://code.google.com/p/android/issues/detail?id=70206
Change-Id: I82efb905676c25fefb1b11a13f5fecb0f1384657
2014-06-17 16:18:18 -07:00
Dan Albert
1ef3ba2b4f
Merge "Revert "Hide declaration of gets(3) for C11 and later.""
2014-06-17 20:56:23 +00:00
Dan Albert
1291680c2a
Revert "Hide declaration of gets(3) for C11 and later."
...
Breaks stlport. checkbuild lied to me?
This reverts commit c0ce5908277a9bf18628946629dba4277e9a2281.
Change-Id: I72fb21aba7eaea96a7c3208236fd03411527fa5e
2014-06-17 23:28:38 +00:00
Dan Albert
c0ce590827
Hide declaration of gets(3) for C11 and later.
...
gets(3) was removed from C11.
Change-Id: I4040a8a6c6d5d2a86878e8a80ca67964fbbb82a8
2014-06-17 15:52:07 -07:00
Elliott Hughes
b6ca747402
Merge "Add a flag control that PRIVATE libm can be chosen"
2014-06-17 20:56:23 +00:00
Elliott Hughes
4ac2264944
Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h"
2014-06-17 20:56:23 +00:00
Dan Albert
185c399c58
Merge "Hide declaration of gets(3) for C11 and later."
2014-06-17 20:49:57 +00:00
Christopher Ferris
d61729c0a5
am b656410a: Merge "Use a separate config.h for config like defines."
...
* commit 'b656410a73c4dfa2a3f8deba0a673080320f8605':
Use a separate config.h for config like defines.
2014-06-17 18:30:28 +00:00
Christopher Ferris
b656410a73
Merge "Use a separate config.h for config like defines."
2014-06-17 04:51:41 +00:00
Christopher Ferris
6361964381
Use a separate config.h for config like defines.
...
This allows an easier way to share config parameters between unit tests
and the bionic code.
It also fixes a problem where the 32 bit bionic tests based on glibc, or
the cts list executable did not have the pvalloc,valloc tests.
Change-Id: Ib47942cb8a278252faa7498a6ef23e9578db544f
2014-06-16 23:35:53 -07:00
Christopher Ferris
6589ba1561
am d10d3acd: Merge "Move jemalloc due to whole_static_library bug."
...
* commit 'd10d3acd45d045e5a705d22c2297483765e40f5f':
Move jemalloc due to whole_static_library bug.
2014-06-17 00:57:37 +00:00
Dan Albert
c82c0b7e07
Remove SHA1 from LP64 in favor of libcrypto.
...
Keep the symbols around on LP32 for binary compatibility.
Bug: 11156955
Change-Id: I379a7e0fa3092e9a70daeafcbcb2aacfc314031a
2014-06-16 16:52:27 -07:00
Colin Cross
acfc63760e
Revert "HACK: linker: check for handle==0xffffffff on LP64"
...
This reverts commit 346fea0805b8c2a20171c9b4ab1aac5f66ede5de.
Change-Id: Id3fd79451e4218e68e39ce22f21408cbf93255ee
2014-06-16 15:44:20 -07:00
Dan Albert
7a11b7a674
am a217a0cd: Merge "libc: Fix \'index\' symbol export."
...
* commit 'a217a0cdb3ff78f6b59d64fd4356f87643ad9d1e':
libc: Fix 'index' symbol export.
2014-06-16 20:25:14 +00:00
Dan Albert
c732859d24
am 4fb0d4fb: Merge "Revert "Revert "Remove ftime from bionic LP64"""
...
* commit '4fb0d4fb312ed696081200e65ce9bf643928e5e6':
Revert "Revert "Remove ftime from bionic LP64""
2014-06-16 19:57:15 +00:00
Dan Albert
f49791fd87
am 9a3ad98f: Merge "Removes getdtablesize(3) from LP64."
...
* commit '9a3ad98fd69a276f7c5fca0489d5657be75fcf69':
Removes getdtablesize(3) from LP64.
2014-06-16 19:36:18 +00:00
Dan Albert
4fb0d4fb31
Merge "Revert "Revert "Remove ftime from bionic LP64"""
2014-06-16 19:18:38 +00:00
Dan Albert
ac6467587e
Revert "Revert "Remove ftime from bionic LP64""
...
This reverts commit 0921204660b9597de795065d0350a787035ad589.
Change-Id: I749af8d7d429cda9f9d09a75bd30df54e6b1dd65
2014-06-16 12:32:38 -07:00
Dan Albert
9a3ad98fd6
Merge "Removes getdtablesize(3) from LP64."
2014-06-16 19:16:50 +00:00
Dan Albert
462abab12b
Removes getdtablesize(3) from LP64.
...
getdtablesize(3) was removed fro POSIX 2004. Keep the symbol around in LP32 for
binary compatibility, but remove the declaration from unistd.h.
Bug: 13935372
Change-Id: I1f96cd290bf9176f922dad58bd5a7ab2cae7ef0f
2014-06-16 10:12:37 -07:00
Christopher Ferris
d10d3acd45
Merge "Move jemalloc due to whole_static_library bug."
2014-06-16 15:49:03 +00:00
Christopher Ferris
3a37576d4b
Move jemalloc due to whole_static_library bug.
...
Rename jemalloc.cpp to jemalloc_wrapper.cpp to avoid problems with
the libc library having two jemalloc.o files that clobber each other.
Change-Id: I9a2d966dbf414b1367ee0ef1f0d73fca6f25b518
2014-06-16 17:13:09 -07:00
Dan Albert
a217a0cdb3
Merge "libc: Fix 'index' symbol export."
2014-06-16 15:34:52 +00:00
David 'Digit' Turner
891dedb935
libc: Fix 'index' symbol export.
...
The C library didn't export the 'index' symbol, but its C++ name-mangling
instead, which broke the ABI and prevented some applications from loading
properly.
The main reason was that the implementation under bionic/index.cpp relied
on the declaration to specify that the function has C linkage.
However, the declaration for index() was removed from both <string.h>
and <strings.h> in a recent patch, which made the compiler think it was
ok to compile the function with C++ linkage instead!
This patch does the following:
- Move index() definition to bionic/ndk_cruft.cpp and ensure it uses
C linkage.
Note that this removes index() from the 64-bit library entirely, this
is intentional and will break source compatibility. Simply replacing
an index() call with the equivalent strchr() should be enough to fix
this in third-party code.
- Remove bionic/index.cpp from the tree and build files.
- Remove x86 assembly implementation from arch-x86/ to avoid conflict
with the one in ndk_cruft.cpp
BUG=15606653
Change-Id: I816b589f69c8f8a6511f6be6195d20cf1c4e8123
2014-06-16 13:10:20 -07:00
Dan Albert
38ebfc09ea
am 72dc1c22: Merge "Revert "Backing this one out since the counterpart needs to be sent upstream.""
...
* commit '72dc1c22dc6a92dea925398c9e3880364ab29c1c':
Revert "Backing this one out since the counterpart needs to be sent upstream."
2014-06-14 01:16:56 +00:00
Dan Albert
54c61d5715
am b84783ec: Merge "Backing this one out since the counterpart needs to be sent upstream."
...
* commit 'b84783ecaa71f9450152f8d9b5f97e1b07f05ef6':
Backing this one out since the counterpart needs to be sent upstream.
2014-06-14 00:57:50 +00:00
Dan Albert
263fe68548
am 65b1c90a: Merge "Hides valloc(3)/pvalloc(3) on LP64."
...
* commit '65b1c90a32036cbb06ff610fbae545b65ae8b72d':
Hides valloc(3)/pvalloc(3) on LP64.
2014-06-14 00:28:38 +00:00
Dan Albert
080c820d3f
am b725e762: Merge "Removes wait3(2) from LP64."
...
* commit 'b725e7627f0e35d0c7acb1c09fe3cb89b0a4d481':
Removes wait3(2) from LP64.
2014-06-14 00:28:37 +00:00
Dan Albert
0021dcef72
am f87ac523: Merge "Remove ioprio_get(2) and ioprio_set(2) from LP64."
...
* commit 'f87ac523a1aa02490d67330e74180c8ac2d78420':
Remove ioprio_get(2) and ioprio_set(2) from LP64.
2014-06-13 20:59:55 +00:00
Elliott Hughes
7e6f696598
am 1e7ae47d: Merge "Bring our "libresolv" stuff in line with glibc."
...
* commit '1e7ae47d40aad100fa16731418ac8af7b9919da7':
Bring our "libresolv" stuff in line with glibc.
2014-06-13 19:03:57 +00:00
Elliott Hughes
f005d97690
am 15330331: Merge "Upgrade to tzdata2014e."
...
* commit '15330331b60a4d5e352eda284b4cf3a4c1963ba2':
Upgrade to tzdata2014e.
2014-06-13 18:06:02 +00:00
Qiming Shi
0069f31066
Add <linux/tty.h> to libc/include/sys/ioctl.h
...
This is the change to export the tty ldisc definitions (like N_TTY)
from Linux uapi kernel header. So bionic is compatbile with glibc
which has its own tty ldisc definition exported through ioctl.h
Change-Id: I44e4c7cc2eba31549e9c9c75f74961a949d4a696
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
Signed-off-by: Yin, Fengwei <fengwei.yin@intel.com>
2014-06-13 16:39:39 +08:00
Elliott Hughes
a335c86974
am 0f690d9e: Merge "Fix x86-64 libvpx build."
...
* commit '0f690d9eda1893e66223138d2b930eb3e0164820':
Fix x86-64 libvpx build.
2014-06-13 03:17:05 +00:00
Elliott Hughes
e9e9274941
am ae3c6af3: Merge "[MIPS64] linker64 requires startup code"
...
* commit 'ae3c6af3e536cd8bdf6f2cf1495b5d7463feb1a5':
[MIPS64] linker64 requires startup code
2014-06-13 02:40:10 +00:00
Elliott Hughes
294cae0f18
am 1aaed87f: Merge "Somewhere, the declaration of _resolv_delete_cache_for_net went missing."
...
* commit '1aaed87f7f75aafe3cd99857c33e1cf4fa73c95d':
Somewhere, the declaration of _resolv_delete_cache_for_net went missing.
2014-06-13 01:48:11 +00:00
Christopher Ferris
9552809d30
am 2ba734d8: Merge "Fix %u format that should have been %zu."
...
* commit '2ba734d8cd370d9cdb544f4d3afecc9a13e35116':
Fix %u format that should have been %zu.
2014-06-13 01:29:55 +00:00
Elliott Hughes
eb91742861
am ff17671b: Merge "Add a hack to <stdlib.h> until we can fix libvpx."
...
* commit 'ff17671bc630d294903aa2827b76156590b09629':
Add a hack to <stdlib.h> until we can fix libvpx.
2014-06-13 01:09:49 +00:00
Elliott Hughes
cc24144e5b
am 5d25d548: Merge "Remove __memcmp16 from bionic."
...
* commit '5d25d5480ab1e02d8f1e39f5936a3180e84a842c':
Remove __memcmp16 from bionic.
2014-06-13 00:52:12 +00:00
Elliott Hughes
c189362d87
am 564222e3: Merge "Use default hidden visibility to build libc_dns."
...
* commit '564222e3384eb1c649bc75650deb847c40ec7da3':
Use default hidden visibility to build libc_dns.
2014-06-13 00:44:36 +00:00
Christopher Ferris
d92ba89945
am 29ddd78c: Merge "Put all allocation functions into dispatch table."
...
* commit '29ddd78c21b15117bc7d4fc196f3a503f3aab3e2':
Put all allocation functions into dispatch table.
2014-06-13 00:44:35 +00:00
Elliott Hughes
d13ff0f0b3
am 346fa721: Merge "Get the full set of PRNG functions in <stdlib.h>"
...
* commit '346fa721ca20e481a624930425d823d452e11dfe':
Get the full set of PRNG functions in <stdlib.h>
2014-06-12 22:03:45 +00:00
Christopher Ferris
4a448223d7
am 3d5e0b20: Merge "Add/Remove mmap tests."
...
* commit '3d5e0b2045f899e27a071dc228dafc9378e90798':
Add/Remove mmap tests.
2014-06-12 21:10:21 +00:00