OSDN Git Service

android-x86/bionic.git
10 years agoMerge "Regenerate the bionic headers to match external/kernel-headers."
Elliott Hughes [Mon, 25 Nov 2013 22:19:23 +0000 (22:19 +0000)]
Merge "Regenerate the bionic headers to match external/kernel-headers."

10 years agoam 6fcdba7a: am a98fff25: Merge "Make <sys/timerfd.h> standalone."
Elliott Hughes [Mon, 25 Nov 2013 22:09:32 +0000 (14:09 -0800)]
am 6fcdba7a: am a98fff25: Merge "Make <sys/timerfd.h> standalone."

* commit '6fcdba7a12eb1fdca200d725d09d27a69ee7b78a':
  Make <sys/timerfd.h> standalone.

10 years agoRegenerate the bionic headers to match external/kernel-headers.
Elliott Hughes [Mon, 25 Nov 2013 22:08:33 +0000 (14:08 -0800)]
Regenerate the bionic headers to match external/kernel-headers.

(This undoes the AOSP-only ion.h hack.)

Bug: 11859767
Change-Id: Id863c70d63b2716ae22cafd7ddb1163bbc7a3d11

10 years agoam a98fff25: Merge "Make <sys/timerfd.h> standalone."
Elliott Hughes [Mon, 25 Nov 2013 22:07:26 +0000 (14:07 -0800)]
am a98fff25: Merge "Make <sys/timerfd.h> standalone."

* commit 'a98fff25c33b2cb697c6bf75b3d17612427b6db3':
  Make <sys/timerfd.h> standalone.

10 years agoam aee38bc0: am 5a52bd34: Merge "Regenerate the bionic kernel headers to match extern...
Elliott Hughes [Mon, 25 Nov 2013 22:05:10 +0000 (14:05 -0800)]
am aee38bc0: am 5a52bd34: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."

* commit 'aee38bc05ff0cd1294d079909c27732249507abd':
  Regenerate the bionic kernel headers to match external/kernel-headers.

10 years agoam 5a52bd34: Merge "Regenerate the bionic kernel headers to match external/kernel...
Elliott Hughes [Mon, 25 Nov 2013 22:01:39 +0000 (14:01 -0800)]
am 5a52bd34: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."

* commit '5a52bd34f1b7e49e28b31dd2c186de8bdef47451':
  Regenerate the bionic kernel headers to match external/kernel-headers.

10 years agoMerge "Make <sys/timerfd.h> standalone."
Elliott Hughes [Mon, 25 Nov 2013 22:00:10 +0000 (22:00 +0000)]
Merge "Make <sys/timerfd.h> standalone."

10 years agoMake <sys/timerfd.h> standalone.
Elliott Hughes [Mon, 25 Nov 2013 21:58:38 +0000 (13:58 -0800)]
Make <sys/timerfd.h> standalone.

There's no uapi timerfd.h.

Bug: 11559337
Change-Id: I77a4b1365fdcf2c9f18673b11341a165e54b4bbd

10 years agoMerge "Regenerate the bionic kernel headers to match external/kernel-headers."
Elliott Hughes [Mon, 25 Nov 2013 21:56:09 +0000 (21:56 +0000)]
Merge "Regenerate the bionic kernel headers to match external/kernel-headers."

10 years agoRegenerate the bionic kernel headers to match external/kernel-headers.
Elliott Hughes [Mon, 25 Nov 2013 21:50:24 +0000 (13:50 -0800)]
Regenerate the bionic kernel headers to match external/kernel-headers.

Bug: 11859767
Change-Id: I3d746188a1c4bdf8db1358521438435d3e63dbac

10 years agoam cf8500fd: am cda0c61d: am 14d6be45: Merge "Delete non-uapi headers."
Christopher Ferris [Sun, 24 Nov 2013 08:27:51 +0000 (00:27 -0800)]
am cf8500fd: am cda0c61d: am 14d6be45: Merge "Delete non-uapi headers."

* commit 'cf8500fd4359bd026829bdfd0dc4968ed07cc842':
  Delete non-uapi headers.

10 years agoam cda0c61d: am 14d6be45: Merge "Delete non-uapi headers."
Christopher Ferris [Sun, 24 Nov 2013 08:24:43 +0000 (00:24 -0800)]
am cda0c61d: am 14d6be45: Merge "Delete non-uapi headers."

* commit 'cda0c61dc7490236afb697ac50c900cffe2cb640':
  Delete non-uapi headers.

10 years agoam 14d6be45: Merge "Delete non-uapi headers."
Christopher Ferris [Sun, 24 Nov 2013 08:20:23 +0000 (00:20 -0800)]
am 14d6be45: Merge "Delete non-uapi headers."

* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
  Delete non-uapi headers.

10 years agoMerge "Delete non-uapi headers."
Christopher Ferris [Sun, 24 Nov 2013 08:16:25 +0000 (08:16 +0000)]
Merge "Delete non-uapi headers."

10 years agoam 76115fe9: am dd1d4f1c: am 985c3fbb: Merge "Move arm user.h definitions to sys...
Christopher Ferris [Sat, 23 Nov 2013 20:41:04 +0000 (12:41 -0800)]
am 76115fe9: am dd1d4f1c: am 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."

* commit '76115fe9a0a8a2a7f57abcc3fea4e2be079cb2e6':
  Move arm user.h definitions to sys/user.h.

10 years agoam 30aebed9: am 038919d3: am 507f95e2: Merge "Update script to copy in extra generate...
Christopher Ferris [Sat, 23 Nov 2013 20:41:04 +0000 (12:41 -0800)]
am 30aebed9: am 038919d3: am 507f95e2: Merge "Update script to copy in extra generated files."

* commit '30aebed98ab66329d62e0884209fd9d04a8b056f':
  Update script to copy in extra generated files.

10 years agoam dd1d4f1c: am 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."
Christopher Ferris [Sat, 23 Nov 2013 20:36:55 +0000 (12:36 -0800)]
am dd1d4f1c: am 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."

* commit 'dd1d4f1cfd6c4c6eca27cc2f7f477e0518dc0924':
  Move arm user.h definitions to sys/user.h.

10 years agoam 038919d3: am 507f95e2: Merge "Update script to copy in extra generated files."
Christopher Ferris [Sat, 23 Nov 2013 20:36:51 +0000 (12:36 -0800)]
am 038919d3: am 507f95e2: Merge "Update script to copy in extra generated files."

* commit '038919d37c01e52f5a976247f482daacfa206393':
  Update script to copy in extra generated files.

10 years agoam 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."
Christopher Ferris [Sat, 23 Nov 2013 16:02:04 +0000 (08:02 -0800)]
am 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."

* commit '985c3fbb3b1dabfa799e2a8c102867349bcb5a76':
  Move arm user.h definitions to sys/user.h.

10 years agoDelete non-uapi headers.
Christopher Ferris [Sat, 23 Nov 2013 01:57:59 +0000 (17:57 -0800)]
Delete non-uapi headers.

Update headers and delete non-uapi headers that have been removed from
external/kernel-headers project.

Change-Id: I9ed9632a941095fe1bf3b207bafe1151f00de033

10 years agoMerge "Move arm user.h definitions to sys/user.h."
Christopher Ferris [Sat, 23 Nov 2013 15:59:57 +0000 (15:59 +0000)]
Merge "Move arm user.h definitions to sys/user.h."

10 years agoam 3f3788c3: am f00c938c: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242...
The Android Open Source Project [Sat, 23 Nov 2013 03:31:07 +0000 (19:31 -0800)]
am 3f3788c3: am f00c938c: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD

* commit '3f3788c339488d106830718174341380ddd5193a':

10 years agoMove arm user.h definitions to sys/user.h.
Christopher Ferris [Sat, 23 Nov 2013 02:00:09 +0000 (18:00 -0800)]
Move arm user.h definitions to sys/user.h.

There is no uapi user.h file for arm, it was included by accident.
Move the user struct definition into the file to follow the pattern
used by the other architectures.

Change-Id: Ib9cea0deca551c9268382ddd6de9202fd32ef941

10 years agoam f00c938c: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:30:47 +0000 (17:30 -0800)]
am f00c938c: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD

* commit 'f00c938c7f5887981d724bf2dd9989ee0af08332':

10 years agoam 507f95e2: Merge "Update script to copy in extra generated files."
Christopher Ferris [Sat, 23 Nov 2013 01:22:10 +0000 (17:22 -0800)]
am 507f95e2: Merge "Update script to copy in extra generated files."

* commit '507f95e22b39fb58b9ffbba38ab593475b926af5':
  Update script to copy in extra generated files.

10 years agoMerge "Update script to copy in extra generated files."
Christopher Ferris [Sat, 23 Nov 2013 01:17:15 +0000 (01:17 +0000)]
Merge "Update script to copy in extra generated files."

10 years agoUpdate script to copy in extra generated files.
Christopher Ferris [Sat, 23 Nov 2013 01:04:34 +0000 (17:04 -0800)]
Update script to copy in extra generated files.

There are files in generated/asm that simply include asm-generic files. The
script now copies any file in generated/asm that also exists in asm-generic.

Change-Id: I075161c68624e9e9e81797224831988ce02220eb

10 years agoMerge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 19:08:12 +0000 (11:08 -0800)]
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD

Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761

10 years agoam e3bc2254: am a626e4d8: am 26f0e54a: Merge "Script to grab uapi headers from androi...
Christopher Ferris [Fri, 22 Nov 2013 07:00:03 +0000 (23:00 -0800)]
am e3bc2254: am a626e4d8: am 26f0e54a: Merge "Script to grab uapi headers from android kernel."

* commit 'e3bc2254138e92d1b4746709ec355a5bd43bbccd':
  Script to grab uapi headers from android kernel.

10 years agoam 68a4187c: am 50f6b836: am fa7b48bf: Merge "Regenerate uapi header files."
Elliott Hughes [Fri, 22 Nov 2013 07:00:02 +0000 (23:00 -0800)]
am 68a4187c: am 50f6b836: am fa7b48bf: Merge "Regenerate uapi header files."

* commit '68a4187c4a88a885b36412607797e7ca65662968':
  Regenerate uapi header files.

10 years agoam 81768e18: am 5e818b33: am 880d0e6c: Merge "Remove hidden __reboot from header"
Elliott Hughes [Fri, 22 Nov 2013 07:00:01 +0000 (23:00 -0800)]
am 81768e18: am 5e818b33: am 880d0e6c: Merge "Remove hidden __reboot from header"

* commit '81768e18bb2e7c29917e1f4c188285c64498f61d':
  Remove hidden __reboot from header

10 years agoam 8acd5dd2: am 84336795: am eec57b37: Merge "Add support for the ternary operator...
Elliott Hughes [Fri, 22 Nov 2013 07:00:01 +0000 (23:00 -0800)]
am 8acd5dd2: am 84336795: am eec57b37: Merge "Add support for the ternary operator to the header scrubber."

* commit '8acd5dd2f82ecbf57c275528d5f2e5db0ef60a34':
  Add support for the ternary operator to the header scrubber.

10 years agoam 5a2526ac: am cb478f23: am d4143c8e: Merge "Fix useconds_t for LP64."
Elliott Hughes [Fri, 22 Nov 2013 07:00:00 +0000 (23:00 -0800)]
am 5a2526ac: am cb478f23: am d4143c8e: Merge "Fix useconds_t for LP64."

* commit '5a2526ac629802ff22f71d516f7979f1f4a4c34d':
  Fix useconds_t for LP64.

10 years agoam 03adedfc: am a18a01f5: am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."
Elliott Hughes [Fri, 22 Nov 2013 06:59:59 +0000 (22:59 -0800)]
am 03adedfc: am a18a01f5: am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."

* commit '03adedfc3c8d25939d8799ed2ce9292b063d8bc7':
  Remove obsolete kernel/arch-mips headers.

10 years agoam b749a010: am 8637bb53: am b135f6e5: Merge "Remove the unused arch-x86 and arch...
Elliott Hughes [Fri, 22 Nov 2013 06:59:59 +0000 (22:59 -0800)]
am b749a010: am 8637bb53: am b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."

* commit 'b749a010a3cf6b1544d1e27b360ffcb98ae1cdbc':
  Remove the unused arch-x86 and arch-x86-64 kernel headers.

10 years agoam a38dcc02: am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep...
Elliott Hughes [Fri, 22 Nov 2013 04:08:22 +0000 (20:08 -0800)]
am a38dcc02: am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."

* commit 'a38dcc0210ad2f75aac72e2c3bef357bddb7b564':
  Switch to upstream sleep(3) and usleep(3).

10 years agoam a626e4d8: am 26f0e54a: Merge "Script to grab uapi headers from android kernel."
Christopher Ferris [Fri, 22 Nov 2013 02:43:58 +0000 (18:43 -0800)]
am a626e4d8: am 26f0e54a: Merge "Script to grab uapi headers from android kernel."

* commit 'a626e4d8bc3d59cc328942fc30ffc04981b154ed':
  Script to grab uapi headers from android kernel.

10 years agoam 50f6b836: am fa7b48bf: Merge "Regenerate uapi header files."
Elliott Hughes [Fri, 22 Nov 2013 02:43:57 +0000 (18:43 -0800)]
am 50f6b836: am fa7b48bf: Merge "Regenerate uapi header files."

* commit '50f6b8363e1429316311450f2a3041040977d67c':
  Regenerate uapi header files.

10 years agoam 5e818b33: am 880d0e6c: Merge "Remove hidden __reboot from header"
Elliott Hughes [Fri, 22 Nov 2013 02:43:51 +0000 (18:43 -0800)]
am 5e818b33: am 880d0e6c: Merge "Remove hidden __reboot from header"

* commit '5e818b331430c34c42259a1405a75cc4106a27d0':
  Remove hidden __reboot from header

10 years agoam 84336795: am eec57b37: Merge "Add support for the ternary operator to the header...
Elliott Hughes [Fri, 22 Nov 2013 02:43:48 +0000 (18:43 -0800)]
am 84336795: am eec57b37: Merge "Add support for the ternary operator to the header scrubber."

* commit '843367953f40ee84bcc53e08a60c82215303e1fb':
  Add support for the ternary operator to the header scrubber.

10 years agoam cb478f23: am d4143c8e: Merge "Fix useconds_t for LP64."
Elliott Hughes [Fri, 22 Nov 2013 02:43:47 +0000 (18:43 -0800)]
am cb478f23: am d4143c8e: Merge "Fix useconds_t for LP64."

* commit 'cb478f23cc3765e3193beaf83fb35dd2d353d301':
  Fix useconds_t for LP64.

10 years agoam a18a01f5: am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."
Elliott Hughes [Fri, 22 Nov 2013 02:43:47 +0000 (18:43 -0800)]
am a18a01f5: am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."

* commit 'a18a01f553ce5350923c470c144dca87dfc8e992':
  Remove obsolete kernel/arch-mips headers.

10 years agoam 8637bb53: am b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel...
Elliott Hughes [Fri, 22 Nov 2013 02:43:46 +0000 (18:43 -0800)]
am 8637bb53: am b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."

* commit '8637bb5345bce20374ed345490d6de80cb874554':
  Remove the unused arch-x86 and arch-x86-64 kernel headers.

10 years agoam 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."
Elliott Hughes [Fri, 22 Nov 2013 01:15:03 +0000 (17:15 -0800)]
am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."

* commit '70d37e343aa0c8c771e01259377c98958fbfd3ee':
  Switch to upstream sleep(3) and usleep(3).

10 years agoam 7c883327: am 556c7402: am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."
Elliott Hughes [Fri, 22 Nov 2013 01:12:04 +0000 (17:12 -0800)]
am 7c883327: am 556c7402: am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."

* commit '7c88332701cc9aa2ed95148bed40f50c54adb36b':
  Fix <signal.h> for mips uapi.

10 years agoam 556c7402: am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."
Elliott Hughes [Fri, 22 Nov 2013 01:07:47 +0000 (17:07 -0800)]
am 556c7402: am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."

* commit '556c740298a07e586c423480328231cfd50966b6':
  Fix <signal.h> for mips uapi.

10 years agoam 26f0e54a: Merge "Script to grab uapi headers from android kernel."
Christopher Ferris [Thu, 21 Nov 2013 22:22:49 +0000 (14:22 -0800)]
am 26f0e54a: Merge "Script to grab uapi headers from android kernel."

* commit '26f0e54ae083727ee66ee35531ed00338570d792':
  Script to grab uapi headers from android kernel.

10 years agoMerge "Script to grab uapi headers from android kernel."
Christopher Ferris [Thu, 21 Nov 2013 22:20:14 +0000 (22:20 +0000)]
Merge "Script to grab uapi headers from android kernel."

10 years agoam fa7b48bf: Merge "Regenerate uapi header files."
Elliott Hughes [Thu, 21 Nov 2013 22:11:39 +0000 (14:11 -0800)]
am fa7b48bf: Merge "Regenerate uapi header files."

* commit 'fa7b48bf8753690bd15706a1fe3d23cf5c42782f':
  Regenerate uapi header files.

10 years agoScript to grab uapi headers from android kernel.
Christopher Ferris [Thu, 21 Nov 2013 03:52:56 +0000 (19:52 -0800)]
Script to grab uapi headers from android kernel.

Change-Id: Ia140e3ab27fbfee6b02f04c085f3e0e351bbe68d

10 years agoMerge "Regenerate uapi header files."
Elliott Hughes [Thu, 21 Nov 2013 22:06:14 +0000 (22:06 +0000)]
Merge "Regenerate uapi header files."

10 years agoRegenerate uapi header files.
Elliott Hughes [Thu, 21 Nov 2013 21:43:23 +0000 (13:43 -0800)]
Regenerate uapi header files.

Change-Id: Idc934ed8ae17aba3300e4022e9b42177b0907e9d

10 years agoam 880d0e6c: Merge "Remove hidden __reboot from header"
Elliott Hughes [Thu, 21 Nov 2013 20:41:56 +0000 (12:41 -0800)]
am 880d0e6c: Merge "Remove hidden __reboot from header"

* commit '880d0e6c64eb49736125648d1539726629308316':
  Remove hidden __reboot from header

10 years agoMerge "Remove hidden __reboot from header"
Elliott Hughes [Thu, 21 Nov 2013 20:37:25 +0000 (20:37 +0000)]
Merge "Remove hidden __reboot from header"

10 years agoRemove hidden __reboot from header
Pavel Chupin [Thu, 21 Nov 2013 19:13:08 +0000 (23:13 +0400)]
Remove hidden __reboot from header

This change is required:
https://android-review.googlesource.com/#/c/70570

Change-Id: Idb991f96a424aa5b0f9e06d9fb787fe8c8530750
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
10 years agoam eec57b37: Merge "Add support for the ternary operator to the header scrubber."
Elliott Hughes [Thu, 21 Nov 2013 19:34:47 +0000 (11:34 -0800)]
am eec57b37: Merge "Add support for the ternary operator to the header scrubber."

* commit 'eec57b370642f1b83285883104f2e778f32eef73':
  Add support for the ternary operator to the header scrubber.

10 years agoMerge "Add support for the ternary operator to the header scrubber."
Elliott Hughes [Thu, 21 Nov 2013 19:30:22 +0000 (19:30 +0000)]
Merge "Add support for the ternary operator to the header scrubber."

10 years agoAdd support for the ternary operator to the header scrubber.
Elliott Hughes [Thu, 21 Nov 2013 19:12:34 +0000 (11:12 -0800)]
Add support for the ternary operator to the header scrubber.

Used in various uapi headers.

Change-Id: Id0f862d2adc7ddc9727e8a29160d5435f8d547c3

10 years agoam 0b4ca7e3: am 004ecb39: am db1dec1e: Merge "Clean up pthread_internal_t."
Elliott Hughes [Thu, 21 Nov 2013 18:15:35 +0000 (10:15 -0800)]
am 0b4ca7e3: am 004ecb39: am db1dec1e: Merge "Clean up pthread_internal_t."

* commit '0b4ca7e3ce59e6993b47cb7856e74c3c46b44c9b':
  Clean up pthread_internal_t.

10 years agoam 47580cc0: am 3c6d1b88: am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to...
Christopher Ferris [Thu, 21 Nov 2013 18:15:34 +0000 (10:15 -0800)]
am 47580cc0: am 3c6d1b88: am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."

* commit '47580cc01768dcb67ab152915a2e78a98e36b463':
  Add .cfi_startproc/.cfi_endproc to ENTRY/END.

10 years agoam 3eb08b0e: am f4e03b03: am bf652a5f: Merge "Provide <sys/user.h>."
Elliott Hughes [Thu, 21 Nov 2013 18:15:33 +0000 (10:15 -0800)]
am 3eb08b0e: am f4e03b03: am bf652a5f: Merge "Provide <sys/user.h>."

* commit '3eb08b0e298e5b283add3a6a1abf0026d7cbcd98':
  Provide <sys/user.h>.

10 years agoam 004ecb39: am db1dec1e: Merge "Clean up pthread_internal_t."
Elliott Hughes [Thu, 21 Nov 2013 18:12:26 +0000 (10:12 -0800)]
am 004ecb39: am db1dec1e: Merge "Clean up pthread_internal_t."

* commit '004ecb39e1cc0aed57b6185d4adf015b61b2d0c6':
  Clean up pthread_internal_t.

10 years agoam 3c6d1b88: am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."
Christopher Ferris [Thu, 21 Nov 2013 18:12:25 +0000 (10:12 -0800)]
am 3c6d1b88: am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."

* commit '3c6d1b887692ecc7198e5292d49e3635b68fa95c':
  Add .cfi_startproc/.cfi_endproc to ENTRY/END.

10 years agoam f4e03b03: am bf652a5f: Merge "Provide <sys/user.h>."
Elliott Hughes [Thu, 21 Nov 2013 18:12:24 +0000 (10:12 -0800)]
am f4e03b03: am bf652a5f: Merge "Provide <sys/user.h>."

* commit 'f4e03b03656527caf88b9e582ab5ca19ae697700':
  Provide <sys/user.h>.

10 years agoam d4143c8e: Merge "Fix useconds_t for LP64."
Elliott Hughes [Thu, 21 Nov 2013 17:07:15 +0000 (09:07 -0800)]
am d4143c8e: Merge "Fix useconds_t for LP64."

* commit 'd4143c8e4cd8b006d8f422883b53684881e0991a':
  Fix useconds_t for LP64.

10 years agoam 15a64948: Merge "Remove obsolete kernel/arch-mips headers."
Elliott Hughes [Thu, 21 Nov 2013 17:07:14 +0000 (09:07 -0800)]
am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."

* commit '15a64948567e6e885f639070fa1cc56900dcbae0':
  Remove obsolete kernel/arch-mips headers.

10 years agoam b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
Elliott Hughes [Thu, 21 Nov 2013 17:07:13 +0000 (09:07 -0800)]
am b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."

* commit 'b135f6e58cc81a6de64c55017d25496003ebe547':
  Remove the unused arch-x86 and arch-x86-64 kernel headers.

10 years agoMerge "Fix useconds_t for LP64."
Elliott Hughes [Thu, 21 Nov 2013 17:05:04 +0000 (17:05 +0000)]
Merge "Fix useconds_t for LP64."

10 years agoMerge "Remove obsolete kernel/arch-mips headers."
Elliott Hughes [Thu, 21 Nov 2013 17:04:44 +0000 (17:04 +0000)]
Merge "Remove obsolete kernel/arch-mips headers."

10 years agoMerge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
Elliott Hughes [Thu, 21 Nov 2013 17:04:24 +0000 (17:04 +0000)]
Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."

10 years agoFix useconds_t for LP64.
Elliott Hughes [Thu, 21 Nov 2013 16:55:46 +0000 (08:55 -0800)]
Fix useconds_t for LP64.

Change-Id: I869e60484999c1feda3dcdb86bee5b5373e6b3df

10 years agoam 0df47ece: am d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."
Elliott Hughes [Thu, 21 Nov 2013 16:12:58 +0000 (08:12 -0800)]
am 0df47ece: am d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."

* commit '0df47ece78b2e596dde3a2369b44917842bbbd4b':
  Clean up forking and cloning.

10 years agoam 6e5fda6b: am 22b8c53e: am 9d70ddc4: Merge "Add test case for 1^NaN"
Narayan Kamath [Thu, 21 Nov 2013 16:12:57 +0000 (08:12 -0800)]
am 6e5fda6b: am 22b8c53e: am 9d70ddc4: Merge "Add test case for 1^NaN"

* commit '6e5fda6b6d2b15155d8ca1ef586cf8ce6e04a067':
  Add test case for 1^NaN

10 years agoam 67026112: am 8154f010: am 318e86ed: Merge "bionic: call stdio cleanup on exit"
Elliott Hughes [Thu, 21 Nov 2013 16:12:57 +0000 (08:12 -0800)]
am 67026112: am 8154f010: am 318e86ed: Merge "bionic: call stdio cleanup on exit"

* commit '67026112a00b94f9d13c3adea2ffbb4fb83d55c5':
  bionic: call stdio cleanup on exit

10 years agoam 86ae0ff1: am 044d4655: am 303fe0cb: Merge "Fix pthread_join."
Elliott Hughes [Thu, 21 Nov 2013 16:12:56 +0000 (08:12 -0800)]
am 86ae0ff1: am 044d4655: am 303fe0cb: Merge "Fix pthread_join."

* commit '86ae0ff135456b2b695f49cf40ccc4e8ebc60f51':
  Fix pthread_join.

10 years agoam 37e5c6ba: am 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."
Christopher Ferris [Thu, 21 Nov 2013 16:12:55 +0000 (08:12 -0800)]
am 37e5c6ba: am 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."

* commit '37e5c6ba89b9daca67b1c09e2b73b4c6eac805a5':
  Pull in cleaned version.h header.

10 years agoam e4bc301a: am da12e64f: am be8344bb: Merge "Modify tests for another glibc difference."
Christopher Ferris [Thu, 21 Nov 2013 16:12:55 +0000 (08:12 -0800)]
am e4bc301a: am da12e64f: am be8344bb: Merge "Modify tests for another glibc difference."

* commit 'e4bc301aa50071d09d268f661be72647a491a8c0':
  Modify tests for another glibc difference.

10 years agoam a8276f64: am 18368fc8: am f246c589: Merge "Clean up the pthread_create trampoline."
Elliott Hughes [Thu, 21 Nov 2013 16:12:54 +0000 (08:12 -0800)]
am a8276f64: am 18368fc8: am f246c589: Merge "Clean up the pthread_create trampoline."

* commit 'a8276f64b203a01d1b393a11dc9c492d1a6557e3':
  Clean up the pthread_create trampoline.

10 years agoam b343d221: am 862c32b4: am e39e3a77: Merge "Add new tests for memory/string routines."
Christopher Ferris [Thu, 21 Nov 2013 16:12:53 +0000 (08:12 -0800)]
am b343d221: am 862c32b4: am e39e3a77: Merge "Add new tests for memory/string routines."

* commit 'b343d221103432f67df366a95c06a69d23ddbd1b':
  Add new tests for memory/string routines.

10 years agoam 00f25edc: am 5b524852: am 645d4269: Merge "Switch pthread_create over to __bionic_...
Elliott Hughes [Thu, 21 Nov 2013 16:12:53 +0000 (08:12 -0800)]
am 00f25edc: am 5b524852: am 645d4269: Merge "Switch pthread_create over to __bionic_clone."

* commit '00f25edccace521bc4cbc3cfe3d05e8e1a9b6652':
  Switch pthread_create over to __bionic_clone.

10 years agoam d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."
Elliott Hughes [Thu, 21 Nov 2013 16:10:07 +0000 (08:10 -0800)]
am d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."

* commit 'd5a59aa767d4d87738b53995d73461be2778b9ee':
  Clean up forking and cloning.

10 years agoam 22b8c53e: am 9d70ddc4: Merge "Add test case for 1^NaN"
Narayan Kamath [Thu, 21 Nov 2013 16:10:04 +0000 (08:10 -0800)]
am 22b8c53e: am 9d70ddc4: Merge "Add test case for 1^NaN"

* commit '22b8c53ef6fffdc83bd730563c30eb8ce93e46df':
  Add test case for 1^NaN

10 years agoam 8154f010: am 318e86ed: Merge "bionic: call stdio cleanup on exit"
Elliott Hughes [Thu, 21 Nov 2013 16:10:03 +0000 (08:10 -0800)]
am 8154f010: am 318e86ed: Merge "bionic: call stdio cleanup on exit"

* commit '8154f010a1c017b56ec7de3014e3ddf958f92536':
  bionic: call stdio cleanup on exit

10 years agoam 044d4655: am 303fe0cb: Merge "Fix pthread_join."
Elliott Hughes [Thu, 21 Nov 2013 16:10:02 +0000 (08:10 -0800)]
am 044d4655: am 303fe0cb: Merge "Fix pthread_join."

* commit '044d4655b7c06c9d5988f7dc604e59f76e098f5d':
  Fix pthread_join.

10 years agoam 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."
Christopher Ferris [Thu, 21 Nov 2013 16:09:59 +0000 (08:09 -0800)]
am 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."

* commit '750668f5abd9813bea6f33cb84d941ae306afea8':
  Pull in cleaned version.h header.

10 years agoam da12e64f: am be8344bb: Merge "Modify tests for another glibc difference."
Christopher Ferris [Thu, 21 Nov 2013 16:09:57 +0000 (08:09 -0800)]
am da12e64f: am be8344bb: Merge "Modify tests for another glibc difference."

* commit 'da12e64f1770deee4f5d0b4c41d5530a98b21073':
  Modify tests for another glibc difference.

10 years agoam 18368fc8: am f246c589: Merge "Clean up the pthread_create trampoline."
Elliott Hughes [Thu, 21 Nov 2013 16:09:46 +0000 (08:09 -0800)]
am 18368fc8: am f246c589: Merge "Clean up the pthread_create trampoline."

* commit '18368fc8e696c54adbd1537bf2d7c5c217210957':
  Clean up the pthread_create trampoline.

10 years agoam 862c32b4: am e39e3a77: Merge "Add new tests for memory/string routines."
Christopher Ferris [Thu, 21 Nov 2013 16:09:44 +0000 (08:09 -0800)]
am 862c32b4: am e39e3a77: Merge "Add new tests for memory/string routines."

* commit '862c32b4bd73f2348ebd9b1267e2880afcf3be1b':
  Add new tests for memory/string routines.

10 years agoam 5b524852: am 645d4269: Merge "Switch pthread_create over to __bionic_clone."
Elliott Hughes [Thu, 21 Nov 2013 16:09:43 +0000 (08:09 -0800)]
am 5b524852: am 645d4269: Merge "Switch pthread_create over to __bionic_clone."

* commit '5b5248526b0295e54f51dcc2fec6c1d8e5a3b9e2':
  Switch pthread_create over to __bionic_clone.

10 years agoRemove obsolete kernel/arch-mips headers.
Elliott Hughes [Thu, 21 Nov 2013 02:09:34 +0000 (18:09 -0800)]
Remove obsolete kernel/arch-mips headers.

Bug: 11559337
Change-Id: I70e205ff1f5acd07fddd7d82367e818b13847acd

10 years agoam ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."
Elliott Hughes [Thu, 21 Nov 2013 00:44:59 +0000 (16:44 -0800)]
am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."

* commit 'ca045a19234a9323ea0e7eccbe3aefd74f9c1bab':
  Switch to upstream sleep(3) and usleep(3).

10 years agoMerge "Switch to upstream sleep(3) and usleep(3)."
Elliott Hughes [Thu, 21 Nov 2013 00:41:30 +0000 (00:41 +0000)]
Merge "Switch to upstream sleep(3) and usleep(3)."

10 years agoSwitch to upstream sleep(3) and usleep(3).
Elliott Hughes [Thu, 21 Nov 2013 00:09:06 +0000 (16:09 -0800)]
Switch to upstream sleep(3) and usleep(3).

Also fix the signature of usleep, and the definition of useconds_t which
should be unsigned, as the 'u' in its name implies.

This patch also cleans up the existing FreeBSD hacks by moving the libm
stuff from <sys/cdefs.h> to a libm-private header, and adding comments
about the hacks we use to build FreeBSD source.

Change-Id: Ibe5067a380502df94a0a3a7901969b35411085b6

10 years agoam 39bc7ecd: Merge "Fix <signal.h> for mips uapi."
Elliott Hughes [Wed, 20 Nov 2013 20:57:19 +0000 (12:57 -0800)]
am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."

* commit '39bc7ecd45700e9edac0b29d33cc211383ebb107':
  Fix <signal.h> for mips uapi.

10 years agoMerge "Fix <signal.h> for mips uapi."
Elliott Hughes [Wed, 20 Nov 2013 20:54:03 +0000 (20:54 +0000)]
Merge "Fix <signal.h> for mips uapi."

10 years agoFix <signal.h> for mips uapi.
Elliott Hughes [Wed, 20 Nov 2013 20:51:52 +0000 (12:51 -0800)]
Fix <signal.h> for mips uapi.

Bug: 11559337
Change-Id: I4c6080f162d74ee78c81d698c7b50470b0e09586

10 years agoam db1dec1e: Merge "Clean up pthread_internal_t."
Elliott Hughes [Wed, 20 Nov 2013 01:25:54 +0000 (17:25 -0800)]
am db1dec1e: Merge "Clean up pthread_internal_t."

* commit 'db1dec1ed4fac8bdb312a53e63ba8afeb3c9dea3':
  Clean up pthread_internal_t.

10 years agoMerge "Clean up pthread_internal_t."
Elliott Hughes [Wed, 20 Nov 2013 01:23:33 +0000 (01:23 +0000)]
Merge "Clean up pthread_internal_t."

10 years agoClean up pthread_internal_t.
Elliott Hughes [Wed, 20 Nov 2013 00:52:24 +0000 (16:52 -0800)]
Clean up pthread_internal_t.

Bug: 11755300
Change-Id: Ib509e8c5ec6b23513aa78b5ac5141d7c34ce2dc8

10 years agoRemove the unused arch-x86 and arch-x86-64 kernel headers.
Elliott Hughes [Wed, 20 Nov 2013 00:56:55 +0000 (16:56 -0800)]
Remove the unused arch-x86 and arch-x86-64 kernel headers.

x86-64 already used uapi headers, and x86 can too now.

Bug: 11559337
Change-Id: I1196d2500f06ad40f2488b96fc8ccc7e02c7d5c0