OSDN Git Service
Elliott Hughes [Thu, 11 Jul 2013 17:16:32 +0000 (10:16 -0700)]
am
731f7c2d: am
9d476716: Merge "Add <sys/statvfs.h>."
* commit '
731f7c2d0e531d5e0ecdd771d743053f8d093e16':
Add <sys/statvfs.h>.
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:13:35 +0000 (15:13 -0700)]
am
f3f72e7f: am
4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."
* commit '
f3f72e7f277215e9fede7c6f6695654cf7aa0c63':
Remove <netinet/icmp6.h> ni_* macros.
Elliott Hughes [Mon, 8 Jul 2013 22:09:57 +0000 (15:09 -0700)]
am
74b06f8d: am
ff145277: Merge "Upgrade to tzdata2013d."
* commit '
74b06f8ddcaaa48c7bab418d15aacaf513423ac3':
Upgrade to tzdata2013d.
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:27:53 +0000 (11:27 -0700)]
am
233050b1: am
e31c45c9: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
* commit '
233050b15ec3ce0db534ec6cc24a6061559993d2':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
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:38:41 +0000 (10:38 -0700)]
am
62bdd031: am
6b33f31b: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
* commit '
62bdd03120286708d8c1562eadf5dda00e24911c':
Fix IPv6 filtering definitions in netinet/icmp6.h.
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:17:38 +0000 (10:17 -0700)]
am
24400ac1: am
e63ea6ac: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
* commit '
24400ac1e390615ebcb45deacc1c9213b00f75ff':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
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:33:22 +0000 (14:33 -0700)]
am
601f968c: am
84983592: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
* commit '
601f968cedf015c060de8dcf21e7e10bf596901f':
bionic_atomic_arm.h: Remove < ARMv6 support
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
Elliott Hughes [Wed, 3 Jul 2013 20:45:45 +0000 (13:45 -0700)]
am
a8b954c5: am
de2781d9: Merge changes I01345c23,I3b57517c
* commit '
a8b954c51edd9ec8c09a5d1dccacaadf5869d78a':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Elliott Hughes [Wed, 3 Jul 2013 20:39:16 +0000 (13:39 -0700)]
am
de2781d9: Merge changes I01345c23,I3b57517c
* commit '
de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Elliott Hughes [Wed, 3 Jul 2013 20:37:28 +0000 (20:37 +0000)]
Merge changes I01345c23,I3b57517c
* changes:
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Lorenzo Colitti [Wed, 3 Jul 2013 02:57:15 +0000 (11:57 +0900)]
Include linux/termios.h from sys/ioctl.h.
On NetBSD and glibc, including sys/ioctl.h provides some
terminal ioctl data structures such as struct winsize. For
compatibility, provide these via sys/ioctl.h in bionic as well.
bionic does not have its own definitions for these structures, so
get them from the Linux kernel definitions.
Change-Id: I01345c23c0bebd60b0a80fc33668e7c0ad7356c3
Lorenzo Colitti [Wed, 3 Jul 2013 04:21:35 +0000 (13:21 +0900)]
Update linux/types.h to linux 2.6.20.
This picks up the source kernel header change
I984154487c38f6fa827bd78234f7fc2e4e1c383f .
Bug:
9469682
Change-Id: I3b57517cc6442ba4d0b8003d7398617e8226233f
Elliott Hughes [Wed, 3 Jul 2013 17:28:19 +0000 (10:28 -0700)]
am
fac9199c: am
ebc8ce1d: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
fac9199c7698481805dd9b1adaf89a2584719f4c':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Elliott Hughes [Wed, 3 Jul 2013 17:23:41 +0000 (10:23 -0700)]
am
ebc8ce1d: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
ebc8ce1de68a83d772106af98c7cb98150bb5662':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Elliott Hughes [Wed, 3 Jul 2013 17:21:47 +0000 (17:21 +0000)]
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
Will Newton [Wed, 3 Jul 2013 08:44:30 +0000 (09:44 +0100)]
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
This memcpy code uses NEON/VFP to achieve very good performance
on ARMv7-A processors. It is specifically tuned for A15 but should
provide good performance on A9 also. It is equivalent to the code
in cortex-strings rev 116.
This patch is a follow up the existing gerrit change:
I7f6f77995f3ca903ad9c66d14261441667a2a935
This version includes a tweak for performance on misaligned
buffers and splits the header comment into license and
documentation sections.
Change-Id: Ibd2e23c8d8e01357ba0247be1d05192de3ceba69
Signed-off-by: Will Newton <will.newton@linaro.org>
Elliott Hughes [Tue, 2 Jul 2013 23:05:34 +0000 (16:05 -0700)]
am
833dc584: am
87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
* commit '
833dc584d4d02ab8e396b877b38a8a5ad8ba4882':
Expose dn_comp and dn_expand to system C code.
Elliott Hughes [Tue, 2 Jul 2013 23:02:30 +0000 (16:02 -0700)]
am
87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
* commit '
87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
Elliott Hughes [Tue, 2 Jul 2013 23:00:37 +0000 (23:00 +0000)]
Merge "Expose dn_comp and dn_expand to system C code."
Lorenzo Colitti [Tue, 2 Jul 2013 08:44:00 +0000 (17:44 +0900)]
Expose dn_comp and dn_expand to system C code.
This is needed to compile open-source code that wants to
expand/compress domain names itself, such as ping6.
Bug:
9469682
Change-Id: I339c6538936d05c031bc6fb0a8793aaf1429dea4
Elliott Hughes [Tue, 2 Jul 2013 22:50:36 +0000 (15:50 -0700)]
am
7c808b29: am
feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
* commit '
7c808b29d5cea61e5bda90a1b0f2f0e669ee135e':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
Elliott Hughes [Tue, 2 Jul 2013 22:44:48 +0000 (15:44 -0700)]
am
feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
* commit '
feec97a7c7fbd032174fb4870a02422c2acd891a':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
Elliott Hughes [Tue, 2 Jul 2013 22:42:49 +0000 (22:42 +0000)]
Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
Elliott Hughes [Tue, 2 Jul 2013 22:23:38 +0000 (15:23 -0700)]
Fix inttypes.h PRI?PTR and SCN?PTR macros.
Our intptr_t and uintptr_t aren't "long". Add a compilation test so we remember
to fix this to cope with 32- and 64-bit later.
Bug: http://code.google.com/p/android/issues/detail?id=57218
Change-Id: I2f816d339edb4f7d57e4418b818fb4c602093f38
Nick Kralevich [Tue, 2 Jul 2013 19:52:43 +0000 (19:52 +0000)]
Merge "mmap: Don't call madvise if mmap fails"
Elliott Hughes [Tue, 2 Jul 2013 19:41:37 +0000 (12:41 -0700)]
am
dcd237a8: am
1ba3a2c2: Merge "Update icmp6.h to current NetBSD."
* commit '
dcd237a89707357ead904a2476bb2210e251c173':
Update icmp6.h to current NetBSD.
Elliott Hughes [Tue, 2 Jul 2013 19:34:36 +0000 (12:34 -0700)]
am
1ba3a2c2: Merge "Update icmp6.h to current NetBSD."
* commit '
1ba3a2c26937c68a4a0bd4fdffe95f5162077997':
Update icmp6.h to current NetBSD.
Nick Kralevich [Tue, 2 Jul 2013 19:28:03 +0000 (12:28 -0700)]
mmap: Don't call madvise if mmap fails
Fix improper check of return value from __mmap2. On a failed
mmap(), it returns MAP_FAILED, not 0. This ended up clobbering errno
when madvise subsequently failed.
Change-Id: I364fb2f158fe258c55a73e552195384b2c11c193
Elliott Hughes [Tue, 2 Jul 2013 16:40:42 +0000 (16:40 +0000)]
Merge "Update icmp6.h to current NetBSD."
Lorenzo Colitti [Mon, 1 Jul 2013 08:07:03 +0000 (17:07 +0900)]
Update icmp6.h to current NetBSD.
This adds a few bits we need such as RFC 6106 support and the
definition of MLD_LISTENER_REDUCTION.
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/icmp6.h?rev=1.47
Bug:
9469682
Change-Id: I97a4c2f0893012ce315334367c055097d0f8bb10
Christopher Ferris [Mon, 1 Jul 2013 17:39:08 +0000 (10:39 -0700)]
am
269daac2: am
7c14d67b: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
269daac2f1d76a478b83ba4cbb57d28b47eef5ec':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Christopher Ferris [Mon, 1 Jul 2013 17:32:17 +0000 (10:32 -0700)]
am
7c14d67b: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
* commit '
7c14d67bc1cc2679365a784e68518bf602b81dc7':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
Christopher Ferris [Mon, 1 Jul 2013 17:29:07 +0000 (17:29 +0000)]
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
Nick Kralevich [Mon, 1 Jul 2013 17:04:18 +0000 (10:04 -0700)]
am
28d298a6: am
413eef71: Merge "More FORTIFY_SOURCE functions under clang"
* commit '
28d298a673da4367f27f428db5e12d7dad3d8e83':
More FORTIFY_SOURCE functions under clang
Nick Kralevich [Mon, 1 Jul 2013 17:00:09 +0000 (10:00 -0700)]
am
413eef71: Merge "More FORTIFY_SOURCE functions under clang"
* commit '
413eef716f822d5eb4f57618f6780c6af5036460':
More FORTIFY_SOURCE functions under clang
Nick Kralevich [Mon, 1 Jul 2013 16:57:04 +0000 (16:57 +0000)]
Merge "More FORTIFY_SOURCE functions under clang"
Will Newton [Mon, 1 Jul 2013 10:15:27 +0000 (11:15 +0100)]
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
This memcpy code uses NEON/VFP to achieve very good performance
on ARMv7-A processors. It is specifically tuned for A15 but should
provide good performance on A9 also. It is equivalent to the code
in cortex-strings rev 116.
This patch is a follow up the existing gerrit change:
I7f6f77995f3ca903ad9c66d14261441667a2a935
But this version includes a tweak for performance on misaligned
buffers.
Change-Id: I285abac0068f8ae29a1cbf7862ea8590aadaf0a7
Signed-off-by: Will Newton <will.newton@linaro.org>
Nick Kralevich [Sat, 29 Jun 2013 15:15:25 +0000 (08:15 -0700)]
More FORTIFY_SOURCE functions under clang
* bzero
* umask
* strlcat
Change-Id: I65065208e0b8b37e10f6a266d5305de8fa9e59fc
Nick Kralevich [Fri, 28 Jun 2013 20:37:08 +0000 (13:37 -0700)]
am
a289964b: am
227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
* commit '
a289964bca39c591b54e0c336da1a6730e85cd61':
resolv_private.h: remove #define b64_ntop and b64_pton
Nick Kralevich [Fri, 28 Jun 2013 20:32:43 +0000 (13:32 -0700)]
am
227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
* commit '
227b47a461b27d746b373feb66001cdddc9ba1db':
resolv_private.h: remove #define b64_ntop and b64_pton
Nick Kralevich [Fri, 28 Jun 2013 20:31:11 +0000 (20:31 +0000)]
Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
Nick Kralevich [Fri, 28 Jun 2013 20:18:32 +0000 (13:18 -0700)]
resolv_private.h: remove #define b64_ntop and b64_pton
This was gated off of "#ifndef ADNROID_CHANGES" (note mispelling)
and is unconditionally defined in libc/include/resolv.h
(which this file includes). No need for duplicate definitions.
Change-Id: I00719bcf39eaa26eb96ab4274f171f3d2b5bae61
Nick Kralevich [Fri, 28 Jun 2013 20:15:39 +0000 (13:15 -0700)]
am
2018cfa8: am
394df35e: Merge "Reorganize FORTIFY_SOURCE tests."
* commit '
2018cfa85d4c7f36316376f5b090be5f0d3d13dc':
Reorganize FORTIFY_SOURCE tests.
Nick Kralevich [Fri, 28 Jun 2013 20:11:14 +0000 (13:11 -0700)]
am
394df35e: Merge "Reorganize FORTIFY_SOURCE tests."
* commit '
394df35e641816a3b9f0e065840b673dec9c73e5':
Reorganize FORTIFY_SOURCE tests.
Nick Kralevich [Fri, 28 Jun 2013 20:05:57 +0000 (20:05 +0000)]
Merge "Reorganize FORTIFY_SOURCE tests."
Nick Kralevich [Fri, 28 Jun 2013 17:34:09 +0000 (10:34 -0700)]
Reorganize FORTIFY_SOURCE tests.
Get rid of a lot of the duplication in the various FORTIFY_SOURCE
tests. Instead, we build 4 separate static libraries, with
4 different compile time options, and link them into the final test
binary.
Change-Id: Idb0b7cccc8dd837adb037bf4ddfe8942ae138230
Nick Kralevich [Thu, 27 Jun 2013 17:18:17 +0000 (10:18 -0700)]
am
f9ef0106: am
78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
* commit '
f9ef0106da43d21e6cb68d87b86d806f63b215fd':
stdio.h: enable vs?printf clang FORTIFY_SOURCE
Nick Kralevich [Thu, 27 Jun 2013 17:15:31 +0000 (10:15 -0700)]
am
78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
* commit '
78a7bf998d2d29592504984fcf419cd2701c6c54':
stdio.h: enable vs?printf clang FORTIFY_SOURCE
Nick Kralevich [Thu, 27 Jun 2013 17:13:25 +0000 (17:13 +0000)]
Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
Nick Kralevich [Thu, 27 Jun 2013 15:58:14 +0000 (08:58 -0700)]
stdio.h: enable vs?printf clang FORTIFY_SOURCE
Enable FORTIFY_SOURCE protections under clang for the following
functions:
* vsprintf
* vsnprintf
and add unittests.
Change-Id: I90f8a27f7b202c78b5dd8ebf53050bf9e33496f7
Colin Cross [Wed, 26 Jun 2013 01:29:14 +0000 (18:29 -0700)]
am
146d79c2: am
fbec57d4: Merge changes Ib496e818,I074204e9
* commit '
146d79c22a70d772defc63acfa6ac6128102a15f':
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
Colin Cross [Wed, 26 Jun 2013 00:08:48 +0000 (17:08 -0700)]
am
fbec57d4: Merge changes Ib496e818,I074204e9
* commit '
fbec57d46c42460b2381484d1610ff21922d162e':
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
Colin Cross [Wed, 26 Jun 2013 00:03:24 +0000 (00:03 +0000)]
Merge changes Ib496e818,I074204e9
* changes:
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
Elliott Hughes [Wed, 26 Jun 2013 00:02:11 +0000 (17:02 -0700)]
am
db6dd600: am
b116bf76: Merge "Switch to current upstream getopt_long."
* commit '
db6dd600d23eafb1742e5114bae7a4b8be4c04e1':
Switch to current upstream getopt_long.
Rom Lemarchand [Wed, 26 Jun 2013 00:02:06 +0000 (17:02 -0700)]
am
baa61864: am
995f17e6: Merge "libc: add swapon and swapoff syscalls"
* commit '
baa61864c515a56d4dbeac46b149b4317b01797b':
libc: add swapon and swapoff syscalls
Elliott Hughes [Wed, 26 Jun 2013 00:01:53 +0000 (17:01 -0700)]
am
51371ee0: am
c76550b3: Merge "Update x86 machine/endian.h from upstream"
* commit '
51371ee0d897285b869aa2af670e153ead471e03':
Update x86 machine/endian.h from upstream
Elliott Hughes [Wed, 26 Jun 2013 00:01:47 +0000 (17:01 -0700)]
am
d31287d6: am
7d624e9a: Merge "Kernel dso support for \'dl_iterate_phdr\' function"
* commit '
d31287d6017475209cfee2fea0532bdc8c0f4aac':
Kernel dso support for 'dl_iterate_phdr' function
Colin Cross [Tue, 25 Jun 2013 01:36:39 +0000 (18:36 -0700)]
bionic: add compatibility mode for properties
Allow a new bionic to work with an old init property area by supporting
the old format.
(cherry picked from commit
ad76c85b9ca587084089d086f954158bc0eae905)
Change-Id: Ib496e818a62a5834d40c71eb4745783d998be893
Colin Cross [Tue, 25 Jun 2013 01:42:21 +0000 (18:42 -0700)]
bionic: use the size of the file to determine property area size
On the reader size, don't assume that the property size is PA_SIZE,
read it from the size of the file. Allows init to use a different
property size without recompiling statically linked executables.
(cherry picked from commit
285b42a04cbe8e627a75c9bfb3c7cb3f7b539267)
Change-Id: I074204e9e6591b35faf7c1c58fb11ec162aff7bf
Nick Kralevich [Tue, 25 Jun 2013 23:30:53 +0000 (16:30 -0700)]
am
71802135: am
bfacb603: Merge "libc: enable FORTIFY_SOURCE snprintf under clang"
* commit '
7180213557f3120b391053b4f5861037eda6ebb6':
libc: enable FORTIFY_SOURCE snprintf under clang
Colin Cross [Tue, 25 Jun 2013 23:30:34 +0000 (16:30 -0700)]
am
a99e29e6: (-s ours) am
1642edb5: Merge changes Ib074192d,I6df3afed,I69070455,Icbe31908,Id3fa4526,I038d451f
* commit '
a99e29e61090da9c21c17cae54211083a2268d6e':
bionic: store property names as variable-length strings
bionic: prevent root processes from calling __system_property_add
bionic: revert to a single (larger) property area
bionic: reimplement property area as hybrid trie/binary tree
bionic: add missing memory barriers to system properties
bionic: make property area expandable
Elliott Hughes [Tue, 25 Jun 2013 22:58:53 +0000 (15:58 -0700)]
am
b116bf76: Merge "Switch to current upstream getopt_long."
* commit '
b116bf76286178a7d552c4d0a72b79212c8c93d1':
Switch to current upstream getopt_long.
Elliott Hughes [Tue, 25 Jun 2013 22:56:59 +0000 (22:56 +0000)]
Merge "Switch to current upstream getopt_long."
Rom Lemarchand [Tue, 25 Jun 2013 22:28:21 +0000 (15:28 -0700)]
am
995f17e6: Merge "libc: add swapon and swapoff syscalls"
* commit '
995f17e6a9a9903f03f542192da9a83b1cabc684':
libc: add swapon and swapoff syscalls
Rom Lemarchand [Tue, 25 Jun 2013 22:25:30 +0000 (22:25 +0000)]
Merge "libc: add swapon and swapoff syscalls"
Elliott Hughes [Tue, 25 Jun 2013 21:48:10 +0000 (14:48 -0700)]
Switch to current upstream getopt_long.
Change-Id: I4c646dcb8be9e88dd54d069a03bbc5fbfd92de03
Elliott Hughes [Tue, 25 Jun 2013 21:22:14 +0000 (14:22 -0700)]
am
c76550b3: Merge "Update x86 machine/endian.h from upstream"
* commit '
c76550b3377f50a2bc53536e2713e14edc8dbeac':
Update x86 machine/endian.h from upstream
Elliott Hughes [Tue, 25 Jun 2013 21:20:18 +0000 (21:20 +0000)]
Merge "Update x86 machine/endian.h from upstream"
Pavel Chupin [Fri, 19 Apr 2013 09:09:25 +0000 (13:09 +0400)]
Update x86 machine/endian.h from upstream
After download new version from upstream (OpenBSD 1.17) did the
following:
* changed all u_int* types to uint*
* add #include <sys/types.h>
All these changes are Android-specific and had been done before for
previous version (1.14).
Bug: http://code.google.com/p/android/issues/detail?id=54465
Change-Id: Ieb44e7fce4e794d997bb00ee0dd417fb61521720
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Colin Cross [Tue, 25 Jun 2013 01:36:39 +0000 (18:36 -0700)]
bionic: add compatibility mode for properties
Allow a new bionic to work with an old init property area by supporting
the old format.
Change-Id: I9268214b2f8930e75e3b5c26afe94fa92068bf0b
Colin Cross [Tue, 25 Jun 2013 01:42:21 +0000 (18:42 -0700)]
bionic: use the size of the file to determine property area size
On the reader size, don't assume that the property size is PA_SIZE,
read it from the size of the file. Allows init to use a different
property size without recompiling statically linked executables.
Change-Id: I87fb0bf40c4724e3759a583fd9ea1f49492bc958
Greg Hackmann [Fri, 21 Jun 2013 20:02:38 +0000 (13:02 -0700)]
bionic: store property names as variable-length strings
Names are immutable, so the fixed-sized arrays can be replaced with
variable-length ones to save memory (especially on internal tree nodes).
Change-Id: Iddf7856fba579b97f355e9ad4b3663a78767b96d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Colin Cross [Sun, 16 Jun 2013 17:19:16 +0000 (10:19 -0700)]
bionic: prevent root processes from calling __system_property_add
If a root process other than init calls __system_property_add, which
it should never do, it will break the design assumption that there is
only one mutator.
Pass O_EXCL to open() in map_prop_region_rw to ensure that only one
process ever has the property pages open for write.
Change-Id: I8233bfe0beaa40a5003ad53b98c661536b15f6b7
Greg Hackmann [Wed, 19 Jun 2013 20:31:21 +0000 (13:31 -0700)]
bionic: revert to a single (larger) property area
d329697 is too complicated. Change the multiple property pages back to
a single 128K property area that's mapped in entirely at initialization
(the memory will not get allocated until the pages are touched).
d329697 has other changes useful for testing (moving property area
initialization inside bionic and adding __system_property_set_filename)
so undo the change manually rather than with git revert.
Change-Id: Icd137669a4f8bc248e9dd2c1e8cc54e9193c9a6d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Mon, 17 Jun 2013 19:37:09 +0000 (12:37 -0700)]
bionic: add hierarchical properties test
Deliberately put items several levels deep in the trie hierarchy to test
the trie traversal
Change-Id: I995a1cdd3b5e74162fb5d25bc0f65140bdf2f719
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 20 Jun 2013 18:27:56 +0000 (11:27 -0700)]
bionic: reimplement property area as hybrid trie/binary tree
See the comments for an explanation of how properties are stored.
The trie structure is designed to scale better than the previous
array-based implementation. Searching an array with n properties
required average O(n) string compares of the entire key; searching the
trie requires average O(log n) string compares of each token (substrings
between '.' characters).
Change-Id: Ic28b3c5246004a3c502eb02d6e1c9b512884d872
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Rom Lemarchand [Thu, 6 Jun 2013 21:29:40 +0000 (14:29 -0700)]
libc: add swapon and swapoff syscalls
Change-Id: Ie79dc8e3f2ff1cd427dd6d95e3850920c4b407b0
Signed-off-by: Rom Lemarchand <romlem@google.com>
Elliott Hughes [Tue, 25 Jun 2013 20:17:37 +0000 (13:17 -0700)]
am
7d624e9a: Merge "Kernel dso support for \'dl_iterate_phdr\' function"
* commit '
7d624e9aff4c6addea7f2275fe58ff0815d95c70':
Kernel dso support for 'dl_iterate_phdr' function
Elliott Hughes [Tue, 25 Jun 2013 20:15:29 +0000 (20:15 +0000)]
Merge "Kernel dso support for 'dl_iterate_phdr' function"