OSDN Git Service
Elliott Hughes [Thu, 6 Jun 2013 00:00:40 +0000 (00:00 +0000)]
Merge "Clean up useless declaration in thread_private.h"
Kito Cheng [Fri, 3 May 2013 02:31:17 +0000 (10:31 +0800)]
Clean up useless declaration in thread_private.h
Change-Id: Ie7bcdc7195a3fcbcd09a95f73b0c49e8897ad50b
Elliott Hughes [Wed, 5 Jun 2013 01:58:26 +0000 (01:58 +0000)]
Merge "Fix declaration of malloc_usable_size()"
Nick Kralevich [Tue, 4 Jun 2013 19:05:33 +0000 (19:05 +0000)]
Merge "Add tests for __strcpy_chk()"
Nick Kralevich [Mon, 3 Jun 2013 17:58:06 +0000 (10:58 -0700)]
Add tests for __strcpy_chk()
Change-Id: I5675d04fcd471732c1b87b83879a54fbcd27762e
Brian Carlstrom [Tue, 4 Jun 2013 03:18:23 +0000 (03:18 +0000)]
Merge "Small cleanup of soinfo_elf_lookup."
Christopher Ferris [Tue, 4 Jun 2013 00:27:49 +0000 (17:27 -0700)]
Small cleanup of soinfo_elf_lookup.
- Remove unnecessary line.
- Move declarations to first use.
Change-Id: I1d8398d6c13f7cb86bffe0b68af849e35a4b234d
Ben Cheng [Fri, 31 May 2013 21:40:37 +0000 (21:40 +0000)]
Merge "Use bl instead of blx to support interworking properly."
Ben Cheng [Fri, 31 May 2013 21:25:48 +0000 (14:25 -0700)]
Use bl instead of blx to support interworking properly.
(cherry picked from commit
9e1905794b4ecd8f7b87d8e4e2f954c8cfc6beda in
master)
Change-Id: I9b8c35ea9e201e00f84315f9f105013c23c94d85
Nick Kralevich [Fri, 31 May 2013 18:13:23 +0000 (18:13 +0000)]
Merge "FORTIFY_SOURCE: strcat / strncat optimize"
Nick Kralevich [Thu, 30 May 2013 23:48:53 +0000 (16:48 -0700)]
FORTIFY_SOURCE: strcat / strncat optimize
__strcat_chk and __strncat_chk are slightly inefficient,
because they end up traversing over the same memory region
two times.
This change optimizes __strcat_chk / __strncat_chk so they
only access the memory once. Although I haven't benchmarked these
changes, it should improve the performance of these functions.
__strlen_chk - expose this function, even if -D_FORTIFY_SOURCE
isn't defined. This is needed to compile libc itself without
-D_FORTIFY_SOURCE.
Change-Id: Id2c70dff55a276b47c59db27a03734d659f84b74
Nick Kralevich [Thu, 30 May 2013 20:33:02 +0000 (20:33 +0000)]
Merge "Add strncpy FORTIFY_SOURCE tests."
Nick Kralevich [Thu, 30 May 2013 20:21:14 +0000 (13:21 -0700)]
Add strncpy FORTIFY_SOURCE tests.
Change-Id: Id108b1d72b44d7e5fb911268e80bbdf896808f60
Nick Kralevich [Thu, 30 May 2013 19:59:38 +0000 (19:59 +0000)]
Merge "libc x86: Remove strcat.S"
Nick Kralevich [Thu, 30 May 2013 18:15:40 +0000 (11:15 -0700)]
libc x86: Remove strcat.S
This file is never used.
Change-Id: Iae4bba4a5a12a86a775af05e7477fb7b6511480b
Nick Kralevich [Fri, 24 May 2013 18:34:57 +0000 (18:34 +0000)]
Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
Nick Kralevich [Fri, 24 May 2013 17:48:12 +0000 (10:48 -0700)]
libc x86: Remove index.S, strcpy.S, strchr.S
These files are never used.
Change-Id: Iab8474bdff3bd4d225597c62b3c0f0849f808818
Nick Kralevich [Fri, 24 May 2013 17:27:47 +0000 (17:27 +0000)]
Merge "libc: delete x86 memchr.S"
Nick Kralevich [Fri, 24 May 2013 15:52:04 +0000 (08:52 -0700)]
libc: delete x86 memchr.S
This file is never used.
Change-Id: Ief08ad176713b5194048852609613801969e1364
David 'Digit' Turner [Thu, 23 May 2013 08:02:02 +0000 (10:02 +0200)]
Fix declaration of malloc_usable_size()
The function should take a 'const void*' parameter, instead of 'void*'.
Note that the implementation in upstream-dlmalloc/malloc.c already does
this.
For context, see http://b.android.com/55725
Change-Id: Iefd55cdb8996699189e0545f9195972490306227
Brian Carlstrom [Tue, 21 May 2013 23:59:52 +0000 (23:59 +0000)]
Merge "Fix bionic linker to support segments with zero p_filesz"
Brian Carlstrom [Tue, 21 May 2013 23:49:24 +0000 (16:49 -0700)]
Fix bionic linker to support segments with zero p_filesz
(cherry picked from commit
96362fb9d11beef6233aa03db396f25688e70860)
Change-Id: Ib075a6dfc45d5d0746d8b278f317dd9b8d772f2a
Erik Gilling [Thu, 16 May 2013 19:57:28 +0000 (19:57 +0000)]
Merge "libc/arm: add cortex-a8 cpu variant"
Rom Lemarchand [Fri, 3 May 2013 12:53:38 +0000 (05:53 -0700)]
libc/arm: add cortex-a8 cpu variant
Change-Id: I30e8dd6d4b2e7889aea8f5ed21182a5941bfb489
Elliott Hughes [Wed, 15 May 2013 00:56:06 +0000 (00:56 +0000)]
Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
Elliott Hughes [Wed, 15 May 2013 00:20:34 +0000 (17:20 -0700)]
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
Change-Id: Ie16cb21c1a5a2bdce8502b5974e2c4dbb1d679ce
Elliott Hughes [Tue, 14 May 2013 23:45:48 +0000 (23:45 +0000)]
Merge "Add more __restricts, clean up __format__ attributes."
Elliott Hughes [Tue, 14 May 2013 23:08:43 +0000 (16:08 -0700)]
Add more __restricts, clean up __format__ attributes.
Change-Id: I7e2d270cc722d339d221eaea92747eaff3b51403
Elliott Hughes [Tue, 14 May 2013 23:06:33 +0000 (23:06 +0000)]
Merge "Pull upstream FreeBSD revision 249810."
Elliott Hughes [Tue, 14 May 2013 21:56:54 +0000 (14:56 -0700)]
Pull upstream FreeBSD revision 249810.
Fix license clause numbering.
Convert libc/stdio from K&R to ANSI C.
And add '__restrict' where it appeared in the header prototypes.
Change-Id: I5fdb22f79d3effa2298d03f9aa8412b4b087da04
Upstream: http://svnweb.freebsd.org/base?view=revision&revision=249810
Elliott Hughes [Tue, 14 May 2013 21:49:08 +0000 (21:49 +0000)]
Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
Todd Poynor [Thu, 9 May 2013 21:38:39 +0000 (14:38 -0700)]
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
(cherry-pick of
d1ad4f6dab06189d4d3dcfa19ae4bc301481eb3f.)
Change-Id: I4a8476bff068951533d4188de94097c8b84bc489
Elliott Hughes [Tue, 14 May 2013 21:45:29 +0000 (21:45 +0000)]
Merge "libc: add timerfd calls"
Todd Poynor [Thu, 9 May 2013 03:21:00 +0000 (20:21 -0700)]
libc: add timerfd calls
(cherry-pick of
04c0ac14a49e0969333008a9522b64046d58fbdc.)
Change-Id: I06d0b6c2a8781602362b81f48faf1cca76b9ec05
Elliott Hughes [Tue, 14 May 2013 21:44:28 +0000 (21:44 +0000)]
Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
Todd Poynor [Sat, 11 May 2013 01:23:40 +0000 (18:23 -0700)]
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, and CLOCK_MONOTONIC_COARSE
as supported by recent linux kernels.
(cherry-pick of
60e5144ca312b210b54ac8e6966108da0c97ff80.)
Bug:
8895727
Change-Id: If79a4d05d1301108f49a37588f9416c4be19277a
Elliott Hughes [Tue, 14 May 2013 21:43:37 +0000 (21:43 +0000)]
Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
Todd Poynor [Thu, 9 May 2013 22:56:23 +0000 (15:56 -0700)]
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
(cherry-pick of
b928bda83d4413b703329f607e2706602f15293f.)
Change-Id: Ica6aad84299819ffc5e57ae4891e057d2e401fa1
Elliott Hughes [Tue, 14 May 2013 17:10:20 +0000 (17:10 +0000)]
Merge "Fix all printf warnings in res_send.c."
Kito Cheng [Sat, 11 May 2013 09:48:48 +0000 (17:48 +0800)]
Fix all printf warnings in res_send.c.
Change-Id: I4bf959140b5a5475897bd80704e64e3c4645fc3f
Elliott Hughes [Thu, 9 May 2013 22:30:21 +0000 (22:30 +0000)]
Merge "Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
Elliott Hughes [Thu, 9 May 2013 21:19:58 +0000 (14:19 -0700)]
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug:
8825226
Change-Id: I4fd8450ecc44d8767a1cb808aeecfbfbfc77c070
Ben Cheng [Tue, 7 May 2013 23:56:11 +0000 (23:56 +0000)]
Merge "Remove a spurious FIXME and unnecessary type cast."
Ben Cheng [Tue, 7 May 2013 23:53:33 +0000 (16:53 -0700)]
Remove a spurious FIXME and unnecessary type cast.
Change-Id: I05dcefdec7f047bef7eef5c5ceb7453992d56c24
Ben Cheng [Tue, 7 May 2013 22:45:42 +0000 (22:45 +0000)]
Merge "Adjust PC value in ARM stack trace."
Ben Cheng [Tue, 7 May 2013 21:22:43 +0000 (14:22 -0700)]
Adjust PC value in ARM stack trace.
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: I804fdabfa1db4709bede222d4b432e8d42d53167
Nick Kralevich [Tue, 7 May 2013 17:37:48 +0000 (17:37 +0000)]
Merge "Use restrict pointers for various libc functions."
Nick Kralevich [Tue, 7 May 2013 17:00:21 +0000 (10:00 -0700)]
Use restrict pointers for various libc functions.
All the cool kids say this is the best thing since sliced bread.
http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
For the most part, these changes match what glibc does.
Change-Id: I176268f27f82800162fe5f2515b08d5469ea2dfe
Nick Kralevich [Thu, 2 May 2013 21:52:19 +0000 (21:52 +0000)]
Merge "Use __predict_false on some fortify methods."
Nick Kralevich [Thu, 2 May 2013 21:31:51 +0000 (14:31 -0700)]
Use __predict_false on some fortify methods.
Give the compiler some hints that these error conditions
are unlikely to occur in practice.
Change-Id: Ifaf7322a12120ef663c8315c1a18c2dcbe4bda23
Nick Kralevich [Thu, 2 May 2013 21:17:15 +0000 (21:17 +0000)]
Merge "libc: cleanup strchr"
Nick Kralevich [Fri, 19 Apr 2013 23:54:22 +0000 (16:54 -0700)]
libc: cleanup strchr
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
Nick Kralevich [Wed, 1 May 2013 22:06:15 +0000 (22:06 +0000)]
Merge "keep test names consistent with other tests."
Nick Kralevich [Wed, 1 May 2013 22:05:01 +0000 (15:05 -0700)]
keep test names consistent with other tests.
Change-Id: I23dc4d963af40406b270af83cd17f6c8c95f1de3
Nick Kralevich [Wed, 1 May 2013 22:01:19 +0000 (22:01 +0000)]
Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
Nick Kralevich [Wed, 1 May 2013 21:55:33 +0000 (14:55 -0700)]
add strrchr -D_FORTIFY_SOURCE=2 test.
Change-Id: I1b95bb0086ae9f2f506f3cc90cee834c0ce3b1d8
Nick Kralevich [Tue, 30 Apr 2013 23:13:04 +0000 (23:13 +0000)]
Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
Nick Kralevich [Tue, 30 Apr 2013 21:19:23 +0000 (14:19 -0700)]
libc: upgrade strrchr to FORTIFY_SOURCE=2
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
Nick Kralevich [Tue, 30 Apr 2013 18:51:22 +0000 (18:51 +0000)]
Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
Nick Kralevich [Tue, 30 Apr 2013 18:31:35 +0000 (11:31 -0700)]
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
Upgrade the following functions:
* vsnprintf
* vsprintf
* snprintf
* fgets
* strcpy
* strcat
* strncat
* strlcpy
* strlcat
* strlen
* strchr
Change-Id: Icc036fc7f0bb317e05f7c051617887a1601271aa
Nick Kralevich [Mon, 29 Apr 2013 23:50:46 +0000 (23:50 +0000)]
Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
Nick Kralevich [Mon, 29 Apr 2013 23:29:37 +0000 (16:29 -0700)]
libc: upgrade sprintf to _FORTIFY_SOURCE=2
Upgrade sprintf to fortify_source level 2, to catch
additional security bugs.
Change-Id: Ibc957d65e4cb96152de84b3745a04e00fa22659e
Nick Kralevich [Mon, 29 Apr 2013 23:07:33 +0000 (23:07 +0000)]
Merge "strncpy: implement _FORTIFY_SOURCE=2"
Nick Kralevich [Mon, 29 Apr 2013 21:07:06 +0000 (14:07 -0700)]
strncpy: implement _FORTIFY_SOURCE=2
Add support for fortify source level 2 to strncpy.
This will enable detection of more areas where strncpy
is used inappropriately. For example, this would have detected
bug
8727221.
Move the fortify_source tests out of string_test.cpp, and
put it into fortify1_test.cpp.
Create a new fortify2_test.cpp file, which copies all
the tests in fortify1_test.cpp, and adds fortify_source level
2 specific tests.
Change-Id: Ica0fba531cc7d0609e4f23b8176739b13f7f7a83
Nick Kralevich [Mon, 29 Apr 2013 19:44:29 +0000 (19:44 +0000)]
Merge "[NETFILTER]: Fix iptables ABI breakage"
Nick Kralevich [Mon, 29 Apr 2013 19:31:01 +0000 (12:31 -0700)]
[NETFILTER]: Fix iptables ABI breakage
Pick up Linux kernel patch
2748e5dec7ca8a3804852c7c4171f9156384d15c
from 2007
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=
2748e5dec7ca8a3804852c7c4171f9156384d15c
[NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
With the introduction of x_tables we accidentally broke compatibility
by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of
XT_TABLE_MAXNAMELEN, which is two bytes larger.
On most architectures it doesn't really matter since we don't have
any tables with names that long in the kernel and the structure
layout didn't change because of alignment requirements of following
members. On CRIS however (and other architectures that don't align
data) this changed the structure layout and thus broke compatibility
with old iptables binaries.
Changing it back will break compatibility with binaries compiled
against recent kernels again, but since the breakage has only been
there for three releases this seems like the better choice.
Change-Id: Ie9552b25892109c7042b9752132dc8ebd3552dc3
Andrew Hsieh [Fri, 26 Apr 2013 01:54:37 +0000 (01:54 +0000)]
Merge "Remove redundant space within square brackets"
Elliott Hughes [Thu, 25 Apr 2013 22:31:13 +0000 (22:31 +0000)]
Merge "Improve diagnostics in the face of bad tzdata."
Elliott Hughes [Thu, 25 Apr 2013 21:02:59 +0000 (14:02 -0700)]
Improve diagnostics in the face of bad tzdata.
Bug:
8373554
Change-Id: If8df5e956105e01cce95221ff0a7fa9d2b474db3
Nick Kralevich [Thu, 25 Apr 2013 20:31:41 +0000 (20:31 +0000)]
Merge "linker: only re-open std* for setuid programs."
Nick Kralevich [Thu, 25 Apr 2013 20:15:24 +0000 (13:15 -0700)]
linker: only re-open std* for setuid programs.
get_AT_SECURE() was getting called before linker_env_init() had
been called, and returning the default value ("true"). This was
causing us to reopen closed stdin, stdout, and stderr for ALL
processes, not just privileged (setuid) processes.
Calling path:
- __linker_init
- soinfo_link_image
- get_AT_SECURE
- __linker_init_post_relocation
- linker_env_init
This change restores the intended behavior of only re-opening
stdin, stdout, and stderr for privileged processes.
Change-Id: I8b085ea6597710ac4c1a3c93f1bf8b81eecb08c0
Andrew Hsieh [Thu, 25 Apr 2013 07:05:03 +0000 (15:05 +0800)]
Remove redundant space within square brackets
The new "as" in binutils-2.23 (with gcc4.8) is more picky:
it expects register right after [
Change-Id: I876124841582070ab2083ffafe38bc333b5812d0
Elliott Hughes [Wed, 24 Apr 2013 17:52:29 +0000 (17:52 +0000)]
Merge "Don't avoid IPv6 when looking for new tzdata."
Elliott Hughes [Wed, 24 Apr 2013 17:50:45 +0000 (10:50 -0700)]
Don't avoid IPv6 when looking for new tzdata.
Our internal IPv6 FTP networking problems have been fixed.
Change-Id: I9949a13fa20a3b0f3845e565e1461320078d3f14
Elliott Hughes [Mon, 22 Apr 2013 23:41:37 +0000 (23:41 +0000)]
Merge "Disable IPv6 when looking for tzdata updates."
Elliott Hughes [Mon, 22 Apr 2013 20:44:50 +0000 (13:44 -0700)]
Disable IPv6 when looking for tzdata updates.
My problems connecting to ftp.iana.org are only via IPv6.
Change-Id: I42e4bae7981ec4b64822f745a7a15544d77ef22d
Elliott Hughes [Mon, 22 Apr 2013 19:10:08 +0000 (19:10 +0000)]
Merge "Upgrade to tzdata2013c."
Elliott Hughes [Mon, 22 Apr 2013 19:03:06 +0000 (19:03 +0000)]
Merge "Add signature checking to HTTP tzdata updates."
Elliott Hughes [Mon, 22 Apr 2013 18:41:57 +0000 (11:41 -0700)]
Add signature checking to HTTP tzdata updates.
Change-Id: Idcfd217eb215d6a170e6884be8d8ad28cd4fe70d
Elliott Hughes [Mon, 22 Apr 2013 18:33:14 +0000 (11:33 -0700)]
Upgrade to tzdata2013c.
From the release notes:
Changes affecting current and future time stamps:
Palestine observed DST starting March 29, 2013. (Thanks to
Steffen Thorsen.) From 2013 on, Gaza and Hebron both observe DST,
with the predicted rules being the last Thursday in March at 24:00
to the first Friday on or after September 21 at 01:00.
Assume that the recent change to Paraguay's DST rules is permanent,
by moving the end of DST to the 4th Sunday in March every year.
(Thanks to Carlos Raúl Perasso.)
Changes affecting past time stamps:
Fix some historical data for Palestine to agree with that of
timeanddate.com, as follows:
The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
00:00 Apr 1.
The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
02:00.
The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
Fix times of habitation for Macquarie to agree with the Tasmania
Parks & Wildlife Service history, which indicates that permanent
habitation was 1899-1919 and 1948 on.
Changing affecting metadata only:
Macquarie Island is politically part of Australia, not Antarctica.
(Thanks to Tobias Conradi.)
Sort Macquarie more-consistently with other parts of Australia.
(Thanks to Tim Parenti.)
Change-Id: I3df146d046eda26dbc6ce2a0a26ad9214ec4eaca
Elliott Hughes [Mon, 22 Apr 2013 18:28:49 +0000 (18:28 +0000)]
Merge "Rename the tzdata update tool, and add HTTP support."
Elliott Hughes [Mon, 22 Apr 2013 18:11:43 +0000 (11:11 -0700)]
Rename the tzdata update tool, and add HTTP support.
The FTP server is currently unavailable, but the HTTP server is working
fine.
Change-Id: If7f2f396e89aca022a60af531f3604523b7bf95c
Elliott Hughes [Mon, 15 Apr 2013 17:51:24 +0000 (17:51 +0000)]
Merge "Use hidden visibility for internal-use-only functions"
Christopher Ferris [Fri, 12 Apr 2013 19:16:44 +0000 (19:16 +0000)]
Merge "Rewrite memset for cortexa15 to use strd."
Elliott Hughes [Fri, 12 Apr 2013 19:12:29 +0000 (19:12 +0000)]
Merge "Switch to current FreeBSD qsort."
Christopher Ferris [Tue, 9 Apr 2013 01:35:30 +0000 (18:35 -0700)]
Rewrite memset for cortexa15 to use strd.
Merge from internal master.
(cherry-picked from commit
7ffad9c120054eedebd5f56f8bed01144e93eafa)
Change-Id: Ia67f2a545399f4fa37b63d5634a3565e4f5482f9
Kito Cheng [Fri, 12 Apr 2013 08:13:34 +0000 (16:13 +0800)]
Use hidden visibility for internal-use-only functions
- malloc_debug_init and malloc_debug_fini
Change-Id: I4261ff428a50d8f0371415cda71bcc0a9487ce67
Elliott Hughes [Fri, 12 Apr 2013 01:08:34 +0000 (18:08 -0700)]
Switch to current FreeBSD qsort.
Change-Id: Ic46cd0b663dc5fa78c99dd38db0bfe849a25e789
Elliott Hughes [Thu, 11 Apr 2013 21:18:13 +0000 (21:18 +0000)]
Merge "Start moving to current FreeBSD stdio."
Elliott Hughes [Thu, 11 Apr 2013 20:54:48 +0000 (13:54 -0700)]
Start moving to current FreeBSD stdio.
This only touches the easy stuff.
Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
Elliott Hughes [Thu, 11 Apr 2013 00:45:33 +0000 (00:45 +0000)]
Merge "Add missing include and function prototype for sched_getaffinity."
Kito Cheng [Tue, 9 Apr 2013 16:57:42 +0000 (00:57 +0800)]
Add missing include and function prototype for sched_getaffinity.
Change-Id: I649633c8d074def5d05bd0c8b92fb680d9d11d51
Christopher Ferris [Thu, 11 Apr 2013 00:23:46 +0000 (00:23 +0000)]
Merge "Add missing branch in memcpy.S dst aligned case."
Christopher Ferris [Tue, 2 Apr 2013 16:19:00 +0000 (09:19 -0700)]
Add missing branch in memcpy.S dst aligned case.
Merge from internal master.
(cherry-picked from commit
6ffaa931c362602a2b606a610c92326a425a876e)
Change-Id: Ifdcf01fd122866cf0d4c5b5f7a997803561d7889
Christopher Ferris [Thu, 11 Apr 2013 00:18:04 +0000 (00:18 +0000)]
Merge "Update to latest cortexa15 memcpy code."
Christopher Ferris [Fri, 15 Mar 2013 23:01:17 +0000 (16:01 -0700)]
Update to latest cortexa15 memcpy code.
This uses the new code original submitted as memcpy.a15.S as
the base. However, the old code handled unaligned src/dst better
so that was spliced in. I optimized the original unaligned code by
removing a few unnecessary instructions. I optimized the a15 code by
rewriting the pre and post code. I also modified the main loop to add
a pld so that larger copies would not stall waiting for memory.
Test cases for the new memcpy:
- Copy all sized values from 0 to 1024 bytes, using whatever alignment
is returned by malloc.
For each alignment case described below, the test copied from 0 to 128
bytes.
- Src and dst pointers are both aligned to the same value, starting
at one going through every power of two up to and including 128.
- Src aligned to double word boundary, dst aligned to word boundary.
- Src aligned to word boundary, dst aligned to double word boundary.
- Src aligned to 16 bit boundary, dst aligned to word boundary.
- Src aligned to word boundary, dst aligned to 16 byte boundary.
- Src aligned to word boundary, dst aligned to 1 byte from a word
boundary.
- Src aligned to word boundary, dst aligned to 2 bytes from a word
boundary.
- Src aligned to word boundary, dst aligned to 3 bytes from a word
boundary.
- Src aligned to 1 byte from a word boundary, dst aligned to a word
boundary.
- Src aligned to 2 bytes from a word boundary, dst aligned to a word
boundary.
- Src aligned to 3 bytes from a word boundary, dst aligned to a word
boundary.
Cases to verify the unaligned source code properly aligns to a 16 bit
boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
4 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
8 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
12 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
16 + 128 bit boundary.
In all cases, a two byte fencepost was placed at the end of the
destination to verify that only the requested number of bytes were copied.
Bug:
8005082
Merge from internal master.
(cherry-picked from commit
21ede92d794969f22cacbdb9f557818f1c5712b5)
Change-Id: Ief70c9e6dc8c6473ae245b6570b2c266fed9618c
Elliott Hughes [Fri, 5 Apr 2013 18:25:21 +0000 (18:25 +0000)]
Merge "Make abort messages available to debuggerd."
Elliott Hughes [Thu, 4 Apr 2013 20:46:46 +0000 (13:46 -0700)]
Make abort messages available to debuggerd.
This adds __libc_fatal, cleans up the internal logging code a bit more,
and switches suitable callers over to __libc_fatal. In addition to logging,
__libc_fatal stashes the message somewhere that the debuggerd signal handler
can find it before calling abort.
In the debuggerd signal handler, we pass this address to debuggerd so that
it can come back with ptrace to read the message and present it to the user.
Bug:
8531731
Change-Id: I416ec1da38a8a1b0d0a582ccd7c8aaa681ed4a29
Elliott Hughes [Wed, 3 Apr 2013 18:11:30 +0000 (18:11 +0000)]
Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a"
Kito Cheng [Wed, 3 Apr 2013 03:29:40 +0000 (11:29 +0800)]
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
- eventfd.cpp and eventfd.s will output to the same file when building libc.a
out/target/product/*/obj/STATIC_LIBRARIES/libc_intermediates/WHOLE/libc_common_objs/eventfd.o
- And then `eventfd` will undefined when statically linked to libc.
Also add a unit test.
Change-Id: Ib310ade3256712ca617a90539e8eb07459c98505