OSDN Git Service
Elliott Hughes [Fri, 2 Aug 2013 22:39:08 +0000 (22:39 +0000)]
Merge "libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher"
Robert Greenwalt [Thu, 1 Aug 2013 00:47:28 +0000 (00:47 +0000)]
Merge "Tell the dns resolver about our domains."
Robert Greenwalt [Wed, 31 Jul 2013 23:53:46 +0000 (16:53 -0700)]
Tell the dns resolver about our domains.
A refactor caused us to not tell the resolver about search domains
until after it had done the domain fanout.
bug:
6799630
Change-Id: Ibabd8fa5bcc69b1490fc5e329e62eb0f2d1a5e63
Elliott Hughes [Tue, 30 Jul 2013 00:29:58 +0000 (00:29 +0000)]
Merge "Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way."
Elliott Hughes [Mon, 29 Jul 2013 23:51:45 +0000 (16:51 -0700)]
Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way.
Also make sysconf use PTHREAD_STACK_MIN rather than redefining its
own, different, constant.
Bug:
9997352
Change-Id: I9a8e7d2b18e691439abfb45533e82c36eee9e81d
synergydev [Sun, 28 Jul 2013 21:43:00 +0000 (21:43 +0000)]
libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher
This is needed when passing -mcpu=cortex-a9 or higher on a modern
toolchain for prebuilt library compatibility
Change-Id: I73eb2393377914ae26216a8c2828ad973d1c1225
Elliott Hughes [Thu, 25 Jul 2013 21:51:05 +0000 (21:51 +0000)]
Merge "Bump the number of TLS slots to 128."
Elliott Hughes [Thu, 25 Jul 2013 21:14:22 +0000 (14:14 -0700)]
Bump the number of TLS slots to 128.
Bug:
9997352
Change-Id: I7bde7228d803e9d4bb83309c5891d54a07e3b025
Elliott Hughes [Thu, 25 Jul 2013 17:28:59 +0000 (17:28 +0000)]
Merge "Avoid sign extension of the mmap offset."
Elliott Hughes [Thu, 25 Jul 2013 17:15:07 +0000 (10:15 -0700)]
Avoid sign extension of the mmap offset.
off_t is signed to support seeking backwards, but that's a liability
when using off_t to represent a subset of a file.
Change-Id: I2a3615166eb16212347eb47f1242e3bfb93c2022
Elliott Hughes [Wed, 24 Jul 2013 01:07:12 +0000 (18:07 -0700)]
am
a8d06766: Merge "[MIPS] __dso_handle.S and __dso_handle_so.S not needed."
* commit '
a8d06766c7674bbfde852e8bfee4200e75ad8f24':
[MIPS] __dso_handle.S and __dso_handle_so.S not needed.
Elliott Hughes [Wed, 24 Jul 2013 01:05:18 +0000 (01:05 +0000)]
Merge "[MIPS] __dso_handle.S and __dso_handle_so.S not needed."
Rom Lemarchand [Tue, 23 Jul 2013 20:52:29 +0000 (13:52 -0700)]
am
061246b6: Merge "Restore dlmalloc mmap threshold to 64k"
* commit '
061246b600c16a80b246804221b9e3fa65e507d9':
Restore dlmalloc mmap threshold to 64k
Rom Lemarchand [Tue, 23 Jul 2013 20:49:46 +0000 (20:49 +0000)]
Merge "Restore dlmalloc mmap threshold to 64k"
Rom Lemarchand [Tue, 23 Jul 2013 18:30:52 +0000 (11:30 -0700)]
Restore dlmalloc mmap threshold to 64k
Restoring DEFAULT_MMAP_THRESHOLD to 64k, the way it was before
999089181ef60bb67e1a49f2cf6f4ec608a7caf8.
This forces allocations in the 64k-256k range to be mmaped.
Change-Id: Iace55ed638edd272b3e94fa6cd2ddd349042be84
Signed-off-by: Rom Lemarchand <romlem@google.com>
Pete Delaney [Tue, 23 Jul 2013 04:54:46 +0000 (21:54 -0700)]
[MIPS] __dso_handle.S and __dso_handle_so.S not needed.
Global hidden variable __dso_handle is now declared in:
bionic/libc/private/__dso_handle.h
Change-Id: I8e951a8d7c65877bafc1be23a7fff6d44d3a2846
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Signed-off-by: Chao-Ying Fu <chao-ying.fu@imgtec.com>
Elliott Hughes [Sat, 20 Jul 2013 00:13:33 +0000 (17:13 -0700)]
am
6fe4a58f: Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."
* commit '
6fe4a58f84954523f17114f1f7cf060a3573c073':
Move stuff only needed by pthread-timers.c into pthread-timers.c.
Elliott Hughes [Sat, 20 Jul 2013 00:10:31 +0000 (00:10 +0000)]
Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."
Elliott Hughes [Fri, 19 Jul 2013 23:42:27 +0000 (16:42 -0700)]
Move stuff only needed by pthread-timers.c into pthread-timers.c.
Change-Id: I4915b3fff9c4f5a36b4f51027fb22019c11607b0
Elliott Hughes [Fri, 19 Jul 2013 23:37:52 +0000 (16:37 -0700)]
am
e8bd8c2e: Merge "Upgrade mktemp.c to the current upstream version."
* commit '
e8bd8c2ed9c71c73682f29020456934c55f260e3':
Upgrade mktemp.c to the current upstream version.
Elliott Hughes [Fri, 19 Jul 2013 23:35:29 +0000 (23:35 +0000)]
Merge "Upgrade mktemp.c to the current upstream version."
Elliott Hughes [Fri, 19 Jul 2013 22:20:31 +0000 (15:20 -0700)]
Upgrade mktemp.c to the current upstream version.
Yet another archaic relic containing bugs that had been fixed years before the
Android project even started...
Bug:
9935113
Change-Id: I3c9d019a216efd609ee568cf8c70bc360f357403
Elliott Hughes [Thu, 18 Jul 2013 00:41:43 +0000 (17:41 -0700)]
am
f8a66bb3: Merge "Remove some non-unused makefile generality."
* commit '
f8a66bb31204b42f830c1865a795b5f3eb1e0147':
Remove some non-unused makefile generality.
Elliott Hughes [Thu, 18 Jul 2013 00:39:35 +0000 (00:39 +0000)]
Merge "Remove some non-unused makefile generality."
Elliott Hughes [Thu, 18 Jul 2013 00:38:45 +0000 (17:38 -0700)]
Remove some non-unused makefile generality.
MIPS uses .c files like ARM and x86 now.
Change-Id: Ie580647e385121c380316c443ec199dabf657ff8
Elliott Hughes [Thu, 18 Jul 2013 00:36:26 +0000 (17:36 -0700)]
am
8fa9081f: Merge "[MIPS] Rewrite MIPS crtbegin* as C files."
* commit '
8fa9081f48c4861f83737d59bf2c2c8f21c7da3f':
[MIPS] Rewrite MIPS crtbegin* as C files.
Elliott Hughes [Thu, 18 Jul 2013 00:34:22 +0000 (00:34 +0000)]
Merge "[MIPS] Rewrite MIPS crtbegin* as C files."
Pete Delaney [Wed, 17 Jul 2013 21:23:29 +0000 (14:23 -0700)]
[MIPS] Rewrite MIPS crtbegin* as C files.
This updates the MIPS arch to be much more in
sync with the commit Nick Kralevich made last
June; see
9d40326830c2bd407427889c554adeb915ee6b4a.
Rewrite
crtbegin.S -> crtbegin.c
crtbegin_so.S -> crtbegin_so.c
__dso_handle.S -> __dso_handle.c
__dso_handle_so.S -> __dso_handle_so.c
atexit.S -> atexit.c
Previously __do_global_dtors_aux was in the tasks
__FINI_ARRAY__ linked with crtbegin.S and it now being
removed as there is no need to call a destructor just
before terminating a process.
Shared libraries, on the other hand, are linked with
crtbegin_so.c and have a hidden destructor declared
to allow the bionic linker to call __on_dlclose().
Change-Id: Ieb4da5199b54573de05743990e309db381a11cb8
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Signed-off-by: Chao-Ying Fu <chao-ying.fu@imgtec.com>
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
Elliott Hughes [Wed, 17 Jul 2013 20:50:15 +0000 (13:50 -0700)]
am
2be511d4: Merge "Improve stack overflow diagnostics (take 2)."
* commit '
2be511d405d47eccc61a6e3c338d1877bf33b4fa':
Improve stack overflow diagnostics (take 2).
Elliott Hughes [Wed, 17 Jul 2013 20:48:25 +0000 (20:48 +0000)]
Merge "Improve stack overflow diagnostics (take 2)."
Elliott Hughes [Wed, 17 Jul 2013 20:33:19 +0000 (13:33 -0700)]
Improve stack overflow diagnostics (take 2).
This reverts commits
eb1b07469f2b5a392dc1bfd8adc211aea8c72bc5 and
d14dc3b87fbf80553f1cafa453816b7f11366627, and fixes the bug where
we were calling mmap (which might cause errno to be set) before
__set_tls (which is required to implement errno).
Bug:
8557703
Change-Id: I2c36d00240c56e156e1bb430d8c22a73a068b70c
Elliott Hughes [Wed, 17 Jul 2013 20:22:39 +0000 (13:22 -0700)]
am
40e7a878: Merge "Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno."
* commit '
40e7a87864fee75f7af2caf8e1972d0d764135cd':
Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno.
Elliott Hughes [Wed, 17 Jul 2013 20:20:41 +0000 (20:20 +0000)]
Merge "Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno."
Elliott Hughes [Wed, 17 Jul 2013 20:12:26 +0000 (13:12 -0700)]
Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno.
Bug:
9889616
Change-Id: I4a7323e0ae5aeb5cbe0da1b2bc7501d83b3a2aa4
Elliott Hughes [Wed, 17 Jul 2013 20:05:13 +0000 (13:05 -0700)]
am
b7b36b81: Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"
* commit '
b7b36b819e8029a152859f3204ba2da38a0e2879':
mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
Elliott Hughes [Wed, 17 Jul 2013 20:02:11 +0000 (20:02 +0000)]
Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"
Rom Lemarchand [Sat, 18 May 2013 00:08:41 +0000 (17:08 -0700)]
mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
Reinstate mmap calling madvise(MADV_MERGEABLE) removed in
635df850e5037be5093f64a87ec2e0a23bf7a50b
(cherry-pick of
c702a904679a36511bead29c51eeac15d81f4fd2.)
Change-Id: I18803fb54701b2b3d8186dff5c678211ee3efa1f
Guang Zhu [Wed, 17 Jul 2013 03:18:57 +0000 (20:18 -0700)]
am
2cf5a6f6: Merge "Revert "Improve stack overflow diagnostics.""
* commit '
2cf5a6f6627549842c0c840ff3615ae942a90ea3':
Revert "Improve stack overflow diagnostics."
Guang Zhu [Wed, 17 Jul 2013 03:18:57 +0000 (20:18 -0700)]
am
8c1b9668: Merge "Revert "Clean up our alternate signal stacks.""
* commit '
8c1b96681af91fda86a5493e7f7e4381ce489648':
Revert "Clean up our alternate signal stacks."
Guang Zhu [Wed, 17 Jul 2013 03:17:19 +0000 (03:17 +0000)]
Merge "Revert "Improve stack overflow diagnostics.""
Guang Zhu [Wed, 17 Jul 2013 03:17:05 +0000 (03:17 +0000)]
Revert "Improve stack overflow diagnostics."
This reverts commit
aa754dca90487356cabf07ade0e8d88c2630b784.
Change-Id: Ifa76eee31f7f44075eb3a48554315b2693062f44
Guang Zhu [Wed, 17 Jul 2013 03:16:51 +0000 (03:16 +0000)]
Merge "Revert "Clean up our alternate signal stacks.""
Guang Zhu [Wed, 17 Jul 2013 03:16:04 +0000 (03:16 +0000)]
Revert "Clean up our alternate signal stacks."
This reverts commit
5cf87951abd23b0b3ebf159e8aa06b02e39527ca.
Change-Id: Idd6ca7d80a018755da3bd315d91193723ce7f3bf
Christopher Ferris [Wed, 17 Jul 2013 00:22:05 +0000 (17:22 -0700)]
am
f63c28f0: Merge "Fix assembler errors in generic arm strlen.c."
* commit '
f63c28f0338fd647e88f1f9300b2220093af1aae':
Fix assembler errors in generic arm strlen.c.
Christopher Ferris [Wed, 17 Jul 2013 00:21:55 +0000 (17:21 -0700)]
am
6f4fed74: Merge "Add new optimized strlen for arm."
* commit '
6f4fed74cb9405c0f5322307085d15afed6be764':
Add new optimized strlen for arm.
Christopher Ferris [Wed, 17 Jul 2013 00:19:42 +0000 (00:19 +0000)]
Merge "Fix assembler errors in generic arm strlen.c."
Christopher Ferris [Wed, 17 Jul 2013 00:19:29 +0000 (00:19 +0000)]
Merge "Add new optimized strlen for arm."
Christopher Ferris [Mon, 15 Jul 2013 20:55:45 +0000 (13:55 -0700)]
Fix assembler errors in generic arm strlen.c.
Tested using a static version of the strlen libc_test program
on a nexus7 that uses the generic code.
Merge from internal master.
(cherry-picked from
d8d10a8994472e40d19301b7087806630877b4d5)
Change-Id: I88f7dc01dc5b5c3ac2d5580d92153bc1bc36c564
Christopher Ferris [Wed, 10 Jul 2013 21:31:03 +0000 (14:31 -0700)]
Add new optimized strlen for arm.
This optimized version is primarily targeted at cortex-a15.
Tested on all nexus devices using the system/extras/libc_test strlen test.
Tested alignments from 1 to 32 that are powers of 2.
Tested that strlen does not cross page boundaries at all alignments.
Speed improvements listed below:
cortex-a15
- Sizes >= 32 bytes, ~75% improvement.
- Sizes >= 1024 bytes, ~250% improvement.
cortex-a9
- Sizes >= 32 bytes, ~75% improvement.
- Sizes >= 1024 bytes, ~85% improvement.
krait
- Sizes >= 32 bytes, ~95% improvement.
- Sizes >= 1024 bytes, ~160% improvement.
Merge from internal master.
(cherry-picked from
2fc071797743b88a9a47427d46baed7c7b24f4d2)
Change-Id: I1ceceb4e745fd68e9d946f96d1d42e0cdaff6ccf
Elliott Hughes [Tue, 16 Jul 2013 22:50:18 +0000 (15:50 -0700)]
am
f35e0c14: Merge "Clean up our alternate signal stacks."
* commit '
f35e0c149f1a6801a5af7c339f84d81ae05c3adf':
Clean up our alternate signal stacks.
Elliott Hughes [Tue, 16 Jul 2013 22:47:41 +0000 (22:47 +0000)]
Merge "Clean up our alternate signal stacks."
Elliott Hughes [Tue, 16 Jul 2013 22:31:40 +0000 (15:31 -0700)]
am
026867c7: Merge "Improve stack overflow diagnostics."
* commit '
026867c7dcce7828212dcd4a61806146908e9039':
Improve stack overflow diagnostics.
Elliott Hughes [Tue, 16 Jul 2013 22:31:39 +0000 (15:31 -0700)]
am
9562d38d: Merge "Clean up __builtin_expect usage."
* commit '
9562d38df1e4aba941b3433cfd0922fee5ea258b':
Clean up __builtin_expect usage.
Elliott Hughes [Tue, 16 Jul 2013 22:31:39 +0000 (15:31 -0700)]
am
f152e386: Merge "EABI syscall cleanup."
* commit '
f152e386fcf477f3f5de9dc020c3660d4f9c4b81':
EABI syscall cleanup.
Elliott Hughes [Tue, 16 Jul 2013 21:32:47 +0000 (14:32 -0700)]
Clean up our alternate signal stacks.
Bug:
8557703
Change-Id: Ie93901dd1c29e9d3bf795b0f0400616d9ef08f75
Elliott Hughes [Tue, 16 Jul 2013 20:38:55 +0000 (20:38 +0000)]
Merge "Improve stack overflow diagnostics."
Elliott Hughes [Tue, 16 Jul 2013 20:14:24 +0000 (13:14 -0700)]
Improve stack overflow diagnostics.
We notify debuggerd of problems by installing signal handlers. That's
fine except for when the signal is caused by us running off the end of
a thread's stack and into the guard page.
Bug:
8557703
Change-Id: I1ef65b4bb3bbca7e9a9743056177094921e60ed3
Elliott Hughes [Tue, 16 Jul 2013 19:52:30 +0000 (19:52 +0000)]
Merge "Clean up __builtin_expect usage."
Elliott Hughes [Tue, 16 Jul 2013 19:45:46 +0000 (12:45 -0700)]
Clean up __builtin_expect usage.
Also remove some dead code; our malloc debugging doesn't use this
any more.
Change-Id: Id69cf182371f5f37d40b5bbd08f2744ade286e66
Elliott Hughes [Tue, 16 Jul 2013 19:35:57 +0000 (19:35 +0000)]
Merge "EABI syscall cleanup."
Elliott Hughes [Tue, 16 Jul 2013 18:52:24 +0000 (11:52 -0700)]
EABI syscall cleanup.
We cleaned up the auto-generated ones a while back to not touch
the stack unnecessarily if they have <= 4 arguments. This patch
cleans up some hand-crafted ones.
Also improve comments in clone.S.
Change-Id: I8850bf98f2b26829385315304472a760e6880ed8
Elliott Hughes [Mon, 15 Jul 2013 23:42:34 +0000 (16:42 -0700)]
am
67750c85: Merge "Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize."
* commit '
67750c8515573cba294b2f3840249dd7f7d817d5':
Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize.
Elliott Hughes [Mon, 15 Jul 2013 23:39:38 +0000 (23:39 +0000)]
Merge "Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize."
Elliott Hughes [Mon, 15 Jul 2013 21:51:07 +0000 (14:51 -0700)]
Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize.
pthread_getattr_np was reporting the values supplied to us, not the values we
actually used, which is kinda the whole point of pthread_getattr_np.
pthread_attr_setguardsize and pthread_attr_setstacksize were reporting EINVAL
for any size that wasn't a multiple of the system page size. This is
unnecessary. We can just round like POSIX suggests and glibc already does.
Also improve the error reporting for pthread_create failures.
Change-Id: I7ebc518628a8a1161ec72e111def911d500bba71
Elliott Hughes [Mon, 15 Jul 2013 17:11:04 +0000 (10:11 -0700)]
am
59ed029b: Merge "Upgrade to tzcode2013d."
* commit '
59ed029b286a1564f635377296e4f088e0fd2afa':
Upgrade to tzcode2013d.
Elliott Hughes [Mon, 15 Jul 2013 17:08:41 +0000 (17:08 +0000)]
Merge "Upgrade to tzcode2013d."
Elliott Hughes [Sat, 13 Jul 2013 00:31:11 +0000 (17:31 -0700)]
Upgrade to tzcode2013d.
Well, kinda... localtime.c still contains a bunch of Android-specific
hacks, as does strftime.c. But the other files are now exactly the same
as upstream.
This catches up with several years of bug fixes, and fixes most of the
compiler warnings that were in this code. (Just two remain.)
Bug:
1744909
Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
Elliott Hughes [Fri, 12 Jul 2013 21:28:40 +0000 (14:28 -0700)]
am
3db1f359: Merge "Add a trivial gmtime(3) test."
* commit '
3db1f359e9f218f5f73a7a9f4d80e4be362a526e':
Add a trivial gmtime(3) test.
Elliott Hughes [Fri, 12 Jul 2013 21:23:48 +0000 (21:23 +0000)]
Merge "Add a trivial gmtime(3) test."
Elliott Hughes [Fri, 12 Jul 2013 18:25:20 +0000 (11:25 -0700)]
Add a trivial gmtime(3) test.
Change-Id: I849f200a455cd6971646fa45766ab22ba19fb866
Elliott Hughes [Fri, 12 Jul 2013 01:52:22 +0000 (18:52 -0700)]
am
8a363692: Merge "Add TCP_INFO state enum values."
* commit '
8a363692be45ed1b36e1f1f21707b6f35f5519c8':
Add TCP_INFO state enum values.
Nick Kralevich [Fri, 12 Jul 2013 01:52:01 +0000 (18:52 -0700)]
am
d30877ae: Merge "syslog.h: add __printflike to syslog functions"
* commit '
d30877ae28f3c308edf142c091b3a8acc4467c6d':
syslog.h: add __printflike to syslog functions
Elliott Hughes [Thu, 11 Jul 2013 23:58:48 +0000 (23:58 +0000)]
Merge "Add TCP_INFO state enum values."
Elliott Hughes [Thu, 11 Jul 2013 23:21:32 +0000 (16:21 -0700)]
Add TCP_INFO state enum values.
Bug: https://code.google.com/p/android/issues/detail?id=38881
Change-Id: Ie22816c666474e6441e0ec3afd2a6eb04d64a673
Nick Kralevich [Thu, 11 Jul 2013 15:32:49 +0000 (15:32 +0000)]
Merge "syslog.h: add __printflike to syslog functions"
Nick Kralevich [Wed, 10 Jul 2013 14:37:11 +0000 (07:37 -0700)]
syslog.h: add __printflike to syslog functions
Allow the compiler to detect formating bugs.
Change-Id: I6a4af6cae59dc3adf14b075431a41885213a649a
Elliott Hughes [Tue, 9 Jul 2013 21:21:50 +0000 (14:21 -0700)]
am
b7f49237: Merge "Fix MIPS build."
* commit '
b7f492375291306065472b67011eebb324de1022':
Fix MIPS build.
Elliott Hughes [Tue, 9 Jul 2013 21:19:15 +0000 (21:19 +0000)]
Merge "Fix MIPS build."
Elliott Hughes [Tue, 9 Jul 2013 21:18:36 +0000 (14:18 -0700)]
Fix MIPS build.
Change-Id: I583b1794dbc12fcded8c4f57f367593a742ab33f
Elliott Hughes [Tue, 9 Jul 2013 20:44:57 +0000 (13:44 -0700)]
am
9d476716: Merge "Add <sys/statvfs.h>."
* commit '
9d476716c2bd7bc5a018a71e121257c35e965058':
Add <sys/statvfs.h>.
Elliott Hughes [Tue, 9 Jul 2013 20:43:13 +0000 (20:43 +0000)]
Merge "Add <sys/statvfs.h>."
Elliott Hughes [Tue, 9 Jul 2013 20:25:03 +0000 (13:25 -0700)]
Add <sys/statvfs.h>.
Bug:
2512019
Change-Id: I6e7fd3fa281977cc4bc270481a95416b5b2dc351
Elliott Hughes [Mon, 8 Jul 2013 22:09:07 +0000 (15:09 -0700)]
am
4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."
* commit '
4fc8a0c1165537b693c900ac3e2c61470bd7e484':
Remove <netinet/icmp6.h> ni_* macros.
Elliott Hughes [Mon, 8 Jul 2013 22:08:12 +0000 (22:08 +0000)]
Merge "Remove <netinet/icmp6.h> ni_* macros."
Elliott Hughes [Mon, 8 Jul 2013 22:05:50 +0000 (15:05 -0700)]
Remove <netinet/icmp6.h> ni_* macros.
glibc doesn't have these, and they prevent ping from building out of
the box because it assumes it can define them.
Bug:
9671560
Change-Id: I815f2a9c4fd96a0ea2952eb5a71ddf51e0763660
Elliott Hughes [Mon, 8 Jul 2013 21:55:41 +0000 (14:55 -0700)]
am
ff145277: Merge "Upgrade to tzdata2013d."
* commit '
ff145277da9b7fe3d48a27839fc1d6f2ed11604b':
Upgrade to tzdata2013d.
Elliott Hughes [Mon, 8 Jul 2013 21:53:02 +0000 (21:53 +0000)]
Merge "Upgrade to tzdata2013d."
Elliott Hughes [Mon, 8 Jul 2013 21:51:15 +0000 (14:51 -0700)]
Upgrade to tzdata2013d.
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I87f992e4c406d4f254dc274f206536e9484024a2
Elliott Hughes [Mon, 8 Jul 2013 18:21:53 +0000 (11:21 -0700)]
am
e31c45c9: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
* commit '
e31c45c9fa5e0d2853941282e619b753550b82ae':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
Elliott Hughes [Mon, 8 Jul 2013 18:17:57 +0000 (18:17 +0000)]
Merge "Make bionic's <netinet/icmp6.h> standalone, like glibc's."
Elliott Hughes [Mon, 8 Jul 2013 18:16:24 +0000 (11:16 -0700)]
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
This removes the need for a bionic-specific hack in external/iproute2.
Bug:
9671560
Change-Id: I9f15be0711d26bca863bd66be9a39606500fb948
Elliott Hughes [Mon, 8 Jul 2013 17:34:41 +0000 (10:34 -0700)]
am
6b33f31b: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
* commit '
6b33f31b0994b8132bed8936685522e2e01754d8':
Fix IPv6 filtering definitions in netinet/icmp6.h.
Elliott Hughes [Mon, 8 Jul 2013 17:32:17 +0000 (17:32 +0000)]
Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
Lorenzo Colitti [Wed, 3 Jul 2013 06:42:06 +0000 (15:42 +0900)]
Fix IPv6 filtering definitions in netinet/icmp6.h.
Linux and *BSD kernels use opposite values to indicate pass/block
in ICMPv6 filters, and assign a different value to the
ICMP6_FILTER sockopt.
Bug:
9671560
Bug:
9469682
Change-Id: Ic0f1fcd48891add992acf97632f60aebd172c1d7
Elliott Hughes [Mon, 8 Jul 2013 17:12:32 +0000 (10:12 -0700)]
am
e63ea6ac: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
* commit '
e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
Elliott Hughes [Mon, 8 Jul 2013 17:08:52 +0000 (17:08 +0000)]
Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
Elliott Hughes [Wed, 3 Jul 2013 21:58:04 +0000 (14:58 -0700)]
Clean up <sys/mount.h>/<linux/fs.h> duplication.
Roll on uapi...
Bug:
6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
Nick Kralevich [Wed, 3 Jul 2013 21:28:14 +0000 (14:28 -0700)]
am
84983592: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
* commit '
84983592ade3ec7d72d082262fb6646849979bfc':
bionic_atomic_arm.h: Remove < ARMv6 support
Nick Kralevich [Wed, 3 Jul 2013 21:25:35 +0000 (21:25 +0000)]
Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
Nick Kralevich [Wed, 3 Jul 2013 21:14:06 +0000 (14:14 -0700)]
bionic_atomic_arm.h: Remove < ARMv6 support
This is dead code for most modern Android devices.
Bug:
9674955
Change-Id: Ic63a66b0331a0f07b9183f14a1d5e678c25e4b12