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 346fea0805
.
Change-Id: Id3fd79451e4218e68e39ce22f21408cbf93255ee
2014-06-16 15:44:20 -07:00
Dan Albert
c4978a5646
am 7a11b7a6
: am a217a0cd
: Merge "libc: Fix \'index\' symbol export."
...
* commit '7a11b7a674805f8373fd9f126ee46721ccab8eeb':
libc: Fix 'index' symbol export.
2014-06-16 22:13:20 +00:00
Dan Albert
f3fc2fe72c
am c732859d
: am 4fb0d4fb
: Merge "Revert "Revert "Remove ftime from bionic LP64"""
...
* commit 'c732859d241a182dc0a9c8b2a2bca9ec5926cd39':
Revert "Revert "Remove ftime from bionic LP64""
2014-06-16 22:13:08 +00:00
Dan Albert
15d00e2989
am f49791fd
: am 9a3ad98f
: Merge "Removes getdtablesize(3) from LP64."
...
* commit 'f49791fd8767a3b09fe70febc9142da45c4398f1':
Removes getdtablesize(3) from LP64.
2014-06-16 22:13:05 +00: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
Elliott Hughes
b618aa818d
am fe6e646c
: Update NOTICE files.
...
* commit 'fe6e646cb79fe15d7815fdb9c92cc66be56ab1d4':
Update NOTICE files.
2014-06-16 20:05:43 +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 0921204660
.
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
Elliott Hughes
fe6e646cb7
Update NOTICE files.
...
Change-Id: I459caf48ba861372a4d0bc75f98a9cb4acc20fd5
2014-06-16 10:24:37 -07: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
ca24f7dcfa
am 38ebfc09
: am 72dc1c22
: Merge "Revert "Backing this one out since the counterpart needs to be sent upstream.""
...
* commit '38ebfc09ea610687d028db5f0a7b8f6789932288':
Revert "Backing this one out since the counterpart needs to be sent upstream."
2014-06-14 01:22:09 +00:00
Dan Albert
758f56d368
am 54c61d57
: am b84783ec
: Merge "Backing this one out since the counterpart needs to be sent upstream."
...
* commit '54c61d5715715ac7f1c6a4f7a53f981e09dc7134':
Backing this one out since the counterpart needs to be sent upstream.
2014-06-14 01:17:44 +00: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
dd45ea3c08
am 263fe685
: am 65b1c90a
: Merge "Hides valloc(3)/pvalloc(3) on LP64."
...
* commit '263fe68548f430d532517056963cb5de6863b9cc':
Hides valloc(3)/pvalloc(3) on LP64.
2014-06-14 00:58:02 +00:00
Dan Albert
4ef9bbb01d
am 080c820d
: am b725e762
: Merge "Removes wait3(2) from LP64."
...
* commit '080c820d3f4506f5ef2c2ccc90c0197342b33472':
Removes wait3(2) from LP64.
2014-06-14 00:58:02 +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
0af830d29c
am 0021dcef
: am f87ac523
: Merge "Remove ioprio_get(2) and ioprio_set(2) from LP64."
...
* commit '0021dcef7214823824555d9d694a59e2f4aba45d':
Remove ioprio_get(2) and ioprio_set(2) from LP64.
2014-06-13 22:26:51 +00:00
Elliott Hughes
1f29fd72c8
am 7e6f6965
: am 1e7ae47d
: Merge "Bring our "libresolv" stuff in line with glibc."
...
* commit '7e6f6965982183ebae357e61e7bad55b91e97cc9':
Bring our "libresolv" stuff in line with glibc.
2014-06-13 21:50:45 +00:00
Elliott Hughes
edf7d7a723
am f005d976
: am 15330331
: Merge "Upgrade to tzdata2014e."
...
* commit 'f005d9769096d92a31d3b4377d29fcc251a07c87':
Upgrade to tzdata2014e.
2014-06-13 21:50:16 +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
Elliott Hughes
773b85eff8
am a335c869
: am 0f690d9e
: Merge "Fix x86-64 libvpx build."
...
* commit 'a335c869748b133c661cc1efff3028984ee9f7aa':
Fix x86-64 libvpx build.
2014-06-13 10:24:38 +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
619d0fe581
am e9e92749
: am ae3c6af3
: Merge "[MIPS64] linker64 requires startup code"
...
* commit 'e9e9274941b41e9cc7ef1bc332faa1e29b9da11a':
[MIPS64] linker64 requires startup code
2014-06-13 02:43:02 +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
62e50ea8de
am 294cae0f
: am 1aaed87f
: Merge "Somewhere, the declaration of _resolv_delete_cache_for_net went missing."
...
* commit '294cae0f18ceae96e1a5f8b42ae9fd8064b98746':
Somewhere, the declaration of _resolv_delete_cache_for_net went missing.
2014-06-13 01:51:30 +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
ec93f16302
am 9552809d
: am 2ba734d8
: Merge "Fix %u format that should have been %zu."
...
* commit '9552809d30a6f1ac54af8c8e9bcb616bd4da6c93':
Fix %u format that should have been %zu.
2014-06-13 01:31:43 +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
48691a0bb4
am eb917428
: am ff17671b
: Merge "Add a hack to <stdlib.h> until we can fix libvpx."
...
* commit 'eb91742861607539fa88ae6d962597dde00ff860':
Add a hack to <stdlib.h> until we can fix libvpx.
2014-06-13 01:12:14 +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
bbc485c892
am cc24144e
: am 5d25d548
: Merge "Remove __memcmp16 from bionic."
...
* commit 'cc24144e5b431d5eb7d688a7f8f32c743c6469e0':
Remove __memcmp16 from bionic.
2014-06-13 00:54:44 +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
b38018f786
am c189362d
: am 564222e3
: Merge "Use default hidden visibility to build libc_dns."
...
* commit 'c189362d879520243cc9e1ba65b9828165efa159':
Use default hidden visibility to build libc_dns.
2014-06-13 00:48:44 +00:00
Christopher Ferris
658150d431
am d92ba899
: am 29ddd78c
: Merge "Put all allocation functions into dispatch table."
...
* commit 'd92ba899450953e5ec9259f826c1790fc09004f7':
Put all allocation functions into dispatch table.
2014-06-13 00:48:43 +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