Nick Kralevich
881e426524
am deca2451: am 8a7cffc8: Merge "Reenable support for non-PIE executables"
...
* commit 'deca2451e0bdcc98777f06bfbe8f9e10fc529778':
Reenable support for non-PIE executables
2014-06-19 17:15:02 +00:00
Nick Kralevich
deca2451e0
am 8a7cffc8: Merge "Reenable support for non-PIE executables"
...
* commit '8a7cffc85dc4664a8bd7c3c526bfa56b25126864':
Reenable support for non-PIE executables
2014-06-19 17:12:04 +00:00
Dan Albert
3b46eaa80c
am 6eeb6176: am 0df59bd3: Merge "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
...
* commit '6eeb61767d367258bb5709265769a3a931090529':
Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."
2014-06-19 10:04:11 +00:00
Dan Albert
6eeb61767d
am 0df59bd3: Merge "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
...
* commit '0df59bd3a5aed6c90dbac80f2c85968af52730d6':
Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."
2014-06-19 09:21:39 +00:00
Christopher Ferris
15d0e2a1c1
am 79cd486d: am 0b09153c: Merge "Move common macros into bionic_macros.h."
...
* commit '79cd486d54edd1fbaf6b33872f5c35e273d3c324':
Move common macros into bionic_macros.h.
2014-06-18 23:03:26 +00:00
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
0df59bd3a5
Merge "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
2014-06-18 22:48:04 +00:00
Dan Albert
715242fd0f
Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."
...
This reverts commit dd4ad5c463
2014-06-19 03:57:05 +00:00
Dan Albert
ee5b17b479
am 9fbcc435: am a5fe7b89: Merge "Hide _tolower_tab_ and _toupper_tab_ on LP64."
...
* commit '9fbcc435dc8ab7d82653230c810e3071c5b5cc06':
Hide _tolower_tab_ and _toupper_tab_ on LP64.
2014-06-18 21:40:32 +00:00
Dan Albert
65e8bca624
am 9ac80645: am 49d5399b: Merge "Hide __atexit and remove __atexit_invalid."
...
* commit '9ac80645542e03559ecee6524d87791b1b1f5fd7':
Hide __atexit and remove __atexit_invalid.
2014-06-18 21:40: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
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
Dan Albert
a5fe7b8952
Merge "Hide _tolower_tab_ and _toupper_tab_ on LP64."
2014-06-18 19:25:04 +00:00
Dmitriy Ivanov
8c79f5f895
am 6b8b3dd2: am 64dfbd24: Merge "Fix weak function lookups"
...
* commit '6b8b3dd28a145021281f69b485763748f29b7b03':
Fix weak function lookups
2014-06-18 16:00:39 +00: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
1cd8f57cbc
am b29a7f1d: am ef82c28d: Merge "Hide declaration of gets(3) for C11 and later."
...
* commit 'b29a7f1d29a1183c1f1a67433f36ae09cf1eee89':
Hide declaration of gets(3) for C11 and later.
2014-06-18 01:54:57 +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
3bb25acb46
am b86ffd8d: am 1ef3ba2b: Merge "Revert "Hide declaration of gets(3) for C11 and later.""
...
* commit 'b86ffd8d82c177b393e6ed3199ee94331776afc7':
Revert "Hide declaration of gets(3) for C11 and later."
2014-06-17 23:44:26 +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
7cd4e72561
am 285a1c13: am 185c399c: Merge "Hide declaration of gets(3) for C11 and later."
...
* commit '285a1c13482f64813dd8f5dd54b479199c0f2569':
Hide declaration of gets(3) for C11 and later.
2014-06-17 23:34:10 +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
a537ec85ea
am 65806a84: am 1d2b4c02: Merge "Move libraries for unit-tests to separate folder"
...
* commit '65806a842b5b3475b4481325a56227492a4e063a':
Move libraries for unit-tests to separate folder
2014-06-17 23:29:40 +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
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
d150eab4ed
am c02f242d: am b6ca7474: Merge "Add a flag control that PRIVATE libm can be chosen"
...
* commit 'c02f242d330f11ccfd6322164ce1b16861416ff1':
Add a flag control that PRIVATE libm can be chosen
2014-06-17 22:45:46 +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
8a72b6187f
am 775b2a0d: am 4ac22649: Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h"
...
* commit '775b2a0d9ca8ba17f9f443b203536c9879bd519c':
Add <linux/tty.h> to libc/include/sys/ioctl.h
2014-06-17 21:58:19 +00: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
Elliott Hughes
477b45b89d
Merge "Build tzcode with -Werror."
2014-06-17 21:42:00 +00:00
Elliott Hughes
5f564540a9
Build tzcode with -Werror.
...
Parts of this are just getting us in sync with upstream, but the
'const' stuff is our own mess. We should kill the *_tz functions
and lose this difference from upstream.
Change-Id: I17d26534ed3f54667143d78147a8c53be56d7b33
2014-06-19 13:54:10 -07:00
Elliott Hughes
942fa486f6
Merge "Update localtime.c."
2014-06-17 21:42:00 +00:00
Elliott Hughes
906eb9999b
Update localtime.c.
...
This brings us closer to upstream's ToT localtime.c; our main interest
being their alternative fix for the stack usage we addressed in commit
8a8b0c9bfc
2014-06-18 19:48:14 -07:00
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
* 6275f20834b906e13c552aebf5429b
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 c0ce590827
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
