Elliott Hughes
a255bce6d2
am 5ff62cbe
: am 51166a7e
: am 434f97f6
: Merge "Remove some old kernel header cruft not needed with uapi."
...
* commit '5ff62cbe9df50eb9d1bac01180ca7f40c1e2c6e2':
Remove some old kernel header cruft not needed with uapi.
2013-12-21 02:34:51 +00:00
Elliott Hughes
6ae8ab2896
am 9306d2a2
: am bc86e156
: am 22323f91
: Merge "Fix aarch64 futex assembly routines."
...
* commit '9306d2a21f281b505582cd8710546decc92bf497':
Fix aarch64 futex assembly routines.
2013-12-21 01:37:04 +00:00
Elliott Hughes
68d89c7d65
Remove some old kernel header cruft not needed with uapi.
...
Change-Id: If543b056ae40f0eb660be4a0629ad22f4c4cb92f
2013-12-20 17:26:30 -08:00
Elliott Hughes
5eccb9646d
Fix aarch64 futex assembly routines.
...
Also make the other architectures more similar to one another,
use NULL instead of 0 in calling code, and remove an unused #define.
Change-Id: I52b874afb6a351c802f201a0625e484df6d093bb
2013-12-20 16:58:06 -08:00
Elliott Hughes
fb5222ebef
am c2b4de4d
: am 9f65022f
: am 026b6ab6
: Merge "Allocate additional space on stack for indirect syscall"
...
* commit 'c2b4de4dca45cf8bea64e69563f8efde13539a0f':
Allocate additional space on stack for indirect syscall
2013-12-20 23:50:41 +00:00
Chris Dearman
766c7efe28
Allocate additional space on stack for indirect syscall
...
The caller is only required to allocate 16 bytes on the
stack for a0-a3. syscall is handling up to 6 arguments so
additional space is needed on the stack to avoid corrupting the
callers frame.
Change-Id: I054b31696decc3e17d9c70af18cd278b852235d1
2013-12-20 15:36:00 -08:00
Greg Hackmann
218c50fcc3
am 8d4d6d55
: am 70898677
: am 5e26221a
: Merge "Fix backwards compatible system property structure"
...
* commit '8d4d6d5536e138260f826f67175fb89b79c41c8c':
Fix backwards compatible system property structure
2013-12-20 22:51:34 +00:00
Greg Hackmann
5e26221a1d
Merge "Fix backwards compatible system property structure"
2013-12-20 21:54:38 +00:00
Elliott Hughes
ac0c7d599e
am 55ac19cf
: am 7b0964b1
: am 21955e54
: Merge "Upgrade to tzdata2013i."
...
* commit '55ac19cf547b59cc1efce4562655b517f926f72d':
Upgrade to tzdata2013i.
2013-12-20 19:46:41 +00:00
Elliott Hughes
498295ca2b
Upgrade to tzdata2013i.
...
From the release notes:
Changes affecting near-future time stamps:
Jordan switches back to standard time at 00:00 on December 20, 2013.
The 2006-2011 transition schedule is planned to resume in 2014.
(Thanks to Steffen Thorsen.)
Changes affecting past time stamps:
In 2004, Cuba began DST on March 28, not April 4.
(Thanks to Steffen Thorsen.)
Change-Id: I8f26cc50f6b571804a18ff2113b4a47a22bc56dd
2013-12-20 11:26:19 -08:00
Elliott Hughes
ab27c70dd0
am aefb8b35
: am ddeca583
: am aa267685
: Merge "Allow GCC-built fortified code to run on a clang-built bionic."
...
* commit 'aefb8b3599056465e8281bd1062c558c8554113f':
Allow GCC-built fortified code to run on a clang-built bionic.
2013-12-20 05:50:50 +00:00
Elliott Hughes
aa267685c9
Merge "Allow GCC-built fortified code to run on a clang-built bionic."
2013-12-20 02:54:56 +00:00
Elliott Hughes
4889dc1658
am 576fba08
: am c7295d73
: am a19a41b6
: Merge "Fix struct stat for aarch64."
...
* commit '576fba08dc1cf289a1160d2c8e6678f6155a0814':
Fix struct stat for aarch64.
2013-12-20 02:02:13 +00:00
Elliott Hughes
8491fd501a
am d7a47858
: am b37569e3
: am f85b9ac3
: Merge "Don\'t force O_LARGEFILE on LP64."
...
* commit 'd7a478589fdfde8fb4d7d1c9c4c294498f5009b8':
Don't force O_LARGEFILE on LP64.
2013-12-20 01:57:29 +00:00
Elliott Hughes
a19a41b6b5
Merge "Fix struct stat for aarch64."
2013-12-20 01:45:33 +00:00
Elliott Hughes
f85b9ac3ec
Merge "Don't force O_LARGEFILE on LP64."
2013-12-20 01:44:24 +00:00
Ben Cheng
c77395b341
am 88568a4b
: am 6517824f
: am f576472a
: Merge "Add __popcountsi2 to the function compat list."
...
* commit '88568a4b89f52f37001866680ff1ce07e592f75c':
Add __popcountsi2 to the function compat list.
2013-12-20 00:58:01 +00:00
Elliott Hughes
b8fa5b1ca9
Fix struct stat for aarch64.
...
Another kernel, another struct stat.
Change-Id: Ia5ee553d4a2ffc878d2fed82a763ff64c02b12e8
2013-12-19 16:50:22 -08:00
Elliott Hughes
17cabe15d5
Don't force O_LARGEFILE on LP64.
...
aarch64's strace is confused by this, and it isn't necessary anyway.
Change-Id: Ib07b649eb1c38ff0296003874f73af78c47bc276
2013-12-19 16:48:56 -08:00
Ben Cheng
e3fb66dd01
Add __popcountsi2 to the function compat list.
...
This is needed if we use Clang to compile Bionic, which won't include
__popcountsi2 anymore as Clang generates inline instructions. However
prebuilt binary blobs still depend on libc.so to resolve __popcountsi2.
Change-Id: I9001a3884c4be250c0ceebcd79922783fae1a0b7
2013-12-19 16:26:40 -08:00
Elliott Hughes
cd0609f4fc
Allow GCC-built fortified code to run on a clang-built bionic.
...
Even though code built with clang won't be fully fortified
and won't contain calls to our various helpers, binaries built
with GCC will.
Change-Id: I389b2f1e22a3e89b22aadedc46397bf704f9ca79
2013-12-19 14:20:22 -08:00
Elliott Hughes
1223248ba1
am 01e8d487
: am 61f02065
: am cf7a4a4f
: Merge "Revert "Add C linkage for __open_2 and __openat_2.""
...
* commit '01e8d48761e64ce63bb4928ea9ce57f140027213':
Revert "Add C linkage for __open_2 and __openat_2."
2013-12-19 20:15:24 +00:00
Elliott Hughes
cf7a4a4fda
Merge "Revert "Add C linkage for __open_2 and __openat_2.""
2013-12-19 20:02:28 +00:00
Elliott Hughes
9a42eef8b1
Revert "Add C linkage for __open_2 and __openat_2."
...
This reverts commit c13d89b829
.
Change-Id: I40a3c6b926e920b65dd054353a2db8d314d5b300
2013-12-19 20:02:16 +00:00
Elliott Hughes
d149305258
am b0ad47e2
: am d520c95e
: am bb4f6dc2
: Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
...
* commit 'b0ad47e20d0f9c5c5c498638cc9b5cd341b304bc':
ARM: Change dmb domain for bionic_atomic_barrier()
2013-12-19 19:53:19 +00:00
Elliott Hughes
c06eaa3e12
am f850700c
: am 2520a94e
: am 1afb375d
: Merge "Fix aarch64 custom assembler now non-uapi is gone."
...
* commit 'f850700c67f8a5f9641c91c53269f9a5a14d3399':
Fix aarch64 custom assembler now non-uapi is gone.
2013-12-19 19:49:46 +00:00
Serban Constantinescu
845c778fa6
ARM: Change dmb domain for bionic_atomic_barrier()
...
This patch changes the domain that the memory barrier operates on. Assumes
that the scope of bionic_atomic_barrier() does not include device memory,
memory shared with the GPU or any other memory external to the processor
cluster.
Change-Id: I291e741c98a64c86f3a3cf99811bbf1e714ac9aa
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2013-12-19 11:39:01 -08:00
Elliott Hughes
da9775509b
Fix aarch64 custom assembler now non-uapi is gone.
...
Change-Id: I9c8ad17d9bae2de9d793444d87d4ee133728e900
2013-12-19 11:32:42 -08:00
Ben Cheng
0c45d8568d
am 08af3aae
: am e884a039
: am dcc18ea4
: Merge "Add C linkage for __open_2 and __openat_2."
...
* commit '08af3aae104611d269d942354791e5bcb693ceee':
Add C linkage for __open_2 and __openat_2.
2013-12-19 19:13:00 +00:00
Ben Cheng
c13d89b829
Add C linkage for __open_2 and __openat_2.
...
Otherwise Clang mangle them with C++ names.
Change-Id: I844e28d834df8b0752b32d2aadd2013fc8804a43
2013-12-19 10:49:20 -08:00
Christopher Ferris
f36c3ea8ff
resolved conflicts for merge of 85e0dd89
to master
...
Change-Id: I21f7ffb9a582681877e2dbad54185ee37d18410e
2013-12-18 23:43:36 -08:00
Christopher Ferris
81ddd14381
Merge "Remove the non-uapi kernel headers."
2013-12-19 06:58:53 +00:00
Nick Kralevich
f9c4078ab7
am c92f7f57
: am c1624712
: am 25447aec
: Merge "Clean up more recursive FORTIFY_SOURCE calls"
...
* commit 'c92f7f57cf0b3a72f1447a0de99a18727d89d933':
Clean up more recursive FORTIFY_SOURCE calls
2013-12-19 05:57:53 +00:00
Nick Kralevich
e4c6b08c4e
Clean up more recursive FORTIFY_SOURCE calls
...
Don't use FORTIFY_SOURCE on functions which implement
FORTIFY_SOURCE, to avoid infinite recursion problems.
The previous patch only addressed one of the problems.
Bug: 12216860
Change-Id: I6f30ae7cb5b481be9942add18182ea4839d348a6
2013-12-18 19:17:14 -08:00
Nick Kralevich
2e437261e3
am feceab73
: am 58a2429b
: am 4063bb61
: Merge "__strnlen_chk: avoid recursive strlen calls"
...
* commit 'feceab7366c03b792c7679b8969bc573dc579ad2':
__strnlen_chk: avoid recursive strlen calls
2013-12-19 03:06:16 +00:00
Nick Kralevich
ddea383433
__strnlen_chk: avoid recursive strlen calls
...
Don't use FORTIFY_SOURCE on functions which implement
FORTIFY_SOURCE.
Bug: 12216860
Change-Id: I61db1b47ccdd6bdcf41eab3303f4806494016199
2013-12-18 18:17:52 -08:00
Elliott Hughes
2abef87f7d
am 9baf4839
: am 3761f453
: am f5897dcb
: Merge "Fix linking of aarch64 static binaries."
...
* commit '9baf483936ef238d3961c281c6bc7280aec7069c':
Fix linking of aarch64 static binaries.
2013-12-18 23:42:20 +00:00
Elliott Hughes
28d4b9bbcb
Fix linking of aarch64 static binaries.
...
Change-Id: If1fa8b560074058b8f7ef32db21a7ca3c53d1fd7
2013-12-18 15:22:08 -08:00
Elliott Hughes
106e82ea29
am e567b596
: am 512ff272
: am 0b61567f
: Merge "Fix the x86-64 int64_t/uint64_t."
...
* commit 'e567b596fe9a25584264ecf4a19ba4407d81d0ed':
Fix the x86-64 int64_t/uint64_t.
2013-12-18 22:49:09 +00:00
Elliott Hughes
5c7795da84
am 85434881
: am dce31dac
: am 717ad649
: Merge "Don\'t use __kernel_ulong_t."
...
* commit '85434881d33e8cb527c942c11e7d4c81ff3b56ca':
Don't use __kernel_ulong_t.
2013-12-18 22:49:01 +00:00
Elliott Hughes
ba9fee97cf
Fix the x86-64 int64_t/uint64_t.
...
This now matches aarch64, which was already correct.
Bug: 12213562
Change-Id: I5da19f0af98347992fea2a62938472f86427740f
2013-12-18 14:00:14 -08:00
Elliott Hughes
ad8842f5c6
Don't use __kernel_ulong_t.
...
Change-Id: Ifdfbac0ac6da647276a84bd64bb342bb5a07ad61
2013-12-18 12:22:33 -08:00
Elliott Hughes
72b430b5cc
am 72f5da94
: am 67c42d1d
: am 7649766b
: Merge "Remove <machine/kernel.h>."
...
* commit '72f5da943cd2ab5660753c7284e24433c3bb9efa':
Remove <machine/kernel.h>.
2013-12-18 19:42:06 +00:00
Elliott Hughes
2b333ea31e
Remove <machine/kernel.h>.
...
Bug: 12175484
Change-Id: I127f7f91f36bd879109d653e0c56ec56e2529d4d
2013-12-18 11:21:55 -08:00
Christopher Ferris
be5231442b
Remove the non-uapi kernel headers.
...
Bug: 11559337
Change-Id: Id1ee4dadbd673cf35b9c79bc87f9a6fb7b2253c6
2013-12-18 10:34:18 -08:00
Elliott Hughes
a0c2cc7009
am 42513bf8
: am 78ce7cbf
: am d2bcbf0d
: Merge "Small style cleanup."
...
* commit '42513bf8482fdb896f72d0d882973ebc4ade9aa2':
Small style cleanup.
2013-12-18 18:22:00 +00:00
Elliott Hughes
67a5d0a429
am 03335d91
: am 136e7f2b
: am 611b903c
: Merge "Properly detect timeout in pthread_mutex_lock_timeout_np_impl"
...
* commit '03335d91248aaf4c70a126fbf80481a924c4588b':
Properly detect timeout in pthread_mutex_lock_timeout_np_impl
2013-12-18 18:09:26 +00:00
Elliott Hughes
977d4e0dc6
am 93e05879
: am debc37b4
: am e00f4890
: Merge "Move bionic over to GCC\'s \'warning\' attribute."
...
* commit '93e058796760763f414e3403dca6d7f7781f73b8':
Move bionic over to GCC's 'warning' attribute.
2013-12-18 18:05:58 +00:00
Elliott Hughes
9e79af3b61
Small style cleanup.
...
Change-Id: Ib45a4a2296232968296f9bd7cc3592ba46fd412d
2013-12-18 10:05:42 -08:00
Elliott Hughes
31d0542bcd
am 0652fc66
: am 63d56a00
: am 62e6fe58
: Merge "Fix compilation of crtbegin.c and pthread_debug.cpp."
...
* commit '0652fc667d86a646dc0011e9529bc59145e4bef4':
Fix compilation of crtbegin.c and pthread_debug.cpp.
2013-12-18 18:02:35 +00:00