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
08af3aae10
am e884a039
: am dcc18ea4
: Merge "Add C linkage for __open_2 and __openat_2."
...
* commit 'e884a039dbb716591a1af6427280a4b555fda604':
Add C linkage for __open_2 and __openat_2.
2013-12-19 19:09:55 +00:00
Ben Cheng
e884a039db
am dcc18ea4
: Merge "Add C linkage for __open_2 and __openat_2."
...
* commit 'dcc18ea4c685230087618c12e8f20484b314596f':
Add C linkage for __open_2 and __openat_2.
2013-12-19 11:05:15 -08:00
Ben Cheng
dcc18ea4c6
Merge "Add C linkage for __open_2 and __openat_2."
2013-12-19 18:59:05 +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
85e0dd89e0
am 5cdc1414
: am 81ddd143
: Merge "Remove the non-uapi kernel headers."
...
* commit '5cdc14143351539c3eae053fe142578382f254a5':
Remove the non-uapi kernel headers.
2013-12-19 07:08:35 +00:00
Christopher Ferris
5cdc141433
am 81ddd143
: Merge "Remove the non-uapi kernel headers."
...
* commit '81ddd14381b09f171c006ebcbba15b3c1baf2a9f':
Remove the non-uapi kernel headers.
2013-12-18 23:04:58 -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
c92f7f57cf
am c1624712
: am 25447aec
: Merge "Clean up more recursive FORTIFY_SOURCE calls"
...
* commit 'c16247127541af1eb73da28b55b1a41202fa1f56':
Clean up more recursive FORTIFY_SOURCE calls
2013-12-19 05:53:23 +00:00
Nick Kralevich
c162471275
am 25447aec
: Merge "Clean up more recursive FORTIFY_SOURCE calls"
...
* commit '25447aec39c3c3d54b2defab6a5666c162db4f5a':
Clean up more recursive FORTIFY_SOURCE calls
2013-12-18 21:11:40 -08:00
Nick Kralevich
25447aec39
Merge "Clean up more recursive FORTIFY_SOURCE calls"
2013-12-19 05:08:17 +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
feceab7366
am 58a2429b
: am 4063bb61
: Merge "__strnlen_chk: avoid recursive strlen calls"
...
* commit '58a2429b5b3defd73457273b1cc375b7aaa54810':
__strnlen_chk: avoid recursive strlen calls
2013-12-19 03:03:20 +00:00
Elliott Hughes
a59fcae102
am ac65c496
: am 7f4b9399
: am 90bd36bc
: Merge "Don\'t use weak aliases in libm."
...
* commit 'ac65c496f1980875a81e477a39f14119a31a6c57':
Don't use weak aliases in libm.
2013-12-19 03:01:45 +00:00
Elliott Hughes
ac65c496f1
am 7f4b9399
: am 90bd36bc
: Merge "Don\'t use weak aliases in libm."
...
* commit '7f4b9399717eeedc961354b32727a3c8f9d6cbb8':
Don't use weak aliases in libm.
2013-12-19 02:58:51 +00:00
Nick Kralevich
58a2429b5b
am 4063bb61
: Merge "__strnlen_chk: avoid recursive strlen calls"
...
* commit '4063bb6147bd256ad455bd3bd063ef40aae8851d':
__strnlen_chk: avoid recursive strlen calls
2013-12-18 18:57:18 -08:00
Elliott Hughes
7f4b939971
am 90bd36bc
: Merge "Don\'t use weak aliases in libm."
...
* commit '90bd36bca66205b1c15f80b70036ff4d64198d32':
Don't use weak aliases in libm.
2013-12-18 18:53:59 -08:00
Nick Kralevich
4063bb6147
Merge "__strnlen_chk: avoid recursive strlen calls"
2013-12-19 02:52:23 +00:00
Elliott Hughes
90bd36bca6
Merge "Don't use weak aliases in libm."
2013-12-19 02:49:19 +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
241608e9ce
Don't use weak aliases in libm.
...
The aarch64 toolchain doesn't support them, and we were already implementing
most of the fake long-double functions differently anyway.
Change-Id: I4a2f2df81972ee9c34ddfe96cec81b126506d881
2013-12-18 17:18:53 -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
9baf483936
am 3761f453
: am f5897dcb
: Merge "Fix linking of aarch64 static binaries."
...
* commit '3761f4538424d2bcb332e41c1e78c6e3263d2c39':
Fix linking of aarch64 static binaries.
2013-12-18 23:40:26 +00:00
Elliott Hughes
3761f45384
am f5897dcb
: Merge "Fix linking of aarch64 static binaries."
...
* commit 'f5897dcb1d1dc493b6a2ba526a766da73bb9c1da':
Fix linking of aarch64 static binaries.
2013-12-18 15:35:59 -08:00
Elliott Hughes
f5897dcb1d
Merge "Fix linking of aarch64 static binaries."
2013-12-18 23:31:29 +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
e567b596fe
am 512ff272
: am 0b61567f
: Merge "Fix the x86-64 int64_t/uint64_t."
...
* commit '512ff2729ac99a6016d2c39a7da0117ba5f9a5b1':
Fix the x86-64 int64_t/uint64_t.
2013-12-18 22:22:26 +00:00
Elliott Hughes
512ff2729a
am 0b61567f
: Merge "Fix the x86-64 int64_t/uint64_t."
...
* commit '0b61567f9fc5b54ffdb324bf21f8ca332b69a249':
Fix the x86-64 int64_t/uint64_t.
2013-12-18 14:16:24 -08:00
Elliott Hughes
0b61567f9f
Merge "Fix the x86-64 int64_t/uint64_t."
2013-12-18 22:11:17 +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
85434881d3
am dce31dac
: am 717ad649
: Merge "Don\'t use __kernel_ulong_t."
...
* commit 'dce31dacfaf964f6438386c1705018fb7ad6d0ca':
Don't use __kernel_ulong_t.
2013-12-18 20:32:53 +00:00
Elliott Hughes
dce31dacfa
am 717ad649
: Merge "Don\'t use __kernel_ulong_t."
...
* commit '717ad6498c06e53812e406aa0c40738ef3e85801':
Don't use __kernel_ulong_t.
2013-12-18 12:28:13 -08:00
Elliott Hughes
717ad6498c
Merge "Don't use __kernel_ulong_t."
2013-12-18 20:23:28 +00: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
72f5da943c
am 67c42d1d
: am 7649766b
: Merge "Remove <machine/kernel.h>."
...
* commit '67c42d1df50181108eb1c1eb49967ebbc911cab4':
Remove <machine/kernel.h>.
2013-12-18 19:38:31 +00:00
Elliott Hughes
67c42d1df5
am 7649766b
: Merge "Remove <machine/kernel.h>."
...
* commit '7649766b4569af52e6875828186fdf4924cadb3d':
Remove <machine/kernel.h>.
2013-12-18 11:33:13 -08:00
Elliott Hughes
7649766b45
Merge "Remove <machine/kernel.h>."
2013-12-18 19:26:42 +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
42513bf848
am 78ce7cbf
: am d2bcbf0d
: Merge "Small style cleanup."
...
* commit '78ce7cbf35447057c9b04fd8f68e8eed1ea92b93':
Small style cleanup.
2013-12-18 18:17:08 +00:00
Elliott Hughes
78ce7cbf35
am d2bcbf0d
: Merge "Small style cleanup."
...
* commit 'd2bcbf0dbec86b8f27b1b3d939025098f134ea60':
Small style cleanup.
2013-12-18 10:11:10 -08: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
03335d9124
am 136e7f2b
: am 611b903c
: Merge "Properly detect timeout in pthread_mutex_lock_timeout_np_impl"
...
* commit '136e7f2b7909007d29e4cb917a85fc1d6ef0f6d5':
Properly detect timeout in pthread_mutex_lock_timeout_np_impl
2013-12-18 18:07:23 +00:00