Christopher Ferris
79cd486d54
am 0b09153c
: Merge "Move common macros into bionic_macros.h."
...
* commit '0b09153c12915c6d17434cf9fed2389f6fe4e713':
Move common macros into bionic_macros.h.
2014-06-18 22:58:29 +00:00
Dan Albert
9fbcc435dc
am a5fe7b89
: Merge "Hide _tolower_tab_ and _toupper_tab_ on LP64."
...
* commit 'a5fe7b89528d8a03063a3579e971c901a2fc6f32':
Hide _tolower_tab_ and _toupper_tab_ on LP64.
2014-06-18 21:04:17 +00:00
Dan Albert
9ac8064554
am 49d5399b
: Merge "Hide __atexit and remove __atexit_invalid."
...
* commit '49d5399bbcfae80d8b21f2303077b24257a1b966':
Hide __atexit and remove __atexit_invalid.
2014-06-18 20:29:31 +00:00
Dan Albert
a5fe7b8952
Merge "Hide _tolower_tab_ and _toupper_tab_ on LP64."
2014-06-18 19:25:04 +00:00
Dan Albert
dd4ad5c463
Hide _tolower_tab_ and _toupper_tab_ on LP64.
...
We can't hide them on LP32 because they appeared in NDK headers.
Bug: 11156955
Change-Id: I22bf5a0f4d330c04b49565bc598cd0568128d4fc
2014-06-18 13:11:07 -07:00
Dmitriy Ivanov
6b8b3dd28a
am 64dfbd24
: Merge "Fix weak function lookups"
...
* commit '64dfbd242cddc3ef95576e27e3940d68b89b5fce':
Fix weak function lookups
2014-06-18 15:56:19 +00:00
Dan Albert
b29a7f1d29
am ef82c28d
: Merge "Hide declaration of gets(3) for C11 and later."
...
* commit 'ef82c28db63c6f333edb7e9d7e7ad1baa656343c':
Hide declaration of gets(3) for C11 and later.
2014-06-18 01:22:00 +00:00
Dan Albert
b86ffd8d82
am 1ef3ba2b
: Merge "Revert "Hide declaration of gets(3) for C11 and later.""
...
* commit '1ef3ba2b4fd2408cdd78828ec2930ce31ce8cee7':
Revert "Hide declaration of gets(3) for C11 and later."
2014-06-17 23:39:30 +00:00
Dan Albert
285a1c1348
am 185c399c
: Merge "Hide declaration of gets(3) for C11 and later."
...
* commit '185c399c581f867ad288737b5f824a1fda1f6aaf':
Hide declaration of gets(3) for C11 and later.
2014-06-17 23:30:18 +00:00
Dmitriy Ivanov
65806a842b
am 1d2b4c02
: Merge "Move libraries for unit-tests to separate folder"
...
* commit '1d2b4c022c419e1e85336fa44e644772eefb8b64':
Move libraries for unit-tests to separate folder
2014-06-17 23:25:55 +00:00
Dan Albert
ef82c28db6
Merge "Hide declaration of gets(3) for C11 and later."
2014-06-17 23:00:03 +00:00
Dan Albert
9635046e53
Hide declaration of gets(3) for C11 and later.
...
gets(3) was removed from C11.
This reverts commit 1291680c2a
.
Bug: 14500800
Change-Id: I5e5146bdbb80f2be818a17f287b112bab37d1f6d
2014-06-17 17:37:06 -07:00
Dmitriy Ivanov
1d2b4c022c
Merge "Move libraries for unit-tests to separate folder"
2014-06-17 23:00:03 +00:00
Elliott Hughes
c02f242d33
am b6ca7474
: Merge "Add a flag control that PRIVATE libm can be chosen"
...
* commit 'b6ca7474023f7832d4230756781031b7687517e6':
Add a flag control that PRIVATE libm can be chosen
2014-06-17 22:42:16 +00:00
Dmitriy Ivanov
1f5e1a3cbc
Move libraries for unit-tests to separate folder
...
Change-Id: I1653f3f2fd63ba25525369bc725c8f7438ecf021
2014-06-17 15:08:53 -07:00
Elliott Hughes
775b2a0d9c
am 4ac22649
: Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h"
...
* commit '4ac22649441339d0a81e0fc6428ac7f1867ffe6f':
Add <linux/tty.h> to libc/include/sys/ioctl.h
2014-06-17 21:53:05 +00: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 c0ce590827
.
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
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 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
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