Elliott Hughes
d14636ae73
am ffbbc131
: am 1608659a
: am ed96db2a
: Merge "Don\'t abort in stdio.getdelim_invalid and stdio.getline_invalid."
...
* commit 'ffbbc131fa49f60f78a39a1d4a35a2dba20a0167':
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
2013-12-19 23:52:12 +00:00
Elliott Hughes
ffbbc131fa
am 1608659a
: am ed96db2a
: Merge "Don\'t abort in stdio.getdelim_invalid and stdio.getline_invalid."
...
* commit '1608659a45e2291cab84b4ef1d1c6f35ff988e67':
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
2013-12-19 23:48:01 +00:00
Elliott Hughes
1608659a45
am ed96db2a
: Merge "Don\'t abort in stdio.getdelim_invalid and stdio.getline_invalid."
...
* commit 'ed96db2a4f2fe5683407c3571d037bb7325544da':
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
2013-12-19 15:42:06 -08:00
Elliott Hughes
ed96db2a4f
Merge "Don't abort in stdio.getdelim_invalid and stdio.getline_invalid."
2013-12-19 23:36:47 +00:00
Elliott Hughes
6ad8f76f1f
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
...
Change-Id: Ie1aefed732f4bea77887bddd1be9a0578e247aa3
2013-12-19 14:56:17 -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
01e8d48761
am 61f02065
: am cf7a4a4f
: Merge "Revert "Add C linkage for __open_2 and __openat_2.""
...
* commit '61f020650466751501fce0326e654135b88c9f99':
Revert "Add C linkage for __open_2 and __openat_2."
2013-12-19 20:13:00 +00:00
Elliott Hughes
61f0206504
am cf7a4a4f
: Merge "Revert "Add C linkage for __open_2 and __openat_2.""
...
* commit 'cf7a4a4fda076ec76bb79fdbd039665171e8cd75':
Revert "Add C linkage for __open_2 and __openat_2."
2013-12-19 12:07:06 -08: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
b0ad47e20d
am d520c95e
: am bb4f6dc2
: Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
...
* commit 'd520c95e457fb81522491b7e50dc736e81e9bbd1':
ARM: Change dmb domain for bionic_atomic_barrier()
2013-12-19 19:51:14 +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
Elliott Hughes
994f5eee12
am 9ebc59e7
: am 53fc123c
: am eb15a6c9
: Merge "We actually have modfl."
...
* commit '9ebc59e782dbf6de1856ff59125aa30cd9952b3b':
We actually have modfl.
2013-12-19 19:49:45 +00:00
Elliott Hughes
f850700c67
am 2520a94e
: am 1afb375d
: Merge "Fix aarch64 custom assembler now non-uapi is gone."
...
* commit '2520a94e0bfce53b499feb7e88791cd6d8023356':
Fix aarch64 custom assembler now non-uapi is gone.
2013-12-19 19:47:42 +00:00
Elliott Hughes
9ebc59e782
am 53fc123c
: am eb15a6c9
: Merge "We actually have modfl."
...
* commit '53fc123c696a37e428b788dd487598178c592c2c':
We actually have modfl.
2013-12-19 19:47:41 +00:00
Elliott Hughes
d520c95e45
am bb4f6dc2
: Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
...
* commit 'bb4f6dc2ec388dca4f3570164509420e1df91b35':
ARM: Change dmb domain for bionic_atomic_barrier()
2013-12-19 11:45:37 -08:00
Elliott Hughes
2520a94e0b
am 1afb375d
: Merge "Fix aarch64 custom assembler now non-uapi is gone."
...
* commit '1afb375d30cadf5dfcb5dfe352527e2a1147c79f':
Fix aarch64 custom assembler now non-uapi is gone.
2013-12-19 11:42:06 -08:00
Elliott Hughes
53fc123c69
am eb15a6c9
: Merge "We actually have modfl."
...
* commit 'eb15a6c9cd35fa2a91d277c48390827a78435ab4':
We actually have modfl.
2013-12-19 11:42:05 -08:00
Elliott Hughes
bb4f6dc2ec
Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
2013-12-19 19:39:43 +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
1afb375d30
Merge "Fix aarch64 custom assembler now non-uapi is gone."
2013-12-19 19:36:04 +00:00
Elliott Hughes
eb15a6c9cd
Merge "We actually have modfl."
2013-12-19 19:34:03 +00:00
Elliott Hughes
da9775509b
Fix aarch64 custom assembler now non-uapi is gone.
...
Change-Id: I9c8ad17d9bae2de9d793444d87d4ee133728e900
2013-12-19 11:32:42 -08:00
Elliott Hughes
20adf52cf2
We actually have modfl.
...
Change-Id: I22bb4d14f99a418819f2941c2dfec49094807c5f
2013-12-19 11:30:51 -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
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