The Android Automerger
d4ab960c83
merge in master-release history after reset to master
2014-04-19 05:49:24 -07:00
Elliott Hughes
47552e7f3d
am 57a61f85
: am a9585aed
: Merge "Temporarily disable text relocation warnings for x86 libraries"
...
* commit '57a61f859d504c4c895d8afac56cf97ad4f48900':
Temporarily disable text relocation warnings for x86 libraries
2014-04-18 23:14:45 +00:00
Elliott Hughes
57a61f859d
am a9585aed
: Merge "Temporarily disable text relocation warnings for x86 libraries"
...
* commit 'a9585aedbc89242b1fe8c2f9eec1212d9b206e88':
Temporarily disable text relocation warnings for x86 libraries
2014-04-18 23:10:06 +00:00
Elliott Hughes
a9585aedbc
Merge "Temporarily disable text relocation warnings for x86 libraries"
2014-04-18 23:02:27 +00:00
Du Chenyang
865119efd4
Temporarily disable text relocation warnings for x86 libraries
...
Too many such warnings will cause CTS failed. This issue still exists
in some x86 version libraries: libdvm.so/libart.so.
$scanelf -qT out/target/product/generic_x86/system/lib/libdvm.so
libdvm.so: (memory/data?) [0x2BAC7] in (optimized out: previous dvmAsmInstructionStartCode) [0x2B2F8]
libdvm.so: (memory/data?) [0x2BB98] in (optimized out: previous dvmAsmInstructionStartCode) [0x2B2F8]
libdvm.so: (memory/data?) [0x2EB28] in (optimized out: previous dvmAsmInstructionStartCode) [0x2B2F8]
libdvm.so: (memory/data?) [0x2EF87] in (optimized out: previous dvmAsmInstructionEndCode) [0x2EF63]
libdvm.so: (memory/data?) [0x2EFAF] in (optimized out: previous dvmAsmInstructionEndCode) [0x2EF63]
libdvm.so: (memory/data?) [0x2EFD7] in (optimized out: previous dvmAsmInstructionEndCode) [0x2EF63]
libdvm.so: (memory/data?) [0x2EFFF] in (optimized out: previous dvmAsmInstructionEndCode) [0x2EF63]
libdvm.so: (memory/data?) [0x2F027] in (optimized out: previous dvmAsmInstructionEndCode) [0x2EF63]
Bug: https://code.google.com/p/android/issues/detail?id=68431
Change-Id: I11ecac282f1163e49a82156fce2a76cc2d619960
2014-04-18 16:00:55 -07:00
Elliott Hughes
3728877b9c
am ccad9736
: am 9b22c21c
: Merge "Make uselocale(3) claim its pthread key in an ELF constructor."
...
* commit 'ccad97362ae773cadbbc41900e7440db6e8748dd':
Make uselocale(3) claim its pthread key in an ELF constructor.
2014-04-18 22:35:05 +00:00
Elliott Hughes
ccad97362a
am 9b22c21c
: Merge "Make uselocale(3) claim its pthread key in an ELF constructor."
...
* commit '9b22c21ceec0a65875081525218315d08bbd36b5':
Make uselocale(3) claim its pthread key in an ELF constructor.
2014-04-18 22:32:33 +00:00
Elliott Hughes
9b22c21cee
Merge "Make uselocale(3) claim its pthread key in an ELF constructor."
2014-04-18 22:27:20 +00:00
Elliott Hughes
f112aed500
am 45d15f7d
: am 1acd9716
: Merge "Switch to upstream OpenBSD fread/fvwrite."
...
* commit '45d15f7dbeb8d72e5a671023e945b2884f061fdf':
Switch to upstream OpenBSD fread/fvwrite.
2014-04-18 22:25:22 +00:00
Elliott Hughes
45d15f7dbe
am 1acd9716
: Merge "Switch to upstream OpenBSD fread/fvwrite."
...
* commit '1acd9716c252f487ec596e42594c0082245b6e34':
Switch to upstream OpenBSD fread/fvwrite.
2014-04-18 22:19:40 +00:00
Elliott Hughes
1acd9716c2
Merge "Switch to upstream OpenBSD fread/fvwrite."
2014-04-18 22:15:02 +00:00
Dan Albert
089ec7dd91
am 302f8a92
: am fe0c6ae5
: Merge "Brings LC_* defs into line with POSIX"
...
* commit '302f8a92e4318d4637df8497a73bcc12446f051a':
Brings LC_* defs into line with POSIX
2014-04-18 21:59:48 +00:00
Elliott Hughes
439c774f44
am 30659d4f
: am cd79c8b1
: Merge "Fix a wchar.wcstombs_wcrtombs test failure."
...
* commit '30659d4ff002b3c09cb1a5ae67b0d416afdf0383':
Fix a wchar.wcstombs_wcrtombs test failure.
2014-04-18 21:56:16 +00:00
Dan Albert
302f8a92e4
am fe0c6ae5
: Merge "Brings LC_* defs into line with POSIX"
...
* commit 'fe0c6ae5618af11e53ee5a41a5bf91353cd2a1ff':
Brings LC_* defs into line with POSIX
2014-04-18 21:56:01 +00:00
Elliott Hughes
30659d4ff0
am cd79c8b1
: Merge "Fix a wchar.wcstombs_wcrtombs test failure."
...
* commit 'cd79c8b1584237313ca6d14fbb0fb57be52a5394':
Fix a wchar.wcstombs_wcrtombs test failure.
2014-04-18 21:52:35 +00:00
Dan Albert
fe0c6ae561
Merge "Brings LC_* defs into line with POSIX"
2014-04-18 21:49:24 +00:00
Dan Albert
db68e56997
Brings LC_* defs into line with POSIX
...
POSIX requires that LC_* constants be defined as macros, and libc++ is testing
for this. Source: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
Change-Id: Id0653e54d74f12179ef88cadf7b5d6ba1bae3cdb
2014-04-18 21:48:57 +00:00
Elliott Hughes
cd79c8b158
Merge "Fix a wchar.wcstombs_wcrtombs test failure."
2014-04-18 21:44:26 +00:00
Elliott Hughes
cdbd17292e
am 06b5431e
: am b88da065
: Merge "Upgrade to current vfprintf."
...
* commit '06b5431eaabec853a03013c9c8af1124aee0f4d4':
Upgrade to current vfprintf.
2014-04-18 21:18:36 +00:00
Elliott Hughes
06b5431eaa
am b88da065
: Merge "Upgrade to current vfprintf."
...
* commit 'b88da06580a22d9a1ee5a1c573c49e89207bc71b':
Upgrade to current vfprintf.
2014-04-18 21:15:28 +00:00
Elliott Hughes
2f68866f37
Make uselocale(3) claim its pthread key in an ELF constructor.
...
pthread_once is nice for decoupling, but it makes resource availability less
predictable, which is a bad thing.
This fixes a test failure if uselocale(3) is called before
pthread.pthread_key_create_lots runs.
Change-Id: Ie2634f986a50e7965582d4bd6e5aaf48cf0d55c8
2014-04-18 13:34:26 -07:00
Elliott Hughes
1b836ee6f8
Fix a wchar.wcstombs_wcrtombs test failure.
...
Looks like I screwed up a last-minute refactor and didn't re-run the tests.
Change-Id: I90a710ae66a313a9812859650aa0b4e8c6bc57f9
2014-04-18 13:32:33 -07:00
Elliott Hughes
9d3c2dd11f
Switch to upstream OpenBSD fread/fvwrite.
...
Change-Id: I3dc11083693bc8d99edc0cbcc6f70dc9e5dc6565
2014-04-18 13:13:04 -07:00
Elliott Hughes
756952d6e9
am a984c3ad
: am 9e94ea5c
: Merge "Upgrade our <ctype.h> implementation to OpenBSD head."
...
* commit 'a984c3ad3b9f8fcc63cd17bbbea2978b93c16533':
Upgrade our <ctype.h> implementation to OpenBSD head.
2014-04-18 19:08:35 +00:00
Elliott Hughes
a984c3ad3b
am 9e94ea5c
: Merge "Upgrade our <ctype.h> implementation to OpenBSD head."
...
* commit '9e94ea5c112a26af5cfc778983e4d5ca692947c0':
Upgrade our <ctype.h> implementation to OpenBSD head.
2014-04-18 19:02:52 +00:00
Elliott Hughes
b88da06580
Merge "Upgrade to current vfprintf."
2014-04-18 18:19:23 +00:00
Elliott Hughes
9e94ea5c11
Merge "Upgrade our <ctype.h> implementation to OpenBSD head."
2014-04-18 17:56:38 +00:00
Elliott Hughes
f3c73901cb
Upgrade our <ctype.h> implementation to OpenBSD head.
...
Adding the perfunctory <ctype.h> tests showed that we'd accidentally
dropped several symbols. This puts everything back in its proper place
and switches us to upstream head at the same time.
Change-Id: Ib527ad280c9baded81e667fa598698526d93e66f
2014-04-18 10:29:16 -07:00
Dan Albert
022984ff06
am 6c84b9d6
: am 0e351e40
: Merge "Changes our ctype identifiers to match the BSDs"
...
* commit '6c84b9d651e9eefab8b1a440979b15fb19404ffd':
Changes our ctype identifiers to match the BSDs
2014-04-18 16:26:14 +00:00
Dan Albert
6c84b9d651
am 0e351e40
: Merge "Changes our ctype identifiers to match the BSDs"
...
* commit '0e351e4011bc98cacc3e37292bfb0e86c3a3bb5b':
Changes our ctype identifiers to match the BSDs
2014-04-18 16:01:54 +00:00
Dan Albert
0e351e4011
Merge "Changes our ctype identifiers to match the BSDs"
2014-04-18 15:52:59 +00:00
Dan Albert
779585fb26
Changes our ctype identifiers to match the BSDs
...
This is to make it possible to adopt the BSDs' implementations for a few locale
APIs in libc++ rather than writing our own, nearly identical, code.
Change-Id: I482acd4ece83aa4ec9eb0c7acf48f3686794bcc3
2014-04-18 08:48:34 -07:00
Elliott Hughes
0549371bd7
Upgrade to current vfprintf.
...
This gets us various bug fixes and missing C99 functionality.
Bug: https://code.google.com/p/android/issues/detail?id=64886
Change-Id: Ie9f8ac569e9b5eec1e4a1faacfe2c21662eaf895
2014-04-17 17:30:03 -07:00
Elliott Hughes
e2e41399fc
am 48db3037
: am 857b1796
: Merge "Regenerate the NOTICE files."
...
* commit '48db3037714d460b112e67793ca8b0270a0cd6a4':
Regenerate the NOTICE files.
2014-04-17 23:34:52 +00:00
Elliott Hughes
c87cb4fbb4
am c54c2a84
: am 8da69a25
: Merge "Switch fpclassify over to ieee_ext."
...
* commit 'c54c2a84cc70861e648932bd84e02163f845dcef':
Switch fpclassify over to ieee_ext.
2014-04-17 23:34:51 +00:00
Elliott Hughes
6478ab8003
am 7fb450b8
: am c480f57d
: Merge "Clean up <machine/ieee.h>."
...
* commit '7fb450b8a4ab15729a28c239364de9240564fe90':
Clean up <machine/ieee.h>.
2014-04-17 23:34:50 +00:00
Elliott Hughes
e21d198da6
am 31028f85
: am 9ceae0c9
: Merge "Use FLT_ROUNDS in LP64 strtold."
...
* commit '31028f852d7f65387bda433f230795b1add2b24f':
Use FLT_ROUNDS in LP64 strtold.
2014-04-17 23:34:50 +00:00
Elliott Hughes
fb7b42df1b
am bfd89274
: am 4abaa576
: Merge "Switch to gdtoa."
...
* commit 'bfd8927447b76bca6393c1e7c735a1333aa60786':
Switch to gdtoa.
2014-04-17 23:34:44 +00:00
Elliott Hughes
48db303771
am 857b1796
: Merge "Regenerate the NOTICE files."
...
* commit '857b1796738460f5f3cf16bb3c1e156e88171143':
Regenerate the NOTICE files.
2014-04-17 23:21:58 +00:00
Elliott Hughes
c54c2a84cc
am 8da69a25
: Merge "Switch fpclassify over to ieee_ext."
...
* commit '8da69a25b7840db23846d4bb303ef84a1775c1e1':
Switch fpclassify over to ieee_ext.
2014-04-17 23:21:58 +00:00
Elliott Hughes
7fb450b8a4
am c480f57d
: Merge "Clean up <machine/ieee.h>."
...
* commit 'c480f57dd3b70c1e8aea013bc540b3a8e1cc40f6':
Clean up <machine/ieee.h>.
2014-04-17 23:21:57 +00:00
Elliott Hughes
31028f852d
am 9ceae0c9
: Merge "Use FLT_ROUNDS in LP64 strtold."
...
* commit '9ceae0c9a62c8ffce1e3d9d79f494e692951cbc5':
Use FLT_ROUNDS in LP64 strtold.
2014-04-17 23:21:57 +00:00
Elliott Hughes
bfd8927447
am 4abaa576
: Merge "Switch to gdtoa."
...
* commit '4abaa576e86e4ceaa9a18271f306787294a1cdfc':
Switch to gdtoa.
2014-04-17 23:21:56 +00:00
Elliott Hughes
857b179673
Merge "Regenerate the NOTICE files."
2014-04-17 00:16:51 +00:00
Elliott Hughes
acbe322e82
Regenerate the NOTICE files.
...
Change-Id: Iac666f69b930e31bbeac3438812d544c6af55b0f
2014-04-16 17:01:12 -07:00
Elliott Hughes
8da69a25b7
Merge "Switch fpclassify over to ieee_ext."
2014-04-16 23:57:06 +00:00
Elliott Hughes
c480f57dd3
Merge "Clean up <machine/ieee.h>."
2014-04-16 23:56:40 +00:00
Elliott Hughes
f081e139fe
Switch fpclassify over to ieee_ext.
...
Change-Id: I441bb7f715da24e1c04b0386ad9dcde0ea8c797c
2014-04-16 16:45:59 -07:00
Elliott Hughes
cb65cc3fb4
Clean up <machine/ieee.h>.
...
The upstream intention was for this to be architecture-dependent, but it's a
lot clearer if we just have one copy.
Change-Id: I4e8310496145f9f411cd2e847c8cd023b1d758e9
2014-04-16 16:31:17 -07:00
Elliott Hughes
9ceae0c9a6
Merge "Use FLT_ROUNDS in LP64 strtold."
2014-04-16 23:26:31 +00:00