OSDN Git Service
Elliott Hughes [Thu, 19 Sep 2013 19:05:08 +0000 (12:05 -0700)]
am
269851bf: Merge "Declare __page_shift and __page_size with C linkage."
* commit '
269851bf950049f16eeb2a402f700952480bcecf':
Declare __page_shift and __page_size with C linkage.
Elliott Hughes [Thu, 19 Sep 2013 19:03:18 +0000 (19:03 +0000)]
Merge "Declare __page_shift and __page_size with C linkage."
Bernhard Rosenkraenzer [Wed, 18 Sep 2013 21:29:08 +0000 (23:29 +0200)]
Declare __page_shift and __page_size with C linkage.
__page_shift and __page_size were accidentally declared in unistd.h with
C linkage - their implementation needs to use the same linkage.
Going forward, though, let's stop the inlining madness and let's kill
the non-standard __getpageshift(). This patch takes getpagesize(3) out
of line and removes __getpageshift but fixes __page_shift and __page_size
for backwards binary compatibility.
Change-Id: I35ed66a08989ced1db422eb03e4d154a5d6b5bda
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Elliott Hughes [Thu, 19 Sep 2013 18:44:11 +0000 (11:44 -0700)]
am
a259472c: Merge "Fix mismatch between declaration and forward declaration"
* commit '
a259472ca076ee230523e63502999be13a3f72d2':
Fix mismatch between declaration and forward declaration
Elliott Hughes [Thu, 19 Sep 2013 18:41:05 +0000 (18:41 +0000)]
Merge "Fix mismatch between declaration and forward declaration"
Elliott Hughes [Thu, 19 Sep 2013 18:21:21 +0000 (11:21 -0700)]
am
045f311b: Merge "Use and to find the tzdata."
* commit '
045f311b0a5b3ceed09dfc4b4246c99183a2cef4':
Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.
Elliott Hughes [Thu, 19 Sep 2013 18:19:00 +0000 (18:19 +0000)]
Merge "Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata."
Elliott Hughes [Thu, 19 Sep 2013 02:25:28 +0000 (19:25 -0700)]
Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.
This lets us run binaries linked against bionic on an x86 host.
Change-Id: Icd60cf99a90d747c77304c05b4f764e4d26af985
Nick Kralevich [Thu, 19 Sep 2013 04:06:43 +0000 (21:06 -0700)]
am
814bbd52: Merge "Update netlink.h from tip-of-tree external/kernel-headers"
* commit '
814bbd521affba78db04135515bae1f5e099bbd9':
Update netlink.h from tip-of-tree external/kernel-headers
Nick Kralevich [Thu, 19 Sep 2013 04:04:06 +0000 (04:04 +0000)]
Merge "Update netlink.h from tip-of-tree external/kernel-headers"
Elliott Hughes [Thu, 19 Sep 2013 02:17:55 +0000 (19:17 -0700)]
am
4a509d89: Merge "Add bionic-unit-tests-run-on-host special target"
* commit '
4a509d898e24cefe0f7f0edf927b11ce7c304c81':
Add bionic-unit-tests-run-on-host special target
Elliott Hughes [Thu, 19 Sep 2013 02:16:00 +0000 (02:16 +0000)]
Merge "Add bionic-unit-tests-run-on-host special target"
Pavel Chupin [Fri, 6 Sep 2013 14:43:27 +0000 (18:43 +0400)]
Add bionic-unit-tests-run-on-host special target
Allows running the tests linked with bionic .so on the host if host and
target are compatible. See more comments and usage limitation inlined.
make bionic-unit-tests-run-on-host should do build and run.
Change-Id: I5946fa72e009d324baa9da18f460294b3c1a615e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Nick Kralevich [Thu, 19 Sep 2013 00:14:02 +0000 (17:14 -0700)]
Update netlink.h from tip-of-tree external/kernel-headers
This file was generated using bionic/libc/kernel/tools/update_all.py
The only change is a new netlink.h file, from external/kernel-headers.
Please see the commit message there for details.
Change-Id: I83645b88f0baff838131197913ebd70be69abd3f
Bernhard Rosenkraenzer [Wed, 18 Sep 2013 21:37:00 +0000 (23:37 +0200)]
Fix mismatch between declaration and forward declaration
KernelArgumentBlock is defined as a class in KernelArgumentBlock.h, but
forward declarations refer to it as a struct.
While this is essentially the same, the mismatch causes a compiler
warning in clang (and may cause warnings in future versions of gcc) in
code that is supposed to be compiled with -Werror.
Change-Id: I4ba49d364c44d0a42c276aff3a8098300dbdcdf0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Brian Carlstrom [Sat, 14 Sep 2013 00:02:51 +0000 (17:02 -0700)]
am
8512992f: Merge "Simplify main thread stack size initialization"
* commit '
8512992f50e8444c1985bbeb17c3385a58fc0fed':
Simplify main thread stack size initialization
Brian Carlstrom [Sat, 14 Sep 2013 00:02:50 +0000 (17:02 -0700)]
am
850f59d8: Merge "Use kernel default for initial thread size"
* commit '
850f59d8516c7060be9484e9771aa54231e8ff48':
Use kernel default for initial thread size
Brian Carlstrom [Sat, 14 Sep 2013 00:00:41 +0000 (00:00 +0000)]
Merge "Simplify main thread stack size initialization"
Brian Carlstrom [Sat, 14 Sep 2013 00:00:33 +0000 (00:00 +0000)]
Merge "Use kernel default for initial thread size"
Brian Carlstrom [Fri, 13 Sep 2013 23:34:43 +0000 (16:34 -0700)]
Simplify main thread stack size initialization
Change-Id: Iec09433d9de501031cce09dc75848a5e8f3d96bf
Brian Carlstrom [Fri, 13 Sep 2013 04:47:20 +0000 (21:47 -0700)]
Use kernel default for initial thread size
Bug:
10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
Christopher Ferris [Fri, 6 Sep 2013 17:54:56 +0000 (10:54 -0700)]
am
98c726ec: Merge "Add the dl_iterate_phdr function to libdl for arm."
* commit '
98c726ec9b40e75efdd3ea027cd9cc627329f85e':
Add the dl_iterate_phdr function to libdl for arm.
Christopher Ferris [Fri, 6 Sep 2013 17:52:35 +0000 (17:52 +0000)]
Merge "Add the dl_iterate_phdr function to libdl for arm."
Christopher Ferris [Tue, 20 Aug 2013 00:45:09 +0000 (17:45 -0700)]
Add the dl_iterate_phdr function to libdl for arm.
Bug:
8410085
Merge from internal master.
(cherry-picked from
cb491bc66dc0abc145930b09086eb9189a30f6c2)
Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f
Elliott Hughes [Tue, 3 Sep 2013 21:09:08 +0000 (14:09 -0700)]
am
df7436e7: Merge "Avoid segfaults if properties are not initialized"
* commit '
df7436e709035fb6f5667980042848c8b4ca3e79':
Avoid segfaults if properties are not initialized
Elliott Hughes [Tue, 3 Sep 2013 21:07:15 +0000 (21:07 +0000)]
Merge "Avoid segfaults if properties are not initialized"
Elliott Hughes [Tue, 3 Sep 2013 21:05:51 +0000 (14:05 -0700)]
am
afa31042: Merge "Fix strchr for basic non-sse case on x86"
* commit '
afa310427e04f067976e5b979e2cceb3d759bf3f':
Fix strchr for basic non-sse case on x86
Elliott Hughes [Tue, 3 Sep 2013 21:03:39 +0000 (21:03 +0000)]
Merge "Fix strchr for basic non-sse case on x86"
Pavel Chupin [Fri, 26 Jul 2013 12:50:11 +0000 (16:50 +0400)]
Fix strchr for basic non-sse case on x86
Fix source location. Move declaration of __strchr_chk out of
ifdef __BIONIC_FORTIFY which should be available for strchr.cpp
compilation when __BIONIC_FORTIFY is not defined.
Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Pavel Chupin [Fri, 9 Aug 2013 15:17:55 +0000 (19:17 +0400)]
Avoid segfaults if properties are not initialized
Null or constant dereferencing occurs if properties are not initialized.
On Android devices it shouldn't happen but can be faced if testing bionic
libc.so on Linux host.
Change-Id: I8f047cbe17d0e7bcde40ace000a8aa53789c16cb
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Christopher Ferris [Thu, 29 Aug 2013 21:16:18 +0000 (14:16 -0700)]
am
99b859cf: Merge "Move stack unwinding test into library."
* commit '
99b859cf786f208300f7fc3a6fa5b570c3333433':
Move stack unwinding test into library.
Christopher Ferris [Thu, 29 Aug 2013 21:13:21 +0000 (21:13 +0000)]
Merge "Move stack unwinding test into library."
Christopher Ferris [Thu, 29 Aug 2013 18:37:33 +0000 (11:37 -0700)]
Move stack unwinding test into library.
Bug:
8291716
Change-Id: Ia270f074b574a8fe86b5ad435bdef80999c64295
Nick Kralevich [Wed, 28 Aug 2013 21:33:59 +0000 (14:33 -0700)]
am
4e3ed44d: Merge "cdefs.h: introduce __bos0"
* commit '
4e3ed44db1200ca810842b0667e7fc80125de28d':
cdefs.h: introduce __bos0
Nick Kralevich [Wed, 28 Aug 2013 21:31:55 +0000 (21:31 +0000)]
Merge "cdefs.h: introduce __bos0"
Nick Kralevich [Wed, 28 Aug 2013 20:22:52 +0000 (13:22 -0700)]
cdefs.h: introduce __bos0
Introduce __bos0 as a #define for __builtin_object_size((s), 0).
This macro is intended to be used for places where the standard
__bos macro isn't appropriate.
memcpy, memmove, and memset deliberately use __bos0. This is done
for two reasons:
1) I haven't yet tested to see if __bos is safe to use.
2) glibc uses __bos0 for these methods.
Change-Id: Ifbe02efdb10a72fe3529dbcc47ff647bde6feeca
Nick Kralevich [Wed, 28 Aug 2013 20:05:38 +0000 (13:05 -0700)]
am
eb8f3622: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
* commit '
eb8f36223e51db626a23b8032f03c095be80998b':
FORTIFY_SOURCE: introduce __strncpy_chk2
Nick Kralevich [Wed, 28 Aug 2013 20:04:06 +0000 (20:04 +0000)]
Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
Nick Kralevich [Wed, 28 Aug 2013 17:47:43 +0000 (10:47 -0700)]
FORTIFY_SOURCE: introduce __strncpy_chk2
This change detects programs reading beyond the end of "src" when
calling strncpy.
Change-Id: Ie1b42de923385d62552b22c27b2d4713ab77ee03
Christopher Ferris [Wed, 28 Aug 2013 00:38:07 +0000 (17:38 -0700)]
am
2557433d: Merge "Change hard-coded directory."
* commit '
2557433d8ea4c489f061170822f34f038b930b96':
Change hard-coded directory.
Christopher Ferris [Wed, 28 Aug 2013 00:35:11 +0000 (00:35 +0000)]
Merge "Change hard-coded directory."
Christopher Ferris [Wed, 28 Aug 2013 00:21:37 +0000 (17:21 -0700)]
Change hard-coded directory.
The tests are using /data/data which is not accessible to a non-root
user. Change this to /data/local/tmp which is accessible to all users.
Bug:
8291716
Change-Id: I66476bbbaf5d1dc0c103863abf9219405f06a85b
Christopher Ferris [Wed, 28 Aug 2013 00:20:39 +0000 (17:20 -0700)]
am
1f216e30: Merge "Create bionic unit test library for use with CTS."
* commit '
1f216e30b6a9301211193d05f995cdefbdc9619f':
Create bionic unit test library for use with CTS.
Christopher Ferris [Wed, 28 Aug 2013 00:19:06 +0000 (00:19 +0000)]
Merge "Create bionic unit test library for use with CTS."
Nick Kralevich [Wed, 28 Aug 2013 00:08:11 +0000 (17:08 -0700)]
am
22f5ef6b: Merge "Delete CAVEATS / fix spelling."
* commit '
22f5ef6b84057bf56f023263859a9b45eccd620b':
Delete CAVEATS / fix spelling.
Nick Kralevich [Wed, 28 Aug 2013 00:06:19 +0000 (00:06 +0000)]
Merge "Delete CAVEATS / fix spelling."
Nick Kralevich [Tue, 27 Aug 2013 23:35:01 +0000 (16:35 -0700)]
Delete CAVEATS / fix spelling.
Change-Id: I0ed504271b7c2e4434d0d5f53bc10335c8cf7b5b
Christopher Ferris [Tue, 27 Aug 2013 21:32:15 +0000 (14:32 -0700)]
Create bionic unit test library for use with CTS.
Bug:
8291716
Change-Id: I46b749348456fae7892eecca6b44aef51a0e4747
Elliott Hughes [Mon, 26 Aug 2013 17:09:36 +0000 (10:09 -0700)]
am
33dd7c11: Merge "Add explicit -m32/-melf_i386 for x86 target"
* commit '
33dd7c116d652223b5bf3dabe49641c310d1216b':
Add explicit -m32/-melf_i386 for x86 target
Elliott Hughes [Mon, 26 Aug 2013 17:05:31 +0000 (17:05 +0000)]
Merge "Add explicit -m32/-melf_i386 for x86 target"
Robert Greenwalt [Sat, 24 Aug 2013 12:40:18 +0000 (05:40 -0700)]
am
c6135ba7: Merge "Change how DNS resolver handle no default iface"
* commit '
c6135ba76db027d85751f84bf648a865609c0e1b':
Change how DNS resolver handle no default iface
Robert Greenwalt [Sat, 24 Aug 2013 12:35:08 +0000 (12:35 +0000)]
Merge "Change how DNS resolver handle no default iface"
Pavel Chupin [Fri, 16 Aug 2013 14:11:13 +0000 (18:11 +0400)]
Add explicit -m32/-melf_i386 for x86 target
Required for x86 build with multilib compiler.
Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Robert Greenwalt [Thu, 22 Aug 2013 23:56:48 +0000 (16:56 -0700)]
Change how DNS resolver handle no default iface
We used to just try any iface we'd been told about as a
fallback, but that will end up mistakenly using a secondary
network's dns when we really don't have a default connection.
It also messed up our detection of whether we were doing the
lookup on the default or not (we'd get back our secondary net
iface as the default, do the compare and think we were on default).
Remove the lies and let dns fail if we don't have an iface for it.
bug:
10132565
Change-Id: I5f0f2abacaaaaf23c5292b20fba9d8dcb6fb10c5
Elliott Hughes [Thu, 22 Aug 2013 21:30:42 +0000 (14:30 -0700)]
Elliott Hughes [Thu, 22 Aug 2013 21:27:55 +0000 (21:27 +0000)]
Elliott Hughes [Thu, 22 Aug 2013 21:13:50 +0000 (14:13 -0700)]
Apply upstream commit
943a6621866e9d6e654f5cfe1494378c1fb8957a.
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu Aug 22 12:47:51 2013 -0700
* localtime.c: Fix another integer overflow bug in mktime.
(time2sub): Avoid undefined behavior on time_t overflow.
Reported by Elliott Hughes in
<http://mm.icann.org/pipermail/tz/2013-August/019580.html>.
Bug:
10310929
Change-Id: I3bf26f1f91371552e0a3828457d27e22af55acb2
Elliott Hughes [Thu, 22 Aug 2013 19:25:10 +0000 (12:25 -0700)]
am
c44205cf: Merge "Work around tzcode\'s reliance on signed overflow."
* commit '
c44205cf717fc8ab8ccaf3631032fa236ba61a86':
Work around tzcode's reliance on signed overflow.
Elliott Hughes [Thu, 22 Aug 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Work around tzcode's reliance on signed overflow."
Elliott Hughes [Thu, 22 Aug 2013 18:37:32 +0000 (11:37 -0700)]
Work around tzcode's reliance on signed overflow.
I've mailed the tz list about this, and will switch to whatever upstream
fix comes along as soon as it's available.
Bug:
10310929
Change-Id: I36bf3fcf11f5ac9b88137597bac3487a7bb81b0f
Brian Carlstrom [Wed, 21 Aug 2013 17:28:51 +0000 (10:28 -0700)]
am
bb34907f: Merge "Make mips_relocate_got tolerate a missing got"
* commit '
bb34907ff5f60cf1600e83ea1bb4a6c26da6854e':
Make mips_relocate_got tolerate a missing got
Brian Carlstrom [Wed, 21 Aug 2013 17:25:48 +0000 (17:25 +0000)]
Merge "Make mips_relocate_got tolerate a missing got"
Brian Carlstrom [Wed, 21 Aug 2013 04:05:44 +0000 (21:05 -0700)]
Make mips_relocate_got tolerate a missing got
Bug:
10094803
(cherry picked from commit
7ee26878065abb494600595349ce58b2b2db3709)
Change-Id: Ib15bccecaee421dc463d46a3956b054051708759
Christopher Ferris [Fri, 16 Aug 2013 19:21:55 +0000 (12:21 -0700)]
am
c8039337: Merge "Change hard-coded temporary directory."
* commit '
c8039337e3ee608e23f8ca6e5ea123d938b08029':
Change hard-coded temporary directory.
Elliott Hughes [Fri, 16 Aug 2013 19:21:46 +0000 (12:21 -0700)]
am
4eacb341: Merge "Fix pthread_getcpuclockid."
* commit '
4eacb34132b3162cc3716edfee8bad528d84c16f':
Fix pthread_getcpuclockid.
Christopher Ferris [Fri, 16 Aug 2013 03:13:42 +0000 (03:13 +0000)]
Merge "Change hard-coded temporary directory."
Christopher Ferris [Fri, 16 Aug 2013 02:20:43 +0000 (19:20 -0700)]
Merge commit '
cf052994' into manualmerge
Fixing merge conflict and pulling in all of the changes that I stupidly
marked as not requiring a merge.
Conflicts:
libc/arch-arm/arm.mk
libc/arch-arm/cortex-a15/bionic/memcpy.S
libc/arch-arm/cortex-a15/bionic/memset.S
libc/arch-arm/cortex-a9/bionic/memcpy.S
libc/arch-arm/cortex-a9/bionic/memset.S
libc/arch-arm/cortex-a9/cortex-a9.mk
libc/arch-arm/krait/bionic/memcpy.S
libc/arch-arm/krait/bionic/memset.S
libc/arch-arm/krait/krait.mk
Change-Id: I5da280dd8700681f118719c964a4d13446db51db
Elliott Hughes [Thu, 15 Aug 2013 22:34:58 +0000 (22:34 +0000)]
Merge "Fix pthread_getcpuclockid."
Jeff Hao [Thu, 15 Aug 2013 21:51:16 +0000 (14:51 -0700)]
Fix pthread_getcpuclockid.
clock_gettime was returning EINVAL for the values
produced by pthread_getcpuclockid.
Bug:
10346183
Change-Id: Iabe643d7d46110bb311a0367aa0fc737f653208e
Christopher Ferris [Thu, 15 Aug 2013 20:02:59 +0000 (20:02 +0000)]
Merge "Create optimized __strcpy_chk/__strcat_chk."
Christopher Ferris [Thu, 15 Aug 2013 19:54:40 +0000 (12:54 -0700)]
Change hard-coded temporary directory.
The properties tests creates a temporary directory in /data/nativetest,
but this directory might not exist in all circumstances.
Change this to create the temporary directory in /data/local/tmp.
Change-Id: I812d3e24fcd084c5d74055c9faa95b1656f255bc
Christopher Ferris [Thu, 15 Aug 2013 18:14:56 +0000 (11:14 -0700)]
am
c5cf5370: (-s ours) Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."
* commit '
c5cf53701a5e04aeead70b1298bb38c51633e96d':
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
Christopher Ferris [Wed, 7 Aug 2013 20:09:51 +0000 (13:09 -0700)]
Create optimized __strcpy_chk/__strcat_chk.
This change pulls the memcpy code out into a new file so that the
__strcpy_chk and __strcat_chk can use it with an include.
The new versions of the two chk functions uses assembly versions
of strlen and memcpy to implement this check. This allows near
parity with the assembly versions of strcpy/strcat. It also means that
as memcpy implementations get faster, so do the chk functions.
Other included changes:
- Change all of the assembly labels to local labels. The other labels
confuse gdb and mess up backtracing.
- Add .cfi_startproc and .cfi_endproc directives so that gdb is not
confused when falling through from one function to another.
- Change all functions to use cfi directives since they are more powerful.
- Move the memcpy_chk fail code outside of the memcpy function definition
so that backtraces work properly.
- Preserve lr before the calls to __fortify_chk_fail so that the backtrace
actually works.
Testing:
- Ran the bionic unit tests. Verified all error messages in logs are set
correctly.
- Ran libc_test, replacing strcpy with __strcpy_chk and replacing
strcat with __strcat_chk.
- Ran the debugger on nexus10, nexus4, and old nexus7. Verified that the
backtrace is correct for all fortify check failures. Also verify that
when falling through from __memcpy_chk to memcpy that the backtrace is
still correct. Also verified the same for __memset_chk and bzero.
Verified the two different paths in the cortex-a9 memset routine that
save variables to the stack still show the backtrace properly.
Bug:
9293744
(cherry-picked from
2be91915dcecc956d14ff281db0c7d216ca98af2)
Change-Id: Ia407b74d3287d0b6af0139a90b6eb3bfaebf2155
Christopher Ferris [Thu, 15 Aug 2013 18:11:02 +0000 (18:11 +0000)]
Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."
Christopher Ferris [Thu, 1 Aug 2013 20:13:33 +0000 (13:13 -0700)]
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
This change creates assembler versions of __memcpy_chk/__memset_chk
that is implemented in the memcpy/memset assembler code. This change
avoids an extra call to memcpy/memset, instead allowing a simple fall
through to occur from the chk code into the body of the real
implementation.
Testing:
- Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices.
- Wrote a small test executable that has three calls to __memcpy_chk and
three calls to __memset_chk. First call dest_len is length + 1. Second
call dest_len is length. Third call dest_len is length - 1.
Verified that the first two calls pass, and the third fails. Examined
the logcat output on all nexus devices to verify that the fortify
error message was sent properly.
- I benchmarked the new __memcpy_chk and __memset_chk on all systems. For
__memcpy_chk and large copies, the savings is relatively small (about 1%).
For small copies, the savings is large on cortex-a15/krait devices
(between 5% to 30%).
For cortex-a9 and small copies, the speed up is present, but relatively
small (about 3% to 5%).
For __memset_chk and large copies, the savings is also small (about 1%).
However, all processors show larger speed-ups on small copies (about 30% to
100%).
Bug:
9293744
Merge from internal master.
(cherry-picked from
7c860db0747f6276a6e43984d43f8fa5181ea936)
Change-Id: I916ad305e4001269460ca6ebd38aaa0be8ac7f52
Brian Carlstrom [Wed, 14 Aug 2013 22:54:08 +0000 (15:54 -0700)]
am
c85e0dbb: Merge "Add more information to error due to truncated Elf32_Ehdr"
* commit '
c85e0dbb0b8d602f930cf7ae99901730c1c6a26a':
Add more information to error due to truncated Elf32_Ehdr
Brian Carlstrom [Wed, 14 Aug 2013 22:51:47 +0000 (22:51 +0000)]
Merge "Add more information to error due to truncated Elf32_Ehdr"
Brian Carlstrom [Wed, 14 Aug 2013 08:04:19 +0000 (01:04 -0700)]
Add more information to error due to truncated Elf32_Ehdr
Change-Id: I24f30bd0c1120bcf85d77f5c4e69f0fefe9a2478
Michael Wright [Wed, 14 Aug 2013 20:47:03 +0000 (13:47 -0700)]
am
5e4a2f31: Merge "Update kernel input headers"
* commit '
5e4a2f3174485678d461d6b0eeb11a5e9a32e531':
Update kernel input headers
Michael Wright [Wed, 14 Aug 2013 20:45:19 +0000 (20:45 +0000)]
Merge "Update kernel input headers"
Michael Wright [Wed, 14 Aug 2013 15:50:02 +0000 (08:50 -0700)]
Update kernel input headers
To upstream SHA
e1c85813f3832b909d1c4309b213bb0a52c79ba5
Change-Id: I72ee3d59c105bc0252b5ca0c49c569d12ec685d1
Elliott Hughes [Tue, 13 Aug 2013 21:43:26 +0000 (14:43 -0700)]
am
ff9b7aa6: Merge "Make ctype.h a little less unhygienic."
* commit '
ff9b7aa695bd4860c0551b8899f2f26311174855':
Make ctype.h a little less unhygienic.
Elliott Hughes [Tue, 13 Aug 2013 21:40:13 +0000 (21:40 +0000)]
Merge "Make ctype.h a little less unhygienic."
Elliott Hughes [Tue, 13 Aug 2013 21:30:59 +0000 (14:30 -0700)]
Make ctype.h a little less unhygienic.
This caused trouble for stlport.
Change-Id: Id40787c5a2b7a3a4e12fb557efe549778a01cbbd
Elliott Hughes [Mon, 12 Aug 2013 20:25:48 +0000 (13:25 -0700)]
am
c933493a: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
* commit '
c933493ac28c40558f369d175da738ba601d8499':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
Elliott Hughes [Mon, 12 Aug 2013 20:23:34 +0000 (20:23 +0000)]
Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
Elliott Hughes [Mon, 12 Aug 2013 19:07:05 +0000 (12:07 -0700)]
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
Change-Id: I94c411c22634e43184445c82e7388e51fc46a8cc
Elliott Hughes [Fri, 9 Aug 2013 00:41:15 +0000 (17:41 -0700)]
am
ee48fed5: Merge "Add futimens."
* commit '
ee48fed51894f3db324e957058ed2ddcf23dddc7':
Add futimens.
Christopher Ferris [Fri, 9 Aug 2013 00:41:15 +0000 (17:41 -0700)]
am
632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
* commit '
632fd5183a611b80e009be36f881f572acc41619':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
Christopher Ferris [Fri, 9 Aug 2013 00:41:14 +0000 (17:41 -0700)]
am
e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
* commit '
e2066293e8279641d4abd13ec3fbdd6f42def83d':
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
Elliott Hughes [Fri, 9 Aug 2013 00:37:32 +0000 (00:37 +0000)]
Merge "Add futimens."
Elliott Hughes [Fri, 9 Aug 2013 00:13:33 +0000 (17:13 -0700)]
Add futimens.
Bug:
10239370
Change-Id: I518340084103dc339ef8a065d4837d6258a1381d
Christopher Ferris [Thu, 8 Aug 2013 19:12:20 +0000 (19:12 +0000)]
Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
Christopher Ferris [Thu, 8 Aug 2013 19:12:00 +0000 (19:12 +0000)]
Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
Christopher Ferris [Tue, 6 Aug 2013 00:08:06 +0000 (17:08 -0700)]
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
Merge from internal master.
(cherry-picked from
1ce665416307628f4bcaced86faa64bdf9c489c3)
Change-Id: I376b831df42248baadde7202a30a68112f752ff7
Christopher Ferris [Mon, 15 Jul 2013 19:49:26 +0000 (12:49 -0700)]
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
Create one version of strcat/strcpy/strlen for cortex-a15/krait and another
version for cortex-a9.
Tested with the libc_test strcat/strcpy/strlen tests.
Including new tests that verify that the src for strcat/strcpy do not
overread across page boundaries.
NOTE: The handling of unaligned strcpy (same code in strcat) could probably
be optimized further such that the src is read 64 bits at a time instead of
the partial reads occurring now.
strlen improves slightly since it was recently optimized.
Performance improvements for strcpy and strcat (using an empty dest string):
cortex-a9
- Small copies vary from about 5% to 20% as the size gets above 10 bytes.
- Copies >= 1024, about a 60% improvement.
- Unaligned copies, from about 40% improvement.
cortex-a15
- Most small copies exhibit a 100% improvement, a few copies only
improve by 20%.
- Copies >= 1024, about 150% improvement.
- Unaligned copies, about 100% improvement.
krait
- Most small copies vary widely, but on average 20% improvement, then
the performance gets better, hitting about a 100% improvement when
copies 64 bytes of data.
- Copies >= 1024, about 100% improvement.
- When coping MBs of data, about 50% improvement.
- Unaligned copies, about 90% improvement.
As strcat destination strings get larger in size:
cortex-a9
- about 40% improvement for small dst strings (>= 32).
- about 250% improvement for dst strings >= 1024.
cortex-a15
- about 200% improvement for small dst strings (>=32).
- about 250% improvement for dst strings >= 1024.
krait
- about 25% improvement for small dst strings (>=32).
- about 100% improvement for dst strings >=1024.
Merge from internal master.
(cherry-picked from
d119b7b6f48fe507088cfb98bcafa99b320fd884)
Change-Id: I296463b251ef9fab004ee4dded2793feca5b547a
Elliott Hughes [Mon, 5 Aug 2013 20:55:24 +0000 (20:55 +0000)]
Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"
Elliott Hughes [Mon, 5 Aug 2013 20:41:50 +0000 (20:41 +0000)]
Merge "syslog needs a valid socket path for _PATH_LOG"
Robert Greenwalt [Mon, 5 Aug 2013 18:45:03 +0000 (18:45 +0000)]
Merge "Fix the detection of alt-network in dns resolver."
Robert Greenwalt [Fri, 2 Aug 2013 22:24:45 +0000 (15:24 -0700)]
Fix the detection of alt-network in dns resolver.
Used to determine proper A/AAAA record request.
bug:
10132565
Change-Id: I7229f6672e879920a6fae58672cddd72db78546c