Commit Graph

7855 Commits

Author SHA1 Message Date
Elliott Hughes
c6057a5f61 am d60d67db: am aeec2ae7: Merge "Remove the broken pthread deadlock prediction."
* commit 'd60d67db33a7190504c1503455a4e49f7f01a9db':
  Remove the broken pthread deadlock prediction.
2014-05-14 19:51:35 +00:00
Elliott Hughes
d60d67db33 am aeec2ae7: Merge "Remove the broken pthread deadlock prediction."
* commit 'aeec2ae7202892a2bca25a17e60850f9c07b64f6':
  Remove the broken pthread deadlock prediction.
2014-05-14 19:48:08 +00:00
Elliott Hughes
aeec2ae720 Merge "Remove the broken pthread deadlock prediction." 2014-05-14 19:29:30 +00:00
Elliott Hughes
07f1ded139 Remove the broken pthread deadlock prediction.
This hasn't built in over one release cycle and no one even noticed.
art does this the right way and other projects should do the same.

Change-Id: I7d1fb84c4080e008f329ee73e209ce85a36e6d55
2014-05-14 11:38:22 -07:00
Elliott Hughes
b270fd3329 am 7451897c: am e6c27a7a: Merge "Fix a typo in the big g_ search/replace."
* commit '7451897cd45c7dceb52803400c5f979692013c4f':
  Fix a typo in the big g_ search/replace.
2014-05-14 18:07:19 +00:00
Elliott Hughes
7451897cd4 am e6c27a7a: Merge "Fix a typo in the big g_ search/replace."
* commit 'e6c27a7af7a9b13e4e3d3ebd604d28effa9e9322':
  Fix a typo in the big g_ search/replace.
2014-05-14 18:02:53 +00:00
Elliott Hughes
e6c27a7af7 Merge "Fix a typo in the big g_ search/replace." 2014-05-14 17:59:52 +00:00
Elliott Hughes
cd46104cf8 Fix a typo in the big g_ search/replace.
Change-Id: I79261de70d225236d0eadff288220258d697437f
2014-05-14 10:58:58 -07:00
Elliott Hughes
b2da973fe9 am 6eb0fe2b: am 15c13bd6: Merge "Switch to g_ for globals."
* commit '6eb0fe2b02bcc7d82ba23df6cfaef0369e7b068b':
  Switch to g_ for globals.
2014-05-14 17:45:12 +00:00
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
582cf71130 am bc45edaa: am bac79558: Merge "Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc."
* commit 'bc45edaa9e5673c13b3cb161aa2bfacea29bbe04':
  Fix x86_64 user_fpregs_struct to use the same name for the tag word as glibc.
2014-05-14 14:35:38 +00: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
32cd82f093 am 7c0b313d: am a7318774: Merge "Change wctype_t from int to long."
* commit '7c0b313df17569fd821a5617339f962fa1f1ef11':
  Change wctype_t from int to long.
2014-05-14 10:42:44 +00:00
Calin Juravle
c16e4332e4 am d36bbf13: am fd3171b4: Merge "Change wctype_t from enum to int"
* commit 'd36bbf13154affc7bcae0745ca14a55927f8f037':
  Change wctype_t from enum to int
2014-05-14 10:42:44 +00: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
28c9e21fe7 am 2146f78c: am 3e684183: Merge "Use the NetBSD inet_ntop until the OpenBSD bug is fixed."
* commit '2146f78c09e08efe19215ae52c4fa715023ee15c':
  Use the NetBSD inet_ntop until the OpenBSD bug is fixed.
2014-05-14 02:29:31 +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
f49da77e4a am f9a28bd7: am c6b5834c: Merge "Remove page level mprotects"
* commit 'f9a28bd79df2abb17304f0cfafb143c9e79e3377':
  Remove page level mprotects
2014-05-14 01:51:26 +00:00
Elliott Hughes
46afef329f am 9b1e2a14: am 3557f2f6: Merge "Fix <sys/endian.h> uint32_t build failures."
* commit '9b1e2a14f9dad7c4cc19db9fee5afdc1f01340b4':
  Fix <sys/endian.h> uint32_t build failures.
2014-05-14 01:51:25 +00: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
239347d97e am cb6f6243: am 17f8ef87: Merge "Flesh out <arpa/inet.h>."
* commit 'cb6f6243dbf12dd76f50910c476af01519b4be41':
  Flesh out <arpa/inet.h>.
2014-05-14 01:16:05 +00:00
Elliott Hughes
62c24c8353 am f984afd0: am 57722375: Merge "We don\'t need two copies of <nsswitch.h>."
* commit 'f984afd0ef2185d493c03830537460edf34baefc':
  We don't need two copies of <nsswitch.h>.
2014-05-14 01:16:05 +00: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
4d61e7b549 am 59a4a10f: am d57d710f: Merge "Fix build (take two)."
* commit '59a4a10f097a0bdd8d5e9aa52ce1139ccabf82b1':
  Fix build (take two).
2014-05-14 00:51:49 +00: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
9d58ec78b3 am cd004d2d: am 2ed09d44: Merge "Fix build."
* commit 'cd004d2d0117243908b71b2b4c7036d79de5344c':
  Fix build.
2014-05-14 00:05:40 +00: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