Elliott Hughes
b611d36c3a
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.
2013-07-08 10:17:38 -07:00
Elliott Hughes
24400ac1e3
am e63ea6ac
: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit 'e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:12:32 -07:00
Elliott Hughes
e63ea6aca7
Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
2013-07-08 17:08:52 +00:00
The Android Automerger
1456ec759c
merge in klp-release history after reset to master
2013-07-08 06:00:29 -07:00
Elliott Hughes
e42e51d563
Clean up <sys/mount.h>/<linux/fs.h> duplication.
...
Roll on uapi...
Bug: 6340120
Change-Id: Ic9521905683946e836574e4d768e34853ea777fa
2013-07-03 14:58:04 -07:00
Nick Kralevich
20cb10824b
am 601f968c
: am 84983592
: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '601f968cedf015c060de8dcf21e7e10bf596901f':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:33:22 -07:00
Nick Kralevich
601f968ced
am 84983592
: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '84983592ade3ec7d72d082262fb6646849979bfc':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:28:14 -07:00
Nick Kralevich
84983592ad
Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
2013-07-03 21:25:35 +00:00
Nick Kralevich
e91f71783b
bionic_atomic_arm.h: Remove < ARMv6 support
...
This is dead code for most modern Android devices.
Bug: 9674955
Change-Id: Ic63a66b0331a0f07b9183f14a1d5e678c25e4b12
2013-07-03 14:14:06 -07:00
Elliott Hughes
1f75ee8606
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.
2013-07-03 13:45:45 -07:00
Elliott Hughes
a8b954c51e
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.
2013-07-03 13:39:16 -07:00
Elliott Hughes
de2781d906
Merge changes I01345c23,I3b57517c
...
* changes:
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 20:37:28 +00:00
Lorenzo Colitti
f936ef1a9f
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
2013-07-03 13:35:18 -07:00
Lorenzo Colitti
d7b0d6e1e1
Update linux/types.h to linux 2.6.20.
...
This picks up the source kernel header change
I984154487c38f6fa827bd78234f7fc2e4e1c383f .
Bug: 9469682
Change-Id: I3b57517cc6442ba4d0b8003d7398617e8226233f
2013-07-03 13:15:20 -07:00
Elliott Hughes
be438a4c40
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.
2013-07-03 10:28:19 -07:00
Elliott Hughes
fac9199c76
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.
2013-07-03 10:23:41 -07:00
Elliott Hughes
ebc8ce1de6
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
2013-07-03 17:21:47 +00:00
Will Newton
2753e12af5
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>
2013-07-03 10:20:43 -07:00
Elliott Hughes
997368d60d
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.
2013-07-02 16:05:34 -07:00
Elliott Hughes
833dc584d4
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.
2013-07-02 16:02:30 -07:00
Elliott Hughes
87b4286f09
Merge "Expose dn_comp and dn_expand to system C code."
2013-07-02 23:00:38 +00:00
Lorenzo Colitti
b8e435c1d5
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
2013-07-02 15:57:57 -07:00
Elliott Hughes
742aad3584
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.
2013-07-02 15:50:36 -07:00
Elliott Hughes
7c808b29d5
am feec97a7
: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
...
* commit 'feec97a7c7fbd032174fb4870a02422c2acd891a':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
2013-07-02 15:44:48 -07:00
Elliott Hughes
feec97a7c7
Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
2013-07-02 22:42:49 +00:00
Elliott Hughes
74f0833df6
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
2013-07-02 15:35:27 -07:00
Nick Kralevich
e4723161d5
Merge "mmap: Don't call madvise if mmap fails"
2013-07-02 19:52:44 +00:00
Elliott Hughes
2aac0fcc20
am dcd237a8
: am 1ba3a2c2
: Merge "Update icmp6.h to current NetBSD."
...
* commit 'dcd237a89707357ead904a2476bb2210e251c173':
Update icmp6.h to current NetBSD.
2013-07-02 12:41:37 -07:00
Elliott Hughes
dcd237a897
am 1ba3a2c2
: Merge "Update icmp6.h to current NetBSD."
...
* commit '1ba3a2c26937c68a4a0bd4fdffe95f5162077997':
Update icmp6.h to current NetBSD.
2013-07-02 12:34:36 -07:00
Nick Kralevich
553a5ec407
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
2013-07-02 12:31:07 -07:00
Elliott Hughes
1ba3a2c269
Merge "Update icmp6.h to current NetBSD."
2013-07-02 16:40:42 +00:00
Lorenzo Colitti
ce7c404dc7
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
2013-07-02 09:38:59 -07:00
The Android Automerger
9db12e44af
merge in klp-release history after reset to master
2013-07-02 07:07:20 -07:00
Christopher Ferris
c6ac3ae269
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.
2013-07-01 10:39:08 -07:00
Christopher Ferris
269daac2f1
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.
2013-07-01 10:32:17 -07:00
Christopher Ferris
7c14d67bc1
Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
2013-07-01 17:29:07 +00:00
Nick Kralevich
4b17283c98
am 28d298a6
: am 413eef71
: Merge "More FORTIFY_SOURCE functions under clang"
...
* commit '28d298a673da4367f27f428db5e12d7dad3d8e83':
More FORTIFY_SOURCE functions under clang
2013-07-01 10:04:18 -07:00
Nick Kralevich
28d298a673
am 413eef71
: Merge "More FORTIFY_SOURCE functions under clang"
...
* commit '413eef716f822d5eb4f57618f6780c6af5036460':
More FORTIFY_SOURCE functions under clang
2013-07-01 10:00:09 -07:00
Nick Kralevich
413eef716f
Merge "More FORTIFY_SOURCE functions under clang"
2013-07-01 16:57:05 +00:00
The Android Automerger
5da8df2840
merge in klp-release history after reset to master
2013-07-01 07:07:20 -07:00
Will Newton
b61103dff4
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>
2013-07-01 11:15:27 +01:00
Nick Kralevich
a6cde39276
More FORTIFY_SOURCE functions under clang
...
* bzero
* umask
* strlcat
Change-Id: I65065208e0b8b37e10f6a266d5305de8fa9e59fc
2013-06-29 08:16:22 -07:00
Nick Kralevich
22570f51a5
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
2013-06-28 13:37:08 -07:00
Nick Kralevich
a289964bca
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
2013-06-28 13:32:43 -07:00
Nick Kralevich
227b47a461
Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
2013-06-28 20:31:11 +00:00
Nick Kralevich
ca43d73d23
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
2013-06-28 13:18:32 -07:00
Nick Kralevich
fda0c06605
am 2018cfa8
: am 394df35e
: Merge "Reorganize FORTIFY_SOURCE tests."
...
* commit '2018cfa85d4c7f36316376f5b090be5f0d3d13dc':
Reorganize FORTIFY_SOURCE tests.
2013-06-28 13:15:39 -07:00
Nick Kralevich
2018cfa85d
am 394df35e
: Merge "Reorganize FORTIFY_SOURCE tests."
...
* commit '394df35e641816a3b9f0e065840b673dec9c73e5':
Reorganize FORTIFY_SOURCE tests.
2013-06-28 13:11:14 -07:00
Nick Kralevich
394df35e64
Merge "Reorganize FORTIFY_SOURCE tests."
2013-06-28 20:05:57 +00:00
Nick Kralevich
5bcf39842e
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
2013-06-28 11:54:29 -07:00