Commit Graph

7966 Commits

Author SHA1 Message Date
Elliott Hughes
6eb0fe2b02 am 15c13bd6: Merge "Switch to g_ for globals."
* commit '15c13bd6cc0ce44d8f083f75d0bfa926a88cc169':
  Switch to g_ for globals.
2014-05-14 17:41:20 +00:00
Elliott Hughes
15c13bd6cc Merge "Switch to g_ for globals." 2014-05-14 17:36:37 +00:00
Elliott Hughes
1728b23965 Switch to g_ for globals.
That's what the Google style guide recommends, and we're starting
to get a mix.

Change-Id: Ib0c53a890bb5deed5c679e887541a715faea91fc
2014-05-14 10:02:03 -07:00
Ross McIlroy
bc45edaa9e am bac79558: Merge "Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc."
* commit 'bac795586bbc5dcbe886d8d781710f60c4c19d9b':
  Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc.
2014-05-14 14:30:56 +00:00
Ross McIlroy
bac795586b Merge "Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc." 2014-05-14 14:27:41 +00:00
Ross McIlroy
0c8a5f82e6 Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc.
Glibc calls the tag pointer in user_fpregs_struct ftw instead of twd.

Change-Id: I4a8dab777fa889de0b9927035cd18557ae6f3263
2014-05-14 13:29:19 +01:00
Calin Juravle
7c0b313df1 am a7318774: Merge "Change wctype_t from int to long."
* commit 'a7318774061b508e7f769fb0e122cfb40cbb94c9':
  Change wctype_t from int to long.
2014-05-14 10:37:48 +00:00
Calin Juravle
d36bbf1315 am fd3171b4: Merge "Change wctype_t from enum to int"
* commit 'fd3171b465184b8eac16dfc88b954b2d6748b2ce':
  Change wctype_t from enum to int
2014-05-14 10:37:48 +00:00
Calin Juravle
a731877406 Merge "Change wctype_t from int to long." 2014-05-14 10:33:46 +00:00
Calin Juravle
fd3171b465 Merge "Change wctype_t from enum to int" 2014-05-14 10:33:35 +00:00
Elliott Hughes
2146f78c09 am 3e684183: Merge "Use the NetBSD inet_ntop until the OpenBSD bug is fixed."
* commit '3e684183881f18b9f3300257b6d65e83f8d5e27c':
  Use the NetBSD inet_ntop until the OpenBSD bug is fixed.
2014-05-14 02:24:40 +00:00
Elliott Hughes
3e68418388 Merge "Use the NetBSD inet_ntop until the OpenBSD bug is fixed." 2014-05-14 02:21:20 +00:00
Elliott Hughes
5c8c88dd8d Use the NetBSD inet_ntop until the OpenBSD bug is fixed.
Stupidly I found this bug by accident when writing the existing
tests, but I didn't think any real code would hit it. It turns
out that libcore always uses an INET6_ADDRSTRLEN-sized buffer
even when working with AF_INET addresses.

Change-Id: Ieffc8e4bbe9b66b49b033e3e7101c896e097e6f8
2014-05-13 19:17:46 -07:00
Dmitriy Ivanov
f9a28bd79d am c6b5834c: Merge "Remove page level mprotects"
* commit 'c6b5834ceb3df72608a8fe3526a2db337e504512':
  Remove page level mprotects
2014-05-14 01:50:02 +00:00
Elliott Hughes
9b1e2a14f9 am 3557f2f6: Merge "Fix <sys/endian.h> uint32_t build failures."
* commit '3557f2f61b9cc736d245aff1e979500cc399e491':
  Fix <sys/endian.h> uint32_t build failures.
2014-05-14 01:46:44 +00:00
Dmitriy Ivanov
c6b5834ceb Merge "Remove page level mprotects" 2014-05-14 01:45:50 +00:00
Elliott Hughes
3557f2f61b Merge "Fix <sys/endian.h> uint32_t build failures." 2014-05-14 01:43:15 +00:00
Elliott Hughes
135b103fd9 Fix <sys/endian.h> uint32_t build failures.
Change-Id: I833b51318f0bf7749073859b7ffacc668c27558e
2014-05-13 18:42:12 -07:00
Dmitriy Ivanov
bc23e530c4 Remove page level mprotects
Freeing block mprotects on the page which it turn
may lead to application crash if linker subsequently
tries to modify another block on the page.

Bug: 14895266
Change-Id: I8ff7f5df467d7be184242de652032b3c84e24b76
2014-05-13 18:34:48 -07:00
Elliott Hughes
cb6f6243db am 17f8ef87: Merge "Flesh out <arpa/inet.h>."
* commit '17f8ef87b565d88c3b391d6d8de8818dec74c4d5':
  Flesh out <arpa/inet.h>.
2014-05-14 01:10:55 +00:00
Elliott Hughes
f984afd0ef am 57722375: Merge "We don\'t need two copies of <nsswitch.h>."
* commit '5772237588a606cad2c7a26d24e9de3c0a62ce81':
  We don't need two copies of <nsswitch.h>.
2014-05-14 01:10:55 +00:00
Elliott Hughes
17f8ef87b5 Merge "Flesh out <arpa/inet.h>." 2014-05-14 01:09:01 +00:00
Elliott Hughes
6a41b0fb0e Flesh out <arpa/inet.h>.
Use the upstream OpenBSD implementations of these functions.

Also ensure we have symbols for htonl, htons, ntohl, and ntohs.
gtest doesn't like us using the macro versions in ASSERT_EQ.

Bug: 14840760
Change-Id: I68720e9aca14838df457d2bb27b999d5818ac2b5
2014-05-13 18:08:29 -07:00
Elliott Hughes
5772237588 Merge "We don't need two copies of <nsswitch.h>." 2014-05-14 01:06:11 +00:00
Elliott Hughes
eed3d0d1f3 We don't need two copies of <nsswitch.h>.
Change-Id: I3f874326d96f41249f5c9b1b3c2885f858589029
2014-05-13 18:05:29 -07:00
Sreeram Ramachandran
59a4a10f09 am d57d710f: Merge "Fix build (take two)."
* commit 'd57d710f0847009038297d1ffcc1613198fb48d4':
  Fix build (take two).
2014-05-14 00:47:06 +00:00
Sreeram Ramachandran
d57d710f08 Merge "Fix build (take two)." 2014-05-14 00:43:47 +00:00
Sreeram Ramachandran
8205a61248 Fix build (take two).
Make sure __netdClientDispatch is defined in the same set of libraries that
refer to it (e.g.: with connect.cpp).

Change-Id: I86d7bf2df5bde09f75a35b204eac0e1361747e22
2014-05-13 17:24:03 -07:00
Sreeram Ramachandran
cd004d2d01 am 2ed09d44: Merge "Fix build."
* commit '2ed09d44ecdaf656a598052d155a813897239042':
  Fix build.
2014-05-14 00:00:58 +00:00
Sreeram Ramachandran
2ed09d44ec Merge "Fix build." 2014-05-13 23:57:07 +00:00
Sreeram Ramachandran
06e8796ee9 Fix build.
Change-Id: I33293d8bc62cbb22e23a704c4242e7e9d3fce7c5
2014-05-13 16:30:12 -07:00
Sreeram Ramachandran
9b5bc6fd7e am 79b56f4b: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '79b56f4b0b9fa52fbf2e79c073d28efd21ae724d':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-13 22:11:48 +00:00
Sreeram Ramachandran
79b56f4b0b Merge "Introduce netd_client, a dynamic library that talks to netd." 2014-05-13 22:07:26 +00:00
Elliott Hughes
b00435d15c am 0ccef7ec: Merge "Upgrade to tzdata2014c."
* commit '0ccef7ec5294b34902e07c26db55891d3eddb2be':
  Upgrade to tzdata2014c.
2014-05-13 18:35:49 +00:00
Elliott Hughes
492e8f7250 am 4482091b: Merge "Consistently use #if defined(__BIONIC__) in tests."
* commit '4482091b1d1611aa395931656b94bfd8ffd583bf':
  Consistently use #if defined(__BIONIC__) in tests.
2014-05-13 18:35:49 +00:00
Sreeram Ramachandran
ceb5bd787c Introduce netd_client, a dynamic library that talks to netd.
The library exists outside bionic. It is dynamically loaded, to replace selected
standard socket syscalls with versions that talk to netd.

Change connect() to use the library if available.

(cherry picked from commit 3a6b627a14df8111b03e452f2df4b5f4938e0e49)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-13 11:30:03 -07:00
Elliott Hughes
0ccef7ec52 Merge "Upgrade to tzdata2014c." 2014-05-13 18:27:30 +00:00
Elliott Hughes
4482091b1d Merge "Consistently use #if defined(__BIONIC__) in tests." 2014-05-13 18:26:47 +00:00
Elliott Hughes
121cb5f4a7 Upgrade to tzdata2014c.
From the release notes:

  Changes affecting near-future time stamps

    Egypt observes DST starting 2014-05-15 at 24:00.
    (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
    Details have not been announced, except that DST will not be
    observed during Ramadan.  Guess that DST will stop during the same
    Ramadan dates as Morocco, and that Egypt's future spring and fall
    transitions will be the same as 2010 when it last observed DST,
    namely April's last Friday at 00:00 to September's last Thursday at
    23:00 standard time.  Also, guess that Ramadan transitions will be
    at 00:00 standard time.

Change-Id: I6a20cae02a314871acbd52cb90fcbebd37625810
2014-05-13 11:23:18 -07:00
Elliott Hughes
063525c61d Consistently use #if defined(__BIONIC__) in tests.
I've also switched some tests to be positive rather than negative,
because !defined is slightly harder to reason about and there are
only two cases: bionic and glibc.

Change-Id: I8d3ac40420ca5aead3e88c69cf293f267273c8ef
2014-05-13 11:19:57 -07:00
Elliott Hughes
56b18bb4d2 am a26dd781: Merge "Add getmntent_r to our collection of <mntent.h> compatibility stubs."
* commit 'a26dd781fe675cf94c62183da27622eb83ff6fa7':
  Add getmntent_r to our collection of <mntent.h> compatibility stubs.
2014-05-13 18:18:20 +00:00
Elliott Hughes
a26dd781fe Merge "Add getmntent_r to our collection of <mntent.h> compatibility stubs." 2014-05-13 18:14:49 +00:00
Elliott Hughes
eb664e24c0 Add getmntent_r to our collection of <mntent.h> compatibility stubs.
This helps build 'external/flo' out of the box.

Bug: 14841211
Change-Id: I30dde77239cceaf1f5743163744eb3604d27a266
2014-05-13 10:44:07 -07:00
Elliott Hughes
2b5503b578 am dbcba8f5: Merge "Reduce stack usage of tmpfile(3)."
* commit 'dbcba8f5f9a59fac3d22dfc17a14d3d5cfb4f4b0':
  Reduce stack usage of tmpfile(3).
2014-05-13 17:37:22 +00:00
Elliott Hughes
dbcba8f5f9 Merge "Reduce stack usage of tmpfile(3)." 2014-05-13 17:32:48 +00:00
Calin Juravle
66faa0c21f am f34f0ccb: Merge "Use __LP64__ instead of __LP32__ in sched.h"
* commit 'f34f0ccb0e1d1c6df5f60bbfc44983263f89164d':
  Use __LP64__ instead of __LP32__ in sched.h
2014-05-13 17:21:29 +00:00
Calin Juravle
f34f0ccb0e Merge "Use __LP64__ instead of __LP32__ in sched.h" 2014-05-13 17:16:30 +00:00
Elliott Hughes
b6943186ce Reduce stack usage of tmpfile(3).
Also ensure that none of our home-grown code uses more than 2KiB per frame.

Change-Id: I8987a17d72f4b7f082bb7fa25e137c8433664c14
2014-05-13 10:14:22 -07:00
Dmitriy Ivanov
f4846a3ab6 am d44927b8: Merge "Refactor linker allocator"
* commit 'd44927b8e9f4b2bcd376d1f84bad46f3ba9094de':
  Refactor linker allocator
2014-05-13 15:52:15 +00:00
Dmitriy Ivanov
d44927b8e9 Merge "Refactor linker allocator" 2014-05-13 15:49:18 +00:00