OSDN Git Service
Elliott Hughes [Mon, 6 Jan 2014 20:41:36 +0000 (12:41 -0800)]
am
b235f8c8: Merge "Fix dev_t (for LP64)."
* commit '
b235f8c8773c08569a97b0ff7e4c709b216c8478':
Fix dev_t (for LP64).
Elliott Hughes [Mon, 6 Jan 2014 20:38:17 +0000 (12:38 -0800)]
am
8c8852f1: Merge "Add TCPOPT_* constants."
* commit '
8c8852f163c1263e539ba64a41f1389fa487377a':
Add TCPOPT_* constants.
Elliott Hughes [Mon, 6 Jan 2014 20:37:02 +0000 (20:37 +0000)]
Merge "Fix dev_t (for LP64)."
Elliott Hughes [Mon, 6 Jan 2014 20:34:17 +0000 (20:34 +0000)]
Merge "Add TCPOPT_* constants."
Elliott Hughes [Fri, 3 Jan 2014 23:58:40 +0000 (15:58 -0800)]
Add TCPOPT_* constants.
Adds the TCPOPT_* constants from NetBSD. Note that the BSDs also have
TCPOPT_SIGNATURE, but Linux calls that TCPOPT_MD5SIG and glibc doesn't
have any corresponding constant yet, so let's wait until we see which name
wins out.
Change-Id: If53cdada5595285d9a7e7248ef74cd7502d804c0
Elliott Hughes [Fri, 3 Jan 2014 22:49:37 +0000 (14:49 -0800)]
Fix dev_t (for LP64).
32-bit Android's dev_t was wrong too. We can't fix that without ABI breakage,
but we can at least fix 64-bit Android. And add tests.
Bug: https://code.google.com/p/android/issues/detail?id=54966
Change-Id: Ie2e42cc042b78b669a1a44e55f959dbd9c52c5c9
Elliott Hughes [Fri, 3 Jan 2014 22:41:50 +0000 (14:41 -0800)]
am
c1c3f7d4: Merge "Remove as many hard-coded constants from the MIPS vfork.S as possible."
* commit '
c1c3f7d4468f02adbf8ced689d738386e42af773':
Remove as many hard-coded constants from the MIPS vfork.S as possible.
Elliott Hughes [Fri, 3 Jan 2014 22:36:53 +0000 (22:36 +0000)]
Merge "Remove as many hard-coded constants from the MIPS vfork.S as possible."
Elliott Hughes [Thu, 2 Jan 2014 23:41:33 +0000 (15:41 -0800)]
Remove as many hard-coded constants from the MIPS vfork.S as possible.
We could do better, but not without MIPS cleaning up their kernel headers.
Change-Id: Ib4d4ce5d720ce8ca27a3f9a1ae07a9a277675af9
Elliott Hughes [Fri, 3 Jan 2014 00:30:24 +0000 (16:30 -0800)]
am
3b36564b: Merge "Use the MAX_ERRNO constant."
* commit '
3b36564b18d83ec313fd2aa6d7f38576dea3f6b8':
Use the MAX_ERRNO constant.
Elliott Hughes [Fri, 3 Jan 2014 00:24:45 +0000 (00:24 +0000)]
Merge "Use the MAX_ERRNO constant."
Elliott Hughes [Fri, 3 Jan 2014 00:23:24 +0000 (16:23 -0800)]
Use the MAX_ERRNO constant.
If you're going to hardcode a constant, you could at least try to
get the constant right...
Change-Id: I886a2593357d1c4dfd6c42649c63e8a35c15a441
Elliott Hughes [Thu, 2 Jan 2014 22:21:46 +0000 (14:21 -0800)]
am
66d16619: Merge "Remove a hardcoded constant from aarch64\'s vfork."
* commit '
66d166192e6b0e1091550e9f584e92521e375df7':
Remove a hardcoded constant from aarch64's vfork.
Elliott Hughes [Thu, 2 Jan 2014 22:18:36 +0000 (22:18 +0000)]
Merge "Remove a hardcoded constant from aarch64's vfork."
Elliott Hughes [Thu, 2 Jan 2014 22:17:30 +0000 (14:17 -0800)]
Remove a hardcoded constant from aarch64's vfork.
Change-Id: Ifc09ca066c32988b8cc9db9e808b9ef4c4d2bfcb
Elliott Hughes [Thu, 2 Jan 2014 21:50:41 +0000 (13:50 -0800)]
am
7b0c23f1: Merge "Clean up <sched.h>."
* commit '
7b0c23f1ac5df8654e0790b9eb3bbfcbf36c0e5f':
Clean up <sched.h>.
Elliott Hughes [Thu, 2 Jan 2014 21:46:53 +0000 (21:46 +0000)]
Merge "Clean up <sched.h>."
Elliott Hughes [Thu, 2 Jan 2014 20:05:50 +0000 (12:05 -0800)]
Clean up <sched.h>.
This patch switches to using the uapi constants. It also adds the missing
setns system call, fixes sched_getcpu's error behavior, and fixes the
gensyscalls script now ARM is uapi-only too.
Change-Id: I8e16b1693d6d32cd9b8499e46b5d8b0a50bc4f1d
Elliott Hughes [Sun, 22 Dec 2013 20:06:52 +0000 (12:06 -0800)]
am
17c9fe7d: Merge "Fix MIPS build."
* commit '
17c9fe7d2f396294a09344a253b2a16ae400df14':
Fix MIPS build.
Elliott Hughes [Sun, 22 Dec 2013 20:03:07 +0000 (20:03 +0000)]
Merge "Fix MIPS build."
Elliott Hughes [Sun, 22 Dec 2013 20:02:32 +0000 (12:02 -0800)]
Fix MIPS build.
Change-Id: I175f427e355fca9a5a3f4e4379d7fcd1f7f6a22d
Elliott Hughes [Sun, 22 Dec 2013 19:44:52 +0000 (11:44 -0800)]
am
3b2f4142: Merge "Improve dynamic linker diagnostics for internal errors."
* commit '
3b2f4142aa4f2892ecbea89a256b4f5fc94e777a':
Improve dynamic linker diagnostics for internal errors.
Elliott Hughes [Sun, 22 Dec 2013 19:40:10 +0000 (11:40 -0800)]
am
47033433: Merge "Remove the bogus exit status from _exit_with_stack_teardown."
* commit '
470334333e2ad5119b72bb830c51c32852a77c6c':
Remove the bogus exit status from _exit_with_stack_teardown.
Elliott Hughes [Sun, 22 Dec 2013 19:39:41 +0000 (19:39 +0000)]
Merge "Improve dynamic linker diagnostics for internal errors."
Elliott Hughes [Sun, 22 Dec 2013 00:07:45 +0000 (16:07 -0800)]
Improve dynamic linker diagnostics for internal errors.
If the linker can't resolve its own internal references to symbols,
we currently exit silently (albeit with EXIT_FAILURE). Not very helpful.
Change-Id: I1614fc970dee4560b38832ede1987b65a8e53a1e
Elliott Hughes [Sun, 22 Dec 2013 19:36:55 +0000 (19:36 +0000)]
Merge "Remove the bogus exit status from _exit_with_stack_teardown."
Elliott Hughes [Sat, 21 Dec 2013 23:30:49 +0000 (15:30 -0800)]
Remove the bogus exit status from _exit_with_stack_teardown.
It should always be 0, and there's no reason to pass a constant in as
an argument.
Change-Id: I92ac59b718a18e298bd7c52821af447f9181ca2a
Elliott Hughes [Sat, 21 Dec 2013 02:51:56 +0000 (18:51 -0800)]
am
6d929061: Merge "Fix MIPS build."
* commit '
6d929061c36e7929c61c8e6331315b86fe86976f':
Fix MIPS build.
Elliott Hughes [Sat, 21 Dec 2013 02:47:01 +0000 (02:47 +0000)]
Merge "Fix MIPS build."
Elliott Hughes [Sat, 21 Dec 2013 02:46:14 +0000 (18:46 -0800)]
Fix MIPS build.
Change-Id: Idd3bcda1803fd16b728a352d325bb070aed8fd94
Elliott Hughes [Sat, 21 Dec 2013 02:29:41 +0000 (18:29 -0800)]
am
3fdb7355: Merge "Avoid sign extension in 32-bit mmap."
* commit '
3fdb735590ed642420608dd7095c06de89d852b5':
Avoid sign extension in 32-bit mmap.
Elliott Hughes [Sat, 21 Dec 2013 02:26:21 +0000 (18:26 -0800)]
am
434f97f6: Merge "Remove some old kernel header cruft not needed with uapi."
* commit '
434f97f66aa64cd082f3f62fdd6422cad3132706':
Remove some old kernel header cruft not needed with uapi.
Elliott Hughes [Sat, 21 Dec 2013 02:23:35 +0000 (02:23 +0000)]
Merge "Avoid sign extension in 32-bit mmap."
Elliott Hughes [Sat, 21 Dec 2013 02:21:13 +0000 (02:21 +0000)]
Merge "Remove some old kernel header cruft not needed with uapi."
Elliott Hughes [Sat, 21 Dec 2013 02:17:34 +0000 (18:17 -0800)]
Avoid sign extension in 32-bit mmap.
Change-Id: I2a77925f62f381a0b34648c3db8154a55dd80c46
Elliott Hughes [Sat, 21 Dec 2013 01:26:47 +0000 (17:26 -0800)]
am
22323f91: Merge "Fix aarch64 futex assembly routines."
* commit '
22323f91b11b0fbaa0a101a75e116132028a5817':
Fix aarch64 futex assembly routines.
Elliott Hughes [Sat, 21 Dec 2013 01:26:30 +0000 (17:26 -0800)]
Remove some old kernel header cruft not needed with uapi.
Change-Id: If543b056ae40f0eb660be4a0629ad22f4c4cb92f
Elliott Hughes [Sat, 21 Dec 2013 01:20:22 +0000 (01:20 +0000)]
Merge "Fix aarch64 futex assembly routines."
Elliott Hughes [Sat, 21 Dec 2013 00:58:06 +0000 (16:58 -0800)]
Fix aarch64 futex assembly routines.
Also make the other architectures more similar to one another,
use NULL instead of 0 in calling code, and remove an unused #define.
Change-Id: I52b874afb6a351c802f201a0625e484df6d093bb
Elliott Hughes [Fri, 20 Dec 2013 23:41:59 +0000 (15:41 -0800)]
am
026b6ab6: Merge "Allocate additional space on stack for indirect syscall"
* commit '
026b6ab6d5f0d8fca5cdfab05727197626769dc2':
Allocate additional space on stack for indirect syscall
Elliott Hughes [Fri, 20 Dec 2013 23:36:32 +0000 (23:36 +0000)]
Merge "Allocate additional space on stack for indirect syscall"
Chris Dearman [Mon, 16 Dec 2013 22:10:13 +0000 (14:10 -0800)]
Allocate additional space on stack for indirect syscall
The caller is only required to allocate 16 bytes on the
stack for a0-a3. syscall is handling up to 6 arguments so
additional space is needed on the stack to avoid corrupting the
callers frame.
Change-Id: I054b31696decc3e17d9c70af18cd278b852235d1
Greg Hackmann [Fri, 20 Dec 2013 22:00:26 +0000 (14:00 -0800)]
am
5e26221a: Merge "Fix backwards compatible system property structure"
* commit '
5e26221a1da6bc0f11819078e74f1f6e0b76f642':
Fix backwards compatible system property structure
Greg Hackmann [Fri, 20 Dec 2013 21:54:38 +0000 (21:54 +0000)]
Merge "Fix backwards compatible system property structure"
Elliott Hughes [Fri, 20 Dec 2013 19:38:17 +0000 (11:38 -0800)]
am
21955e54: Merge "Upgrade to tzdata2013i."
* commit '
21955e5453de0b82c1ab25a3bb7314c249d73269':
Upgrade to tzdata2013i.
Elliott Hughes [Fri, 20 Dec 2013 19:33:45 +0000 (19:33 +0000)]
Merge "Upgrade to tzdata2013i."
Elliott Hughes [Fri, 20 Dec 2013 19:26:19 +0000 (11:26 -0800)]
Upgrade to tzdata2013i.
From the release notes:
Changes affecting near-future time stamps:
Jordan switches back to standard time at 00:00 on December 20, 2013.
The 2006-2011 transition schedule is planned to resume in 2014.
(Thanks to Steffen Thorsen.)
Changes affecting past time stamps:
In 2004, Cuba began DST on March 28, not April 4.
(Thanks to Steffen Thorsen.)
Change-Id: I8f26cc50f6b571804a18ff2113b4a47a22bc56dd
Elliott Hughes [Fri, 20 Dec 2013 05:23:09 +0000 (21:23 -0800)]
am
aa267685: Merge "Allow GCC-built fortified code to run on a clang-built bionic."
* commit '
aa267685c9da11502c4ec50f86f78a7075b6809c':
Allow GCC-built fortified code to run on a clang-built bionic.
Elliott Hughes [Fri, 20 Dec 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Allow GCC-built fortified code to run on a clang-built bionic."
Elliott Hughes [Fri, 20 Dec 2013 02:09:23 +0000 (18:09 -0800)]
am
ea23753e: Merge "Fix __isnanl on aarch64."
* commit '
ea23753ea0a4d07924d9605d9acb44f51787ddd7':
Fix __isnanl on aarch64.
Elliott Hughes [Fri, 20 Dec 2013 02:03:21 +0000 (02:03 +0000)]
Merge "Fix __isnanl on aarch64."
Elliott Hughes [Fri, 20 Dec 2013 01:52:35 +0000 (17:52 -0800)]
am
a19a41b6: Merge "Fix struct stat for aarch64."
* commit '
a19a41b6b596654a1ae21c350957d874031b00b2':
Fix struct stat for aarch64.
Elliott Hughes [Fri, 20 Dec 2013 01:49:12 +0000 (17:49 -0800)]
am
f85b9ac3: Merge "Don\'t force O_LARGEFILE on LP64."
* commit '
f85b9ac3ec4fbebc2792cf823e0e721543950352':
Don't force O_LARGEFILE on LP64.
Elliott Hughes [Fri, 20 Dec 2013 01:45:32 +0000 (01:45 +0000)]
Merge "Fix struct stat for aarch64."
Elliott Hughes [Fri, 20 Dec 2013 01:44:23 +0000 (01:44 +0000)]
Merge "Don't force O_LARGEFILE on LP64."
Elliott Hughes [Fri, 20 Dec 2013 01:13:56 +0000 (17:13 -0800)]
Fix __isnanl on aarch64.
This fixes the math.__isnanl, math.powl, and math.fdiml tests.
Change-Id: I0086e4a1a82d0e2708fa07cf580a6d9778c548f2
Elliott Hughes [Fri, 20 Dec 2013 00:50:22 +0000 (16:50 -0800)]
Fix struct stat for aarch64.
Another kernel, another struct stat.
Change-Id: Ia5ee553d4a2ffc878d2fed82a763ff64c02b12e8
Ben Cheng [Fri, 20 Dec 2013 00:49:31 +0000 (16:49 -0800)]
am
f576472a: Merge "Add __popcountsi2 to the function compat list."
* commit '
f576472a144c20f307bfa05839eb25e7215ff67e':
Add __popcountsi2 to the function compat list.
Elliott Hughes [Fri, 20 Dec 2013 00:48:56 +0000 (16:48 -0800)]
Don't force O_LARGEFILE on LP64.
aarch64's strace is confused by this, and it isn't necessary anyway.
Change-Id: Ib07b649eb1c38ff0296003874f73af78c47bc276
Ben Cheng [Fri, 20 Dec 2013 00:42:40 +0000 (00:42 +0000)]
Merge "Add __popcountsi2 to the function compat list."
Ben Cheng [Fri, 20 Dec 2013 00:26:40 +0000 (16:26 -0800)]
Add __popcountsi2 to the function compat list.
This is needed if we use Clang to compile Bionic, which won't include
__popcountsi2 anymore as Clang generates inline instructions. However
prebuilt binary blobs still depend on libc.so to resolve __popcountsi2.
Change-Id: I9001a3884c4be250c0ceebcd79922783fae1a0b7
Elliott Hughes [Thu, 19 Dec 2013 23:42:06 +0000 (15:42 -0800)]
am
ed96db2a: Merge "Don\'t abort in stdio.getdelim_invalid and stdio.getline_invalid."
* commit '
ed96db2a4f2fe5683407c3571d037bb7325544da':
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
Elliott Hughes [Thu, 19 Dec 2013 23:36:47 +0000 (23:36 +0000)]
Merge "Don't abort in stdio.getdelim_invalid and stdio.getline_invalid."
Elliott Hughes [Thu, 19 Dec 2013 22:56:17 +0000 (14:56 -0800)]
Don't abort in stdio.getdelim_invalid and stdio.getline_invalid.
Change-Id: Ie1aefed732f4bea77887bddd1be9a0578e247aa3
Elliott Hughes [Thu, 19 Dec 2013 20:21:07 +0000 (12:21 -0800)]
Allow GCC-built fortified code to run on a clang-built bionic.
Even though code built with clang won't be fully fortified
and won't contain calls to our various helpers, binaries built
with GCC will.
Change-Id: I389b2f1e22a3e89b22aadedc46397bf704f9ca79
Elliott Hughes [Thu, 19 Dec 2013 20:07:06 +0000 (12:07 -0800)]
am
cf7a4a4f: Merge "Revert "Add C linkage for __open_2 and __openat_2.""
* commit '
cf7a4a4fda076ec76bb79fdbd039665171e8cd75':
Revert "Add C linkage for __open_2 and __openat_2."
Elliott Hughes [Thu, 19 Dec 2013 20:02:28 +0000 (20:02 +0000)]
Merge "Revert "Add C linkage for __open_2 and __openat_2.""
Elliott Hughes [Thu, 19 Dec 2013 20:02:16 +0000 (20:02 +0000)]
Revert "Add C linkage for __open_2 and __openat_2."
This reverts commit
c13d89b829a83a248130184583cf0332515a05df.
Change-Id: I40a3c6b926e920b65dd054353a2db8d314d5b300
Elliott Hughes [Thu, 19 Dec 2013 19:45:37 +0000 (11:45 -0800)]
am
bb4f6dc2: Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
* commit '
bb4f6dc2ec388dca4f3570164509420e1df91b35':
ARM: Change dmb domain for bionic_atomic_barrier()
Elliott Hughes [Thu, 19 Dec 2013 19:42:06 +0000 (11:42 -0800)]
am
1afb375d: Merge "Fix aarch64 custom assembler now non-uapi is gone."
* commit '
1afb375d30cadf5dfcb5dfe352527e2a1147c79f':
Fix aarch64 custom assembler now non-uapi is gone.
Elliott Hughes [Thu, 19 Dec 2013 19:42:05 +0000 (11:42 -0800)]
am
eb15a6c9: Merge "We actually have modfl."
* commit '
eb15a6c9cd35fa2a91d277c48390827a78435ab4':
We actually have modfl.
Elliott Hughes [Thu, 19 Dec 2013 19:39:43 +0000 (19:39 +0000)]
Merge "ARM: Change dmb domain for bionic_atomic_barrier()"
Serban Constantinescu [Thu, 19 Dec 2013 11:57:10 +0000 (11:57 +0000)]
ARM: Change dmb domain for bionic_atomic_barrier()
This patch changes the domain that the memory barrier operates on. Assumes
that the scope of bionic_atomic_barrier() does not include device memory,
memory shared with the GPU or any other memory external to the processor
cluster.
Change-Id: I291e741c98a64c86f3a3cf99811bbf1e714ac9aa
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Elliott Hughes [Thu, 19 Dec 2013 19:36:03 +0000 (19:36 +0000)]
Merge "Fix aarch64 custom assembler now non-uapi is gone."
Elliott Hughes [Thu, 19 Dec 2013 19:34:03 +0000 (19:34 +0000)]
Merge "We actually have modfl."
Elliott Hughes [Thu, 19 Dec 2013 19:32:42 +0000 (11:32 -0800)]
Fix aarch64 custom assembler now non-uapi is gone.
Change-Id: I9c8ad17d9bae2de9d793444d87d4ee133728e900
Elliott Hughes [Thu, 19 Dec 2013 19:30:51 +0000 (11:30 -0800)]
We actually have modfl.
Change-Id: I22bb4d14f99a418819f2941c2dfec49094807c5f
Ben Cheng [Thu, 19 Dec 2013 19:05:15 +0000 (11:05 -0800)]
am
dcc18ea4: Merge "Add C linkage for __open_2 and __openat_2."
* commit '
dcc18ea4c685230087618c12e8f20484b314596f':
Add C linkage for __open_2 and __openat_2.
Ben Cheng [Thu, 19 Dec 2013 18:59:05 +0000 (18:59 +0000)]
Merge "Add C linkage for __open_2 and __openat_2."
Ben Cheng [Thu, 19 Dec 2013 18:24:04 +0000 (10:24 -0800)]
Add C linkage for __open_2 and __openat_2.
Otherwise Clang mangle them with C++ names.
Change-Id: I844e28d834df8b0752b32d2aadd2013fc8804a43
Christopher Ferris [Thu, 19 Dec 2013 07:04:58 +0000 (23:04 -0800)]
am
81ddd143: Merge "Remove the non-uapi kernel headers."
* commit '
81ddd14381b09f171c006ebcbba15b3c1baf2a9f':
Remove the non-uapi kernel headers.
Christopher Ferris [Thu, 19 Dec 2013 06:58:53 +0000 (06:58 +0000)]
Merge "Remove the non-uapi kernel headers."
Nick Kralevich [Thu, 19 Dec 2013 05:11:40 +0000 (21:11 -0800)]
am
25447aec: Merge "Clean up more recursive FORTIFY_SOURCE calls"
* commit '
25447aec39c3c3d54b2defab6a5666c162db4f5a':
Clean up more recursive FORTIFY_SOURCE calls
Nick Kralevich [Thu, 19 Dec 2013 05:08:17 +0000 (05:08 +0000)]
Merge "Clean up more recursive FORTIFY_SOURCE calls"
Nick Kralevich [Thu, 19 Dec 2013 03:17:14 +0000 (19:17 -0800)]
Clean up more recursive FORTIFY_SOURCE calls
Don't use FORTIFY_SOURCE on functions which implement
FORTIFY_SOURCE, to avoid infinite recursion problems.
The previous patch only addressed one of the problems.
Bug:
12216860
Change-Id: I6f30ae7cb5b481be9942add18182ea4839d348a6
Nick Kralevich [Thu, 19 Dec 2013 02:57:18 +0000 (18:57 -0800)]
am
4063bb61: Merge "__strnlen_chk: avoid recursive strlen calls"
* commit '
4063bb6147bd256ad455bd3bd063ef40aae8851d':
__strnlen_chk: avoid recursive strlen calls
Elliott Hughes [Thu, 19 Dec 2013 02:53:59 +0000 (18:53 -0800)]
am
90bd36bc: Merge "Don\'t use weak aliases in libm."
* commit '
90bd36bca66205b1c15f80b70036ff4d64198d32':
Don't use weak aliases in libm.
Nick Kralevich [Thu, 19 Dec 2013 02:52:23 +0000 (02:52 +0000)]
Merge "__strnlen_chk: avoid recursive strlen calls"
Elliott Hughes [Thu, 19 Dec 2013 02:49:18 +0000 (02:49 +0000)]
Merge "Don't use weak aliases in libm."
Nick Kralevich [Thu, 19 Dec 2013 02:17:52 +0000 (18:17 -0800)]
__strnlen_chk: avoid recursive strlen calls
Don't use FORTIFY_SOURCE on functions which implement
FORTIFY_SOURCE.
Bug:
12216860
Change-Id: I61db1b47ccdd6bdcf41eab3303f4806494016199
Elliott Hughes [Thu, 19 Dec 2013 00:06:52 +0000 (16:06 -0800)]
Don't use weak aliases in libm.
The aarch64 toolchain doesn't support them, and we were already implementing
most of the fake long-double functions differently anyway.
Change-Id: I4a2f2df81972ee9c34ddfe96cec81b126506d881
Elliott Hughes [Wed, 18 Dec 2013 23:35:59 +0000 (15:35 -0800)]
am
f5897dcb: Merge "Fix linking of aarch64 static binaries."
* commit '
f5897dcb1d1dc493b6a2ba526a766da73bb9c1da':
Fix linking of aarch64 static binaries.
Elliott Hughes [Wed, 18 Dec 2013 23:31:28 +0000 (23:31 +0000)]
Merge "Fix linking of aarch64 static binaries."
Elliott Hughes [Wed, 18 Dec 2013 23:22:08 +0000 (15:22 -0800)]
Fix linking of aarch64 static binaries.
Change-Id: If1fa8b560074058b8f7ef32db21a7ca3c53d1fd7
Elliott Hughes [Wed, 18 Dec 2013 22:16:24 +0000 (14:16 -0800)]
am
0b61567f: Merge "Fix the x86-64 int64_t/uint64_t."
* commit '
0b61567f9fc5b54ffdb324bf21f8ca332b69a249':
Fix the x86-64 int64_t/uint64_t.
Elliott Hughes [Wed, 18 Dec 2013 22:11:17 +0000 (22:11 +0000)]
Merge "Fix the x86-64 int64_t/uint64_t."
Elliott Hughes [Wed, 18 Dec 2013 22:00:14 +0000 (14:00 -0800)]
Fix the x86-64 int64_t/uint64_t.
This now matches aarch64, which was already correct.
Bug:
12213562
Change-Id: I5da19f0af98347992fea2a62938472f86427740f
Elliott Hughes [Wed, 18 Dec 2013 20:28:13 +0000 (12:28 -0800)]
am
717ad649: Merge "Don\'t use __kernel_ulong_t."
* commit '
717ad6498c06e53812e406aa0c40738ef3e85801':
Don't use __kernel_ulong_t.
Elliott Hughes [Wed, 18 Dec 2013 20:23:27 +0000 (20:23 +0000)]
Merge "Don't use __kernel_ulong_t."
Elliott Hughes [Wed, 18 Dec 2013 20:22:33 +0000 (12:22 -0800)]
Don't use __kernel_ulong_t.
Change-Id: Ifdfbac0ac6da647276a84bd64bb342bb5a07ad61