OSDN Git Service
The Android Automerger [Mon, 18 Nov 2013 15:50:37 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Elliott Hughes [Fri, 15 Nov 2013 01:09:48 +0000 (17:09 -0800)]
am
04b4339a: am
60a67a0c: am
05ec00bf: Merge "[MIPS] Reimplement syscall to invoke the system call directly"
* commit '
04b4339ad5396690329877df10fbe568bd4dd600':
[MIPS] Reimplement syscall to invoke the system call directly
Elliott Hughes [Fri, 15 Nov 2013 01:07:13 +0000 (17:07 -0800)]
am
60a67a0c: am
05ec00bf: Merge "[MIPS] Reimplement syscall to invoke the system call directly"
* commit '
60a67a0c7e44dfc47b9b4271ea4ae2dbf336849a':
[MIPS] Reimplement syscall to invoke the system call directly
Elliott Hughes [Fri, 15 Nov 2013 01:05:10 +0000 (17:05 -0800)]
am
05ec00bf: Merge "[MIPS] Reimplement syscall to invoke the system call directly"
* commit '
05ec00bf62ac168c9787a3d0640879ab3e502fe5':
[MIPS] Reimplement syscall to invoke the system call directly
Elliott Hughes [Fri, 15 Nov 2013 01:01:06 +0000 (01:01 +0000)]
Merge "[MIPS] Reimplement syscall to invoke the system call directly"
Chris Dearman [Wed, 13 Nov 2013 22:15:31 +0000 (14:15 -0800)]
[MIPS] Reimplement syscall to invoke the system call directly
Some MIPS kernels do not correctly restart interrupted system calls that
have been invoked using the indirect syscall (NR_syscall).
The simplest workaround is to handle the indirection in userland and then
call the required system call directly.
Change-Id: I8385399621529db9a52b463c96925f6decaaca30
Elliott Hughes [Thu, 14 Nov 2013 02:47:59 +0000 (18:47 -0800)]
am
1b782289: am
5a70acd1: am
ae5c3dd7: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
* commit '
1b782289f4f89434693e3e906df9c9cf43b4d277':
Remove the mips regdef.h and fpregdef.h old kernel headers.
Elliott Hughes [Thu, 14 Nov 2013 02:44:12 +0000 (18:44 -0800)]
am
ab894977: am
3cc7da48: am
c4250430: Merge "Add unit tests for pow\'s behavior with NaNs."
* commit '
ab894977da4e7519aa5c69b38817ee54ae8fd519':
Add unit tests for pow's behavior with NaNs.
Elliott Hughes [Thu, 14 Nov 2013 00:28:37 +0000 (16:28 -0800)]
am
5a70acd1: am
ae5c3dd7: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
* commit '
5a70acd176a792868a61c94169d5e6c0679202f2':
Remove the mips regdef.h and fpregdef.h old kernel headers.
Elliott Hughes [Thu, 14 Nov 2013 00:24:33 +0000 (16:24 -0800)]
am
ae5c3dd7: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
* commit '
ae5c3dd73844e6a9e1a14dbf893eab5142902f18':
Remove the mips regdef.h and fpregdef.h old kernel headers.
Elliott Hughes [Thu, 14 Nov 2013 00:18:58 +0000 (00:18 +0000)]
Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
Elliott Hughes [Thu, 14 Nov 2013 00:13:01 +0000 (16:13 -0800)]
Remove the mips regdef.h and fpregdef.h old kernel headers.
Bug:
11559337
Change-Id: I6352cac9c4ef425cb21e34d0299223711ec079af
Elliott Hughes [Wed, 13 Nov 2013 23:05:43 +0000 (15:05 -0800)]
am
3cc7da48: am
c4250430: Merge "Add unit tests for pow\'s behavior with NaNs."
* commit '
3cc7da4838ea5896ff142f447ecb03f62d3e70e6':
Add unit tests for pow's behavior with NaNs.
Elliott Hughes [Wed, 13 Nov 2013 23:01:31 +0000 (15:01 -0800)]
am
c4250430: Merge "Add unit tests for pow\'s behavior with NaNs."
* commit '
c425043063eae2fa3e8622bf77ef1ab3a805f156':
Add unit tests for pow's behavior with NaNs.
Elliott Hughes [Wed, 13 Nov 2013 22:57:36 +0000 (22:57 +0000)]
Merge "Add unit tests for pow's behavior with NaNs."
Elliott Hughes [Wed, 13 Nov 2013 21:42:53 +0000 (13:42 -0800)]
am
60101963: am
e77538d5: am
44cbe94b: Merge "Add a unit test for syscall(2)."
* commit '
6010196355959f1a5d34100aa3d44073f291e886':
Add a unit test for syscall(2).
Elliott Hughes [Wed, 13 Nov 2013 21:37:18 +0000 (13:37 -0800)]
am
e77538d5: am
44cbe94b: Merge "Add a unit test for syscall(2)."
* commit '
e77538d570e8a811b09bdcd3c746471d8f74b3de':
Add a unit test for syscall(2).
Elliott Hughes [Wed, 13 Nov 2013 21:33:12 +0000 (13:33 -0800)]
am
44cbe94b: Merge "Add a unit test for syscall(2)."
* commit '
44cbe94bba2e7e4b1369c86b11d66d6b60f0e333':
Add a unit test for syscall(2).
Elliott Hughes [Wed, 13 Nov 2013 21:29:23 +0000 (13:29 -0800)]
Add unit tests for pow's behavior with NaNs.
Bug:
11669804
Change-Id: Idfa6527640c8d0c2cf3e5343bf7afe013e237545
Elliott Hughes [Wed, 13 Nov 2013 21:29:05 +0000 (21:29 +0000)]
Merge "Add a unit test for syscall(2)."
Elliott Hughes [Wed, 13 Nov 2013 21:14:31 +0000 (13:14 -0800)]
Add a unit test for syscall(2).
Change-Id: Ic7d9735d46711af93c3a1747de7b2eb8cebea094
The Android Automerger [Tue, 12 Nov 2013 15:49:31 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Elliott Hughes [Tue, 12 Nov 2013 04:52:09 +0000 (20:52 -0800)]
am
3cf6d998: am
6a7e539c: am
22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."
* commit '
3cf6d9983c534dd6dae0b3e805a6cdadad910aa8':
Add extra regression tests for an already-fixed dynamic linker bug.
Elliott Hughes [Tue, 12 Nov 2013 01:06:27 +0000 (17:06 -0800)]
am
6a7e539c: am
22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."
* commit '
6a7e539cf1d8ee49fc2b6a11d043ce7962aa2de4':
Add extra regression tests for an already-fixed dynamic linker bug.
Elliott Hughes [Tue, 12 Nov 2013 01:04:28 +0000 (17:04 -0800)]
am
22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."
* commit '
22ba86ee44867c2d16973fc2f8da3b0f5b58cc5e':
Add extra regression tests for an already-fixed dynamic linker bug.
Elliott Hughes [Tue, 12 Nov 2013 01:01:24 +0000 (01:01 +0000)]
Merge "Add extra regression tests for an already-fixed dynamic linker bug."
Elliott Hughes [Mon, 11 Nov 2013 23:48:06 +0000 (15:48 -0800)]
Add extra regression tests for an already-fixed dynamic linker bug.
Bug: https://code.google.com/p/android/issues/detail?id=61799
Change-Id: I84af68f8430a06e999297c2e57e06ecb45adf81e
The Android Automerger [Mon, 11 Nov 2013 15:50:03 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Elliott Hughes [Sat, 9 Nov 2013 00:03:52 +0000 (16:03 -0800)]
am
5c56512e: am
cdd6fdec: am
6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
* commit '
5c56512eebc14558a2b3b83cdca09f04084d609c':
Add a temporary uapi/linux/compiler.h until upstream has one.
Elliott Hughes [Sat, 9 Nov 2013 00:03:51 +0000 (16:03 -0800)]
am
e9664fea: am
5b6290bc: am
ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
* commit '
e9664fea54d21f765c906006db27b8e275c4a198':
Remove the dependency on the non-uapi __kernel_nlink_t.
Elliott Hughes [Fri, 8 Nov 2013 23:25:38 +0000 (15:25 -0800)]
am
cdd6fdec: am
6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
* commit '
cdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869':
Add a temporary uapi/linux/compiler.h until upstream has one.
Elliott Hughes [Fri, 8 Nov 2013 23:22:43 +0000 (15:22 -0800)]
am
6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
* commit '
6768c1ee510a8e93175b54e93cb583f009766eed':
Add a temporary uapi/linux/compiler.h until upstream has one.
Elliott Hughes [Fri, 8 Nov 2013 23:20:18 +0000 (23:20 +0000)]
Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
Elliott Hughes [Fri, 8 Nov 2013 23:17:19 +0000 (15:17 -0800)]
am
5b6290bc: am
ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
* commit '
5b6290bcfb47ffb27a66450c9cc3258021e259fa':
Remove the dependency on the non-uapi __kernel_nlink_t.
Elliott Hughes [Fri, 8 Nov 2013 23:15:18 +0000 (15:15 -0800)]
am
ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
* commit '
ff5b0fc8f3406c98561e17bd2a6c5433e192f5be':
Remove the dependency on the non-uapi __kernel_nlink_t.
Elliott Hughes [Fri, 8 Nov 2013 23:13:54 +0000 (15:13 -0800)]
Add a temporary uapi/linux/compiler.h until upstream has one.
Bug:
11559337
Change-Id: I205974b1a26e4f85d0e11503afa80669195d211c
Elliott Hughes [Fri, 8 Nov 2013 23:12:35 +0000 (23:12 +0000)]
Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
Elliott Hughes [Fri, 8 Nov 2013 22:38:12 +0000 (14:38 -0800)]
Remove the dependency on the non-uapi __kernel_nlink_t.
The kernel doesn't have an nlink_t; it just uses the equivalent of
uint32_t. We already had a usable __nlink_t in the C library, so
let's just define our nlink_t in terms of __nlink_t, which is what
__nlink_t was meant for anyway.
Note that our struct stat just follows the kernel, and doesn't refer
to nlink_t anyway.
Change-Id: I2a56e418e42404b1741b08c50554b03c11caebae
Elliott Hughes [Fri, 8 Nov 2013 22:28:57 +0000 (14:28 -0800)]
am
26d8853a: am
cac7eec5: am
68723453: Merge "Generate the uapi headers for mips and x86/x86_64."
* commit '
26d8853ab5d3c42654a90bf31e54bb851f3b083c':
Generate the uapi headers for mips and x86/x86_64.
Elliott Hughes [Fri, 8 Nov 2013 22:23:38 +0000 (14:23 -0800)]
am
cac7eec5: am
68723453: Merge "Generate the uapi headers for mips and x86/x86_64."
* commit '
cac7eec55a4853abfcd5b8d7bce35d79ab330132':
Generate the uapi headers for mips and x86/x86_64.
Elliott Hughes [Fri, 8 Nov 2013 22:20:59 +0000 (14:20 -0800)]
am
68723453: Merge "Generate the uapi headers for mips and x86/x86_64."
* commit '
68723453ac920004fcba2a820c2d56919a5b7081':
Generate the uapi headers for mips and x86/x86_64.
Elliott Hughes [Fri, 8 Nov 2013 22:18:46 +0000 (22:18 +0000)]
Merge "Generate the uapi headers for mips and x86/x86_64."
Elliott Hughes [Fri, 8 Nov 2013 19:45:48 +0000 (11:45 -0800)]
Generate the uapi headers for mips and x86/x86_64.
Bug:
11559337
Change-Id: I23b1a43e7bfa8fa6f9df7e59d2e731a0ec52dafc
Elliott Hughes [Thu, 7 Nov 2013 23:13:24 +0000 (15:13 -0800)]
am
b92de381: am
99a38fcf: am
486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."
* commit '
b92de38170e3d3aeb2b05449909fb76c96954062':
Prepare to switch to the uapi <linux/signal.h>.
Elliott Hughes [Thu, 7 Nov 2013 23:12:59 +0000 (15:12 -0800)]
am
81c24a1a: am
c9c84992: am
266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."
* commit '
81c24a1a49ada6fa86ea51070a6202fce7036f36':
Stop using the non-uapi <linux/err.h> header file.
Elliott Hughes [Thu, 7 Nov 2013 20:45:33 +0000 (12:45 -0800)]
am
99a38fcf: am
486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."
* commit '
99a38fcf33d220524e41979a3f9d842399fd638d':
Prepare to switch to the uapi <linux/signal.h>.
Elliott Hughes [Thu, 7 Nov 2013 20:43:22 +0000 (12:43 -0800)]
am
486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."
* commit '
486c8616ac030b14d37d364a0ed541c4c6c90716':
Prepare to switch to the uapi <linux/signal.h>.
Elliott Hughes [Thu, 7 Nov 2013 20:41:19 +0000 (20:41 +0000)]
Merge "Prepare to switch to the uapi <linux/signal.h>."
Elliott Hughes [Thu, 7 Nov 2013 20:28:46 +0000 (12:28 -0800)]
Prepare to switch to the uapi <linux/signal.h>.
<time.h> didn't need to copy the cruft from <signal.h>, and
<signal.h> only needs the uid_t hack when it's not using
uapi headers.
pthread_exit.cpp should include what it uses.
Change-Id: I836c36abe0f0a781d41fc425b249d1c7686bb124
Elliott Hughes [Thu, 7 Nov 2013 18:48:29 +0000 (10:48 -0800)]
am
c9c84992: am
266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."
* commit '
c9c84992fb9ccbf32580c93967356383f58d9687':
Stop using the non-uapi <linux/err.h> header file.
Elliott Hughes [Thu, 7 Nov 2013 18:46:37 +0000 (10:46 -0800)]
am
266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."
* commit '
266eb4a44c4cdd9502980511ff2846fde5c66454':
Stop using the non-uapi <linux/err.h> header file.
Elliott Hughes [Thu, 7 Nov 2013 18:44:49 +0000 (18:44 +0000)]
Merge "Stop using the non-uapi <linux/err.h> header file."
Elliott Hughes [Thu, 7 Nov 2013 18:31:05 +0000 (10:31 -0800)]
Stop using the non-uapi <linux/err.h> header file.
We only need it for MAX_ERRNO, and it's time we had somewhere to put
the little assembler utility macros we've been putting off writing.
Change-Id: I9354d2e0dc47c689296a34b5b229fc9ba75f1a83
The Android Automerger [Thu, 7 Nov 2013 15:49:37 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Rom Lemarchand [Thu, 7 Nov 2013 13:29:56 +0000 (13:29 +0000)]
Merge "Refresh libc/kernel/common/linux/ion.h"
Elliott Hughes [Thu, 7 Nov 2013 01:42:14 +0000 (17:42 -0800)]
am
2a6e1306: am
6fc4a1cd: am
a034e1d3: Merge "Remove pathconf\'s dependencies on non-uapi header files."
* commit '
2a6e13064fe73c22c162a9bf1cf257d0246afbf5':
Remove pathconf's dependencies on non-uapi header files.
Elliott Hughes [Thu, 7 Nov 2013 01:38:12 +0000 (17:38 -0800)]
am
6fc4a1cd: am
a034e1d3: Merge "Remove pathconf\'s dependencies on non-uapi header files."
* commit '
6fc4a1cd3aecca409766e82d333f9cb127a85593':
Remove pathconf's dependencies on non-uapi header files.
Elliott Hughes [Thu, 7 Nov 2013 01:35:36 +0000 (17:35 -0800)]
am
a034e1d3: Merge "Remove pathconf\'s dependencies on non-uapi header files."
* commit '
a034e1d3e06207f079e814101bb3bce1924264e0':
Remove pathconf's dependencies on non-uapi header files.
Elliott Hughes [Thu, 7 Nov 2013 01:32:27 +0000 (01:32 +0000)]
Merge "Remove pathconf's dependencies on non-uapi header files."
Elliott Hughes [Thu, 7 Nov 2013 01:23:54 +0000 (17:23 -0800)]
am
07ddeb09: am
dc9b54c1: am
f945732e: Merge "Fix a TODO; we\'ve had SOCK_CLOEXEC for a while now."
* commit '
07ddeb09017a043f7dd74980124670f99d003c22':
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
Elliott Hughes [Thu, 7 Nov 2013 01:21:35 +0000 (17:21 -0800)]
am
dc9b54c1: am
f945732e: Merge "Fix a TODO; we\'ve had SOCK_CLOEXEC for a while now."
* commit '
dc9b54c11c3b20fe5d1dc5c591ff058788e7b376':
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
Elliott Hughes [Thu, 7 Nov 2013 01:21:09 +0000 (17:21 -0800)]
Remove pathconf's dependencies on non-uapi header files.
Change-Id: I597996e4b141b009916f7ad2866dd100e08aa4d3
Elliott Hughes [Thu, 7 Nov 2013 01:19:30 +0000 (17:19 -0800)]
am
f945732e: Merge "Fix a TODO; we\'ve had SOCK_CLOEXEC for a while now."
* commit '
f945732e21e3c1291943d21fa5fee0c43792bbec':
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
Elliott Hughes [Thu, 7 Nov 2013 01:16:47 +0000 (01:16 +0000)]
Merge "Fix a TODO; we've had SOCK_CLOEXEC for a while now."
Elliott Hughes [Thu, 7 Nov 2013 01:10:44 +0000 (17:10 -0800)]
am
a4e281a5: am
76833a7c: am
9e63e03d: Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
* commit '
a4e281a549adb6a1ed9669bf609e088c8f8a9bd0':
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
Elliott Hughes [Thu, 7 Nov 2013 01:07:35 +0000 (17:07 -0800)]
am
76833a7c: am
9e63e03d: Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
* commit '
76833a7c575ca372b41cb6e2a964918d69fc0dbe':
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
Elliott Hughes [Thu, 7 Nov 2013 01:05:46 +0000 (17:05 -0800)]
am
9e63e03d: Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
* commit '
9e63e03d34fc0b4d87cff047a4bc55f8ebc5e12a':
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
Elliott Hughes [Thu, 7 Nov 2013 01:04:56 +0000 (17:04 -0800)]
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
Change-Id: I4bc39b57f3c33441ead74127f576bf5a4e311566
Elliott Hughes [Thu, 7 Nov 2013 01:02:54 +0000 (01:02 +0000)]
Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
Elliott Hughes [Thu, 7 Nov 2013 00:20:54 +0000 (16:20 -0800)]
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
In practice, thanks to all the registers the stubs don't actually change,
but it's confusing to have an incorrect declaration.
I suspect that fcntl remains broken for aarch64; it happens to work for
x86_64 because the first vararg argument gets placed in the right register
anyway, but I have no reason to believe that's true for aarch64.
This patch adds a unit test, though, so we'll be able to tell when we get
as far as running the unit tests.
Change-Id: I58dd0054fe99d7d51d04c22781d8965dff1afbf3
Ben Cheng [Thu, 7 Nov 2013 00:15:46 +0000 (16:15 -0800)]
am
64aca718: am
99205dc9: am
af10f9e9: Merge "Add processed uapi kernel headers for ARM."
* commit '
64aca718ee0b2fceec37f0f0cd41c0323d834b3d':
Add processed uapi kernel headers for ARM.
Elliott Hughes [Thu, 7 Nov 2013 00:15:45 +0000 (16:15 -0800)]
am
c606294b: am
3721a7e7: am
7115c802: Merge "Fix pread/pwrite for LP64."
* commit '
c606294b9397930a18d9c153186b77ece819588c':
Fix pread/pwrite for LP64.
Elliott Hughes [Thu, 7 Nov 2013 00:15:44 +0000 (16:15 -0800)]
am
a047e0ab: am
afc51b92: am
c4dbc16e: Merge "Make cpp.py less braindead."
* commit '
a047e0ab516551430cf2fc19f12703d48b9d60f3':
Make cpp.py less braindead.
Ben Cheng [Thu, 7 Nov 2013 00:10:15 +0000 (16:10 -0800)]
am
99205dc9: am
af10f9e9: Merge "Add processed uapi kernel headers for ARM."
* commit '
99205dc987735e1d57f2e1b8446448f655808ab5':
Add processed uapi kernel headers for ARM.
Elliott Hughes [Thu, 7 Nov 2013 00:10:14 +0000 (16:10 -0800)]
am
3721a7e7: am
7115c802: Merge "Fix pread/pwrite for LP64."
* commit '
3721a7e71fc831f6d58b7253627043d0658ad977':
Fix pread/pwrite for LP64.
Elliott Hughes [Thu, 7 Nov 2013 00:10:12 +0000 (16:10 -0800)]
am
afc51b92: am
c4dbc16e: Merge "Make cpp.py less braindead."
* commit '
afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
Make cpp.py less braindead.
Ben Cheng [Wed, 6 Nov 2013 23:58:39 +0000 (15:58 -0800)]
am
af10f9e9: Merge "Add processed uapi kernel headers for ARM."
* commit '
af10f9e927ed22c8bccc80919e10df4d5f4aecdd':
Add processed uapi kernel headers for ARM.
Ben Cheng [Wed, 6 Nov 2013 23:55:25 +0000 (23:55 +0000)]
Merge "Add processed uapi kernel headers for ARM."
Ben Cheng [Wed, 6 Nov 2013 23:51:05 +0000 (15:51 -0800)]
Add processed uapi kernel headers for ARM.
Change-Id: Id34de841b7b4b5a1bf7d22eb793860f92f24a6e5
Elliott Hughes [Wed, 6 Nov 2013 22:26:58 +0000 (14:26 -0800)]
am
7115c802: Merge "Fix pread/pwrite for LP64."
* commit '
7115c80231aa88272294076c8775c09727ece85a':
Fix pread/pwrite for LP64.
Elliott Hughes [Wed, 6 Nov 2013 22:25:17 +0000 (22:25 +0000)]
Merge "Fix pread/pwrite for LP64."
Elliott Hughes [Wed, 6 Nov 2013 21:10:37 +0000 (13:10 -0800)]
Fix pread/pwrite for LP64.
Unlike on 32-bit systems where off_t is 32-bit, we don't want to
throw away the top 32 bits of an LP64 system's 64-bit off_t.
Change-Id: Ib2e0daeb4fc0b8ab3d1b983d0b371d8f81033b50
Elliott Hughes [Wed, 6 Nov 2013 20:34:22 +0000 (12:34 -0800)]
am
c4dbc16e: Merge "Make cpp.py less braindead."
* commit '
c4dbc16eb03bcc0a3ea04cd32ce7551ad94b2bfc':
Make cpp.py less braindead.
Elliott Hughes [Wed, 6 Nov 2013 20:31:09 +0000 (20:31 +0000)]
Merge "Make cpp.py less braindead."
Elliott Hughes [Tue, 5 Nov 2013 22:54:29 +0000 (14:54 -0800)]
Make cpp.py less braindead.
The old code ignored operator precedence (!), despite having two tables
of operator precedence. The code's still pretty awful, but I've cleaned
it up enough to fix this, the most important bug.
This patch lets us correctly clean the uapi unistd.h, stat.h, and swab.h files,
and also fixes the mess we were already making of various old kernel
header files. I've added a bunch more tests, fixed the existing tests that
the existing script was already failing (!), and changed the script so that
the tests are run every time the script is run.
We can probably remove some of the old kernel header files that we were
parsing incorrectly, but we can worry about that later.
Bug:
11253477
Change-Id: Ie66c65b3a7ae13b4e98ed8038a6a534f06eae0e5
Rom Lemarchand [Mon, 21 Oct 2013 22:18:40 +0000 (15:18 -0700)]
Refresh libc/kernel/common/linux/ion.h
Change-Id: Ibd2bf99224b31bbad7b3a9b0d82bfef19162db7b
The Android Automerger [Wed, 6 Nov 2013 15:49:59 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Elliott Hughes [Tue, 5 Nov 2013 22:24:21 +0000 (14:24 -0800)]
am
c76ba85e: am
ffe06880: am
f1258672: Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
* commit '
c76ba85e166fa98baf44102894471c483f134c17':
Fix <sys/select.h> for LP64, clean up <time.h>.
Elliott Hughes [Tue, 5 Nov 2013 22:22:24 +0000 (14:22 -0800)]
am
a0352c60: am
3c5d651c: am
9b9f0d0c: Merge "Remove unnecessary #include."
* commit '
a0352c60ec72b2fbd9d7a9a1685ec893bf9014aa':
Remove unnecessary #include.
Elliott Hughes [Tue, 5 Nov 2013 22:01:49 +0000 (14:01 -0800)]
am
ffe06880: am
f1258672: Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
* commit '
ffe068808909c9825807dbaf8679b9f9efc2c690':
Fix <sys/select.h> for LP64, clean up <time.h>.
Elliott Hughes [Tue, 5 Nov 2013 21:58:18 +0000 (13:58 -0800)]
am
f1258672: Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
* commit '
f1258672d1eed41da30612a70690c19ff1966b73':
Fix <sys/select.h> for LP64, clean up <time.h>.
Elliott Hughes [Tue, 5 Nov 2013 21:54:38 +0000 (21:54 +0000)]
Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
Elliott Hughes [Tue, 5 Nov 2013 21:28:36 +0000 (13:28 -0800)]
Fix <sys/select.h> for LP64, clean up <time.h>.
The 64-bit uapi headers don't define FD_CLR and friends, so this
patch updates libc/kernel/common/linux/time.h after the change
b934bbec145e9e084bf48149a3a94ae3dd132157 in external/kernel-headers,
then fixes <sys/select.h> to work in this new world, and removes
some now-unnecessary duplication from <time.h> (with other cruft
cleaned up while I'm here).
Change-Id: Ifd26f901b4d200c65065b3e6ef1b74055127e052
Elliott Hughes [Tue, 5 Nov 2013 20:06:58 +0000 (12:06 -0800)]
am
3c5d651c: am
9b9f0d0c: Merge "Remove unnecessary #include."
* commit '
3c5d651c051e56e7fb48214e334600cd3f361460':
Remove unnecessary #include.
Elliott Hughes [Tue, 5 Nov 2013 20:04:34 +0000 (12:04 -0800)]
am
9b9f0d0c: Merge "Remove unnecessary #include."
* commit '
9b9f0d0cd05b5249e4b8119a8bd12ec17712b9da':
Remove unnecessary #include.
Elliott Hughes [Tue, 5 Nov 2013 20:00:29 +0000 (20:00 +0000)]
Merge "Remove unnecessary #include."
Elliott Hughes [Tue, 5 Nov 2013 19:59:06 +0000 (11:59 -0800)]
Remove unnecessary #include.
Change-Id: I99dade0b3803272ee29eba2ad36b0311f8a24c31
The Android Automerger [Mon, 4 Nov 2013 15:49:54 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Elliott Hughes [Thu, 31 Oct 2013 23:09:42 +0000 (16:09 -0700)]
am
748ad3d3: am
00889af0: am
943cc1b5: Merge "Refresh libc/kernel/common/linux/uinput.h"
* commit '
748ad3d3f514707a596b7ede59f1f4788832d3f5':
Refresh libc/kernel/common/linux/uinput.h
Elliott Hughes [Thu, 31 Oct 2013 23:07:39 +0000 (16:07 -0700)]
am
00889af0: am
943cc1b5: Merge "Refresh libc/kernel/common/linux/uinput.h"
* commit '
00889af038359e0a7e97384bad25a809e8887857':
Refresh libc/kernel/common/linux/uinput.h