Dan Albert
7a85d9a1de
Merge "Revert "Add locale aware APIs.""
2014-07-09 14:45:53 +00:00
Dan Albert
063e20c269
Revert "Add locale aware APIs."
...
Accidentally verified against a dirty tree. Needs the companion change to libc++ to land upstream before I can submit this.
This reverts commit e087eac404
.
Change-Id: I317ecd0923114f415eaad7603002f77feffb5e3f
2014-07-09 22:50:43 +00:00
Elliott Hughes
d028b6209c
Merge "Added a __system_property_serial benchmark."
2014-07-09 14:42:04 +00:00
Brigid Smith
28417e6314
Added a __system_property_serial benchmark.
...
Change-Id: Ifc2116f26acb242f4dcdb6eefe128899a9dc63bb
2014-07-09 15:48:37 -07:00
Elliott Hughes
3139f6fdd7
Merge "Remove __CTOR_LIST__ from mips/mips64."
2014-07-09 14:42:04 +00:00
Elliott Hughes
40ad229b25
Remove __CTOR_LIST__ from mips/mips64.
...
Change-Id: I3486b09e30b32ddb67da602cbc2b5fb0402f9764
2014-07-09 09:20:17 -07:00
Elliott Hughes
c4c6789362
Merge "Don't zero r1 on entry to the dynamic linker."
2014-07-09 14:42:04 +00:00
Dmitriy Ivanov
b9247ada20
am 3c12ae56
: Merge "Add test for constructor function."
...
* commit '3c12ae56f402744d1a446ceef7d20f5ea01025c3':
Add test for constructor function.
2014-07-09 12:36:58 +00:00
Elliott Hughes
996524383f
Don't zero r1 on entry to the dynamic linker.
...
There's no need: __linker_init only takes one argument.
Also remove the arm __CTOR_LIST__; we use .init_array and .fini_array instead
of .ctor and .dtor anyway, and I don't think we've ever supported the latter.
Change-Id: Ifc91a5a90c6aa39d674bf0509a7af2e1ff0beddd
2014-07-08 21:38:32 -07:00
Ying Wang
dc42e20d54
TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target
...
Change-Id: I9a562e79de7ec0f065c90de9ae1b72cbcd7d8c6b
2014-07-08 18:54:42 -07:00
Dmitriy Ivanov
3c12ae56f4
Merge "Add test for constructor function."
2014-07-08 22:56:31 +00:00
Dmitriy Ivanov
f8846a4587
Add test for constructor function.
...
Change-Id: I0ad26d617f00cdd6c2241d613be39a1d16918612
2014-07-08 21:21:34 -07:00
Dmitriy Ivanov
4c63233511
am b9c5d606
: am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit 'b9c5d606aab6c1a21e3785d155613c35c276eb18':
Change android_dlextinfo flags to uint64_t
2014-07-08 18:35:19 +00:00
Dmitriy Ivanov
b9c5d606aa
am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit '006e0770ffaa57d88f407fad8d9b78ea0efa9c6a':
Change android_dlextinfo flags to uint64_t
2014-07-08 18:33:20 +00:00
Elliott Hughes
ddf9066e2e
resolved conflicts for merge of aedc14b1
to master
...
Change-Id: Ib00a09a01541afb010f3c8a6f125d067a0c7812d
2014-07-08 11:15:27 -07:00
Elliott Hughes
aedc14b166
am 7244a861
: Merge "Regenerate the bionic NOTICE files."
...
* commit '7244a8610a1b6f7cb38336696e15e2e4ee04613c':
Regenerate the bionic NOTICE files.
2014-07-08 17:50:07 +00:00
Elliott Hughes
7244a8610a
Merge "Regenerate the bionic NOTICE files."
2014-07-08 02:15:13 +00:00
Elliott Hughes
1558138315
Regenerate the bionic NOTICE files.
...
Also fix a few formatting issues in copyright headers that were confusing
the script (though obviously it would be better if the script were smarter).
Change-Id: I7f561bef4f84fdcbd84f375ee226bd65db0e507b
2014-07-07 15:42:06 -07:00
Elliott Hughes
e20bbaf8bb
am 4568e344
: am 2b2916d1
: Merge "Remove some dead data."
...
* commit '4568e344c0a7581dc1b32387ba18c99df76ffeea':
Remove some dead data.
2014-07-07 18:08:48 +00:00
Elliott Hughes
88ed7d2cc1
am d5a6a5e1
: am db42a9f5
: Merge "Fix three clang complaints about the DNS code."
...
* commit 'd5a6a5e18d66543bdfa4dffdfeec80eff32a87b9':
Fix three clang complaints about the DNS code.
2014-07-07 18:08:47 +00:00
Elliott Hughes
4324fd7916
am a19e1d1c
: am 4d763df3
: Merge "Fix a broken boolean test found by clang."
...
* commit 'a19e1d1c6519e6adaa37ae151dc87cb04fe998b0':
Fix a broken boolean test found by clang.
2014-07-07 18:08:46 +00:00
Elliott Hughes
ea24c25512
am 13610bec
: am 1ee1bfde
: Merge "Use __unused rather than self assignment for unused parameters."
...
* commit '13610bec6bfc0af64efdeeafc4c25d34912c2856':
Use __unused rather than self assignment for unused parameters.
2014-07-07 18:08:46 +00:00
Elliott Hughes
4568e344c0
am 2b2916d1
: Merge "Remove some dead data."
...
* commit '2b2916d15458671babed9e250b4d98f1980a976d':
Remove some dead data.
2014-07-07 18:02:34 +00:00
Elliott Hughes
d5a6a5e18d
am db42a9f5
: Merge "Fix three clang complaints about the DNS code."
...
* commit 'db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b':
Fix three clang complaints about the DNS code.
2014-07-07 18:02:33 +00:00
Elliott Hughes
a19e1d1c65
am 4d763df3
: Merge "Fix a broken boolean test found by clang."
...
* commit '4d763df3243f81041269015d0ac3fbd2912d5f3d':
Fix a broken boolean test found by clang.
2014-07-07 18:02:33 +00:00
Elliott Hughes
13610bec6b
am 1ee1bfde
: Merge "Use __unused rather than self assignment for unused parameters."
...
* commit '1ee1bfdeeca74d71f3e7de7ac3a7e45c9a7d0f53':
Use __unused rather than self assignment for unused parameters.
2014-07-07 18:02:32 +00:00
Dmitriy Ivanov
006e0770ff
Merge "Change android_dlextinfo flags to uint64_t"
2014-07-07 17:50:18 +00:00
Dmitriy Ivanov
3a8646fc5d
Change android_dlextinfo flags to uint64_t
...
Change-Id: Id27e8f8e58dbcf6ae79644f2ad3af3dd0aef9ae7
2014-07-08 11:24:03 -07:00
Dan Albert
67afc421f3
am 731f9273
: am 2d94ee29
: Merge "Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."""
...
* commit '731f9273134b861b86ef65f785f4811c2f17b5be':
Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
2014-07-07 16:25:28 +00:00
Dan Albert
731f927313
am 2d94ee29
: Merge "Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64."""
...
* commit '2d94ee29f4be528167f1de328226cac259aac738':
Revert "Revert "Hide _tolower_tab_ and _toupper_tab_ on LP64.""
2014-07-07 16:20:11 +00:00
Elliott Hughes
4d763df324
Merge "Fix a broken boolean test found by clang."
2014-07-05 03:01:43 +00:00
Elliott Hughes
29edbfd64f
Fix a broken boolean test found by clang.
...
This was only on the failure case, so this probably never caused
any real trouble.
Change-Id: Id983689772102cbb9171693b927e544fb0b584fb
2014-07-07 09:45:15 -07:00
Nick Kralevich
031517ff74
am 8ad9909a
: am d11ca4e8
: Merge "Revert "Reenable support for non-PIE executables""
...
* commit '8ad9909a70c4925a1da15ce150835e436f54d8c1':
Revert "Reenable support for non-PIE executables"
2014-07-03 19:59:41 +00:00
Nick Kralevich
8ad9909a70
am d11ca4e8
: Merge "Revert "Reenable support for non-PIE executables""
...
* commit 'd11ca4e8c7cbbdd4b37ea82a351966da75907c0d':
Revert "Reenable support for non-PIE executables"
2014-07-03 19:54:53 +00:00
Nick Kralevich
80d877d6c3
am e6ef1977
: am f95964c9
: Merge "libc_logging: Set SOCK_CLOEXEC on socket"
...
* commit 'e6ef19779f35bfc1e49b50dd6d3189ab393328f1':
libc_logging: Set SOCK_CLOEXEC on socket
2014-07-03 16:09:56 +00:00
Nick Kralevich
e6ef19779f
am f95964c9
: Merge "libc_logging: Set SOCK_CLOEXEC on socket"
...
* commit 'f95964c93becfeb51433d7d90a6e1b9bb456a3e7':
libc_logging: Set SOCK_CLOEXEC on socket
2014-07-03 16:05:17 +00:00
Elliott Hughes
ca771fc396
am bebe8de7
: am 1f262b35
: Merge "Fix recv.cpp so it can build with clang."
...
* commit 'bebe8de7e2d2df2605fe96f7426f26ecbcd7d251':
Fix recv.cpp so it can build with clang.
2014-07-03 00:13:14 +00:00
Elliott Hughes
bebe8de7e2
am 1f262b35
: Merge "Fix recv.cpp so it can build with clang."
...
* commit '1f262b35fef5108e3bd3fbea4b6aa1ce635767f9':
Fix recv.cpp so it can build with clang.
2014-07-03 00:08:14 +00:00
Elliott Hughes
cda4006cc7
am 2a70aba8
: am ab4fc823
: Merge "Fix all resolv warnings and turn on -Werror."
...
* commit '2a70aba8460eff1bfb1417c271c6a5a53c560afa':
Fix all resolv warnings and turn on -Werror.
2014-07-02 23:54:12 +00:00
Elliott Hughes
2a70aba846
am ab4fc823
: Merge "Fix all resolv warnings and turn on -Werror."
...
* commit 'ab4fc82315567a1400bb25af3f835f1b5d80a0fe':
Fix all resolv warnings and turn on -Werror.
2014-07-02 23:51:08 +00:00
Dmitriy Ivanov
fba3354e81
am 176f13a7
: am afd37c42
: Merge "Build fix"
...
* commit '176f13a70845555d6b5776ddacdae8771dccb13f':
Build fix
2014-07-02 23:19:28 +00:00
Dmitriy Ivanov
176f13a708
am afd37c42
: Merge "Build fix"
...
* commit 'afd37c429b14d63ee4144f00cf1fb8041f681f68':
Build fix
2014-07-02 23:16:04 +00:00
Dmitriy Ivanov
e9fa0de5b0
am 8551bfb0
: am 950a435f
: Merge "Load library using file handle."
...
* commit '8551bfb04385781c3b8c68afaf9c055c22a4e985':
Load library using file handle.
2014-07-02 23:13:56 +00:00
Elliott Hughes
f5bd675225
am 9ff95c47
: am 99e2a2f0
: Merge "Switch to upstream OpenBSD mktemp.c."
...
* commit '9ff95c4763bcbc44d25092510fde299f0ba0be7f':
Switch to upstream OpenBSD mktemp.c.
2014-07-02 23:13:47 +00:00
Dmitriy Ivanov
6d3314f227
am f308174a
: am 87b654ce
: Merge "Disable local/protected symbol test for lp64"
...
* commit 'f308174ae2d0655385ae5f50bdd5ae9e3388265f':
Disable local/protected symbol test for lp64
2014-07-02 23:13:44 +00:00
Dmitriy Ivanov
8551bfb043
am 950a435f
: Merge "Load library using file handle."
...
* commit '950a435fc0dffc22a816194af175420176b86908':
Load library using file handle.
2014-07-02 22:57:45 +00:00
Elliott Hughes
1f262b35fe
Merge "Fix recv.cpp so it can build with clang."
2014-07-02 21:12:58 +00:00
Elliott Hughes
6917e6c2ae
Fix recv.cpp so it can build with clang.
...
Change-Id: Iac3e676aa256837333240219bcadbdc31985b5dd
2014-07-02 16:46:34 -07:00
Elliott Hughes
ab4fc82315
Merge "Fix all resolv warnings and turn on -Werror."
2014-07-02 21:12:58 +00:00
Elliott Hughes
37b1b5bbcd
Fix all resolv warnings and turn on -Werror.
...
The res_init.c changes bring us a bit closer to upstream too, though
there's still work to be done there. Some of the remaining differences
look like bugs we'd want to fix, so we should definitely try to come
back to that.
Change-Id: I50baa148e967c90d55d711e9904ad54c7d724d4d
2014-07-02 16:27:20 -07:00