Ben Cheng
ff220f7003
Merge "Remove a spurious FIXME and unnecessary type cast."
2013-05-07 23:56:11 +00:00
Ben Cheng
63dd03cced
Remove a spurious FIXME and unnecessary type cast.
...
Change-Id: I05dcefdec7f047bef7eef5c5ceb7453992d56c24
2013-05-07 16:53:33 -07:00
Ben Cheng
b9256adab3
Merge "Adjust PC value in ARM stack trace."
2013-05-07 22:45:42 +00:00
Ben Cheng
52171b9bdc
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: I804fdabfa1db4709bede222d4b432e8d42d53167
2013-05-07 15:44:13 -07:00
Nick Kralevich
d541ba1719
Merge "Use restrict pointers for various libc functions."
2013-05-07 17:37:48 +00:00
Nick Kralevich
1c462b7a04
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
2013-05-07 10:00:21 -07:00
Nick Kralevich
b01f7afd5f
Merge "Use __predict_false on some fortify methods."
2013-05-02 21:52:19 +00:00
Nick Kralevich
532d6f09b1
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
2013-05-02 14:31:51 -07:00
Nick Kralevich
e4ac8feb58
Merge "libc: cleanup strchr"
2013-05-02 21:17:16 +00:00
Nick Kralevich
4f40e511b0
libc: cleanup strchr
...
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
2013-05-02 13:58:03 -07:00
Nick Kralevich
5e3b502b6b
Merge "keep test names consistent with other tests."
2013-05-01 22:06:15 +00:00
Nick Kralevich
277226bf43
keep test names consistent with other tests.
...
Change-Id: I23dc4d963af40406b270af83cd17f6c8c95f1de3
2013-05-01 15:05:01 -07:00
Nick Kralevich
8c00c91aa0
Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
2013-05-01 22:01:20 +00:00
Nick Kralevich
80541922e3
add strrchr -D_FORTIFY_SOURCE=2 test.
...
Change-Id: I1b95bb0086ae9f2f506f3cc90cee834c0ce3b1d8
2013-05-01 14:55:33 -07:00
Nick Kralevich
bee0ab16e4
Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
2013-04-30 23:13:04 +00:00
Nick Kralevich
3b2e6bc9ac
libc: upgrade strrchr to FORTIFY_SOURCE=2
...
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
2013-04-30 14:19:23 -07:00
Nick Kralevich
c46871302e
Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
2013-04-30 18:51:22 +00:00
Nick Kralevich
9020fd503c
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
2013-04-30 11:31:35 -07:00
Nick Kralevich
b94b2851d7
Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
2013-04-29 23:50:46 +00:00
Nick Kralevich
78d6d9888c
libc: upgrade sprintf to _FORTIFY_SOURCE=2
...
Upgrade sprintf to fortify_source level 2, to catch
additional security bugs.
Change-Id: Ibc957d65e4cb96152de84b3745a04e00fa22659e
2013-04-29 16:41:54 -07:00
Nick Kralevich
382a775378
Merge "strncpy: implement _FORTIFY_SOURCE=2"
2013-04-29 23:07:33 +00:00
Nick Kralevich
1aae9bd170
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
2013-04-29 15:22:10 -07:00
Nick Kralevich
c6dc62f09c
Merge "[NETFILTER]: Fix iptables ABI breakage"
2013-04-29 19:44:30 +00:00
Nick Kralevich
e66ad7809e
[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
2013-04-29 12:31:01 -07:00
Andrew Hsieh
f7153fd13f
Merge "Remove redundant space within square brackets"
2013-04-26 01:54:38 +00:00
Elliott Hughes
9ff1ffd805
Merge "Improve diagnostics in the face of bad tzdata."
2013-04-25 22:31:14 +00:00
Elliott Hughes
e7aaad8b83
Improve diagnostics in the face of bad tzdata.
...
Bug: 8373554
Change-Id: If8df5e956105e01cce95221ff0a7fa9d2b474db3
2013-04-25 14:02:59 -07:00
Nick Kralevich
5f28fde8ae
Merge "linker: only re-open std* for setuid programs."
2013-04-25 20:31:41 +00:00
Nick Kralevich
8d3e91d4f8
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
2013-04-25 13:15:24 -07:00
Andrew Hsieh
e8f46e8edd
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
2013-04-25 15:05:03 +08:00
Elliott Hughes
87efcd2e63
Merge "Don't avoid IPv6 when looking for new tzdata."
2013-04-24 17:52:29 +00:00
Elliott Hughes
85aeb49144
Don't avoid IPv6 when looking for new tzdata.
...
Our internal IPv6 FTP networking problems have been fixed.
Change-Id: I9949a13fa20a3b0f3845e565e1461320078d3f14
2013-04-24 10:50:45 -07:00
Elliott Hughes
c705daa0a2
Merge "Disable IPv6 when looking for tzdata updates."
2013-04-22 23:41:37 +00:00
Elliott Hughes
21da42ea91
Disable IPv6 when looking for tzdata updates.
...
My problems connecting to ftp.iana.org are only via IPv6.
Change-Id: I42e4bae7981ec4b64822f745a7a15544d77ef22d
2013-04-22 13:44:50 -07:00
Elliott Hughes
2c60c18c50
Merge "Upgrade to tzdata2013c."
2013-04-22 19:10:08 +00:00
Elliott Hughes
bda2fb5efa
Merge "Add signature checking to HTTP tzdata updates."
2013-04-22 19:03:06 +00:00
Elliott Hughes
676e66db25
Add signature checking to HTTP tzdata updates.
...
Change-Id: Idcfd217eb215d6a170e6884be8d8ad28cd4fe70d
2013-04-22 11:41:57 -07:00
Elliott Hughes
2379088a90
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
2013-04-22 11:33:14 -07:00
Elliott Hughes
70e0bd3a44
Merge "Rename the tzdata update tool, and add HTTP support."
2013-04-22 18:28:49 +00:00
Elliott Hughes
f8dff7d449
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
2013-04-22 11:11:43 -07:00
Elliott Hughes
8c181aa8fe
Merge "Use hidden visibility for internal-use-only functions"
2013-04-15 17:51:24 +00:00
Christopher Ferris
516a897053
Merge "Rewrite memset for cortexa15 to use strd."
2013-04-12 19:16:44 +00:00
Elliott Hughes
b3c8c4d865
Merge "Switch to current FreeBSD qsort."
2013-04-12 19:12:29 +00:00
Christopher Ferris
796cbe249b
Rewrite memset for cortexa15 to use strd.
...
Merge from internal master.
(cherry-picked from commit 7ffad9c120
2013-04-12 10:58:25 -07:00
Kito Cheng
ea489745dc
Use hidden visibility for internal-use-only functions
...
- malloc_debug_init and malloc_debug_fini
Change-Id: I4261ff428a50d8f0371415cda71bcc0a9487ce67
2013-04-12 16:34:38 +08:00
Elliott Hughes
0b25f633a2
Switch to current FreeBSD qsort.
...
Change-Id: Ic46cd0b663dc5fa78c99dd38db0bfe849a25e789
2013-04-11 18:08:34 -07:00
Elliott Hughes
ed36d95fac
Merge "Start moving to current FreeBSD stdio."
2013-04-11 21:18:14 +00:00
Elliott Hughes
6b05c8e280
Start moving to current FreeBSD stdio.
...
This only touches the easy stuff.
Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
2013-04-11 13:55:01 -07:00
Elliott Hughes
b632857a50
Merge "Add missing include and function prototype for sched_getaffinity."
2013-04-11 00:45:33 +00:00
Kito Cheng
4ca685e36e
Add missing include and function prototype for sched_getaffinity.
...
Change-Id: I649633c8d074def5d05bd0c8b92fb680d9d11d51
2013-04-10 17:44:29 -07:00
Christopher Ferris
fc76c7d394
Merge "Add missing branch in memcpy.S dst aligned case."
2013-04-11 00:23:46 +00:00
Christopher Ferris
bf0d1ad72b
Add missing branch in memcpy.S dst aligned case.
...
Merge from internal master.
(cherry-picked from commit 6ffaa931c3
2013-04-10 17:21:29 -07:00
Christopher Ferris
68fd78efa0
Merge "Update to latest cortexa15 memcpy code."
2013-04-11 00:18:04 +00:00
Christopher Ferris
185ce72d00
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 21ede92d79
2013-04-08 18:13:35 -07:00
Elliott Hughes
240fb8623b
Merge "Make abort messages available to debuggerd."
2013-04-05 18:25:21 +00:00
Elliott Hughes
0d787c1fa1
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
2013-04-05 11:24:19 -07:00
Elliott Hughes
014c75c78b
Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a"
2013-04-03 18:11:30 +00:00
Kito Cheng
8baa929d5d
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
2013-04-03 11:10:37 -07:00
Elliott Hughes
14c840df90
Merge "Fix the SYSCALLS.TXT documentation and remove a dead script."
2013-04-03 17:22:18 +00:00
Elliott Hughes
a51916b58b
Fix the SYSCALLS.TXT documentation and remove a dead script.
...
We use the system call constants from the kernel header files now,
so there's no need to check that they've been correctly transcribed
into SYSCALLS.TXT.
This is a work in progress. I've added TODOs to SYSCALLS.TXT explaining
what's left to do.
Change-Id: I3b86acfe7f84b4da1c802ee5a4ef13a2e83e7939
2013-04-03 10:08:09 -07:00
Elliott Hughes
162b4411fc
Merge "Stop using unreasonable numbers of map entries."
2013-04-03 00:48:07 +00:00
Elliott Hughes
4ace92c62a
Stop using unreasonable numbers of map entries.
...
Bug: 8460659
Change-Id: Ib0ee71e3cf61e122d0449c9d8a4e4670a7d7129a
2013-04-02 17:41:14 -07:00
Elliott Hughes
7a29f404e1
Merge "Update getaddrinfo to RFC6724"
2013-04-02 01:05:23 +00:00
Lorenzo Colitti
378b0e1ea2
Update getaddrinfo to RFC6724
...
Currently, our getaddrinfo implementation does not conform to
any IETF standard. It follows draft-ietf-6man-rfc3484-revise-01,
but that draft has expired. Update the policy table to RFC6724.
(cherry-pick of e919b116d35aa7deb24ddece69c491e24c3b0d6f.)
Bug: 8276725
Change-Id: I2d17122defd966ac6c2c13d04887fb110f2598a0
2013-04-01 18:04:25 -07:00
Elliott Hughes
6bb17dfad3
Merge "Extra logging in pthread_create."
2013-03-29 23:47:24 +00:00
Elliott Hughes
cfa089df23
Extra logging in pthread_create.
...
pthread_create returns EAGAIN when it can't allocate a pthread_internal_t,
when it can't allocate a stack for the new thread, or when clone(2) fails
because there are too many threads. It's useful to be able to know why your
pthread_create just failed, so add some logging.
Bug: 8470684
Change-Id: I1bb4497d4f7528eacce0db35c2014771cba64569
2013-03-29 16:35:00 -07:00
Jean-Baptiste Queru
74b324ac09
Merge "Update processed linux/fs.h header file"
2013-03-28 15:49:04 +00:00
Ken Sumrall
ce636ca088
Update processed linux/fs.h header file
...
Need to get the defintion of the FITRIM ioctl(). Also need
to update the blk_types.h header file as fs.h includes it.
Change-Id: I617622b620925942dc5aead9e49f8e17d17e5d74
2013-03-27 16:05:22 -07:00
Elliott Hughes
bd014c2e42
Merge "Remove some dead script code and fix a script comment."
2013-03-25 21:20:22 +00:00
Elliott Hughes
e6ddfc55c8
Remove some dead script code and fix a script comment.
...
Change-Id: I91ca466d1b6f8a39da50ce61acebc268d0daab3a
2013-03-25 14:09:52 -07:00
Elliott Hughes
e51d75a9ac
Merge "Clarify the dlmalloc USAGE_ERROR."
2013-03-25 20:54:14 +00:00
Elliott Hughes
65a8eb606f
Clarify the dlmalloc USAGE_ERROR.
...
Bug: 8468088
Change-Id: I1ff6d51ec17fc74ef56229aa76d2986cbd662874
2013-03-25 13:48:41 -07:00
Elliott Hughes
48f25cef45
Merge "Stop generating <sys/linux-syscalls.h>."
2013-03-25 17:13:26 +00:00
Elliott Hughes
a40751185f
Merge "Unhide __set_errno for backwards compatibility."
2013-03-25 17:12:19 +00:00
Elliott Hughes
3198850ea1
Unhide __set_errno for backwards compatibility.
...
This was in <errno.h>, and people called it :-(
Change-Id: I038490be77eb9372b3f31305ec580fa7b09c983e
2013-03-22 19:12:52 -07:00
Elliott Hughes
1b91c6c11f
Stop generating <sys/linux-syscalls.h>.
...
The <asm/unistd.h> files contain the canonical data, and
<sys/glibc-syscalls.h> contain new glibc-compatible names,
and if you #include the standard <sys/syscall.h> you get
both sets of names.
Change-Id: I9919c080931c0ba1660f5e37c6a6265ea716d603
2013-03-22 18:56:24 -07:00
Elliott Hughes
c019345a3a
Merge "Use the correct names for the __ARM_NR_* syscalls."
2013-03-22 21:50:49 +00:00
Elliott Hughes
cda62094ef
Use the correct names for the __ARM_NR_* syscalls.
...
This lets us move all the ARM syscall stubs over to the kernel <asm/unistd.h>.
Our generated <sys/linux-syscalls.h> is now unused, but I'll remove that in a
later change.
Change-Id: Ie5ff2cc4abce1938576af7cbaef615a79c7f310d
2013-03-22 13:53:43 -07:00
Elliott Hughes
c37dd59956
Merge "Fix builds where _FORTIFY_SOURCE is off."
2013-03-22 18:01:50 +00:00
Elliott Hughes
890c8ed6ef
Fix builds where _FORTIFY_SOURCE is off.
...
Also add a more intention-revealing guard so we don't have loads of
places checking whether our inlining macro is defined.
Change-Id: I168860cedcfc798b07a5145bc48a125700265e47
2013-03-22 10:58:55 -07:00
Elliott Hughes
34895c1bdf
Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 17:51:43 +00:00
Elliott Hughes
5c5f303e4c
Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 16:30:56 +00:00
Elliott Hughes
e7cb795cb6
Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 16:30:37 +00:00
Elliott Hughes
8794ece296
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
For some reason, socketcalls.c was only being compiled for ARM, where
it makes no sense. For x86 we generate stubs for the socket functions
that use __NR_socketcall directly.
Change-Id: I84181e6183fae2314ae3ed862276eba82ad21e8e
2013-03-21 23:07:11 -07:00
Elliott Hughes
56d161bb62
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
Change-Id: I193a35f9790b82c83fd3b5672e24ac1b2034d0b0
2013-03-21 22:52:25 -07:00
Elliott Hughes
4cdde5f123
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
Change-Id: I9d016ee8e8329cccf244d27c336d9524348af996
2013-03-21 22:48:18 -07:00
Elliott Hughes
3323628d63
Merge "The SYS_ constants should cover all __NR_ values."
2013-03-22 05:39:06 +00:00
Elliott Hughes
5c2772f59d
The SYS_ constants should cover all __NR_ values.
...
<sys/linux-syscalls.h> only contains constants for the syscalls
we're generating stubs for. We want all the syscalls available
on the architecture in question.
Keep using <sys/linux-syscalls.h> on ARM for now because the
__NR_ARM_set_tls and __NR_ARM_cacheflush values aren't in <asm/unistd.h>.
Change-Id: I66683950d87d9b18d6107d0acc0ed238a4496f44
2013-03-21 22:26:20 -07:00
Elliott Hughes
babb72dc29
Merge "Fix pthread_setname_np's behavior on invalid pthread_ts."
2013-03-22 05:11:35 +00:00
Elliott Hughes
a41ba2f0bf
Fix pthread_setname_np's behavior on invalid pthread_ts.
...
Change-Id: I0a154beaab4d164ac812f2564d12e4d79b80a8e8
2013-03-21 20:02:35 -07:00
Elliott Hughes
26c815c489
Merge "Drop magic number in strrchr and strchr"
2013-03-22 02:48:32 +00:00
Elliott Hughes
612333f671
Merge "Don't #define SYS_ constants unless they make sense for the current architecture."
2013-03-22 02:46:22 +00:00
Elliott Hughes
9724ce3a09
Don't #define SYS_ constants unless they make sense for the current architecture.
...
Fixes the MIPS and x86 builds. strace tests whether syscalls
are supported using #ifdef of the appropriate SYS_ constant.
Change-Id: I90be118dc42abfdaf5b0f9b1e676e8601f55106e
2013-03-21 19:44:36 -07:00
Elliott Hughes
4453c51c82
Merge "Drop unnecessary execution permission for .cpp/.c/.h"
2013-03-22 02:30:28 +00:00
Kito Cheng
8f7120bbac
Drop unnecessary execution permission for .cpp/.c/.h
...
Change-Id: I9ac2b9d8f6bdb4fab8962210c5ec8f9c3e8c0ebf
2013-03-22 10:28:15 +08:00
Kito Cheng
a6cc67c9b5
Drop magic number in strrchr and strchr
...
Change-Id: Ic7391be8575eaaac76914dab62bc41c9773d703d
2013-03-22 10:18:09 +08:00
Elliott Hughes
800ad8249a
Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
2013-03-22 01:41:57 +00:00
Elliott Hughes
8ecf225827
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
...
This helps us remove another external/strace bionic hack.
Change-Id: I3e82c0d2fd27e479be98f096e05b666fd16f8eb3
2013-03-21 18:06:55 -07:00
Elliott Hughes
6eb978c9bf
Merge "Expose wait4 as wait4 rather than __wait4."
2013-03-21 23:14:48 +00:00
Elliott Hughes
17a8b0db63
Expose wait4 as wait4 rather than __wait4.
...
This helps strace(1) compile with one fewer hack.
Change-Id: I5296d0cfec5546709cda990abd705ad33d7c4626
2013-03-21 16:14:06 -07:00
Christopher Ferris
86c3184972
Merge "Create arch specific versions of strcmp."
2013-03-20 22:14:48 +00:00
Christopher Ferris
31dea25b8b
Create arch specific versions of strcmp.
...
This uses the new strcmp.a15.S code as the basis for new versions
of strcmp.S.
The cortex-a15 code is the performance optimized version of strcmp.a15.S
taken with only the addition of a few pld instructions.
The cortex-a9 code is the same as the cortex-a15 code except that the
unaligned strcmp code was taken from the original strcmp.S.
The krait code is the same as the cortex-a15 code except that one path
in the unaligned strcmp code was taken from the original strcmp.S code
(the 2 byte overlap case).
The generic code is the original unmodified strmp.S from the bionic
subdirectory.
All three new versions underwent these test cases:
Strings the same, all same size:
- Both pointers double word aligned.
- One pointer double word aligned, one pointer word aligned.
- Both pointers word aligned.
- One pointer double word aligned, one pointer 1 off a word alignment.
- One pointer double word aligned, one pointer 2 off a word alignment.
- One pointer double word aligned, one pointer 3 off a word alignment.
- One pointer word aligned, one pointer 1 off a word alignment.
- One pointer word aligned, one pointer 2 off a word alignment.
- One pointer word aligned, one pointer 3 off a word alignment.
For all cases where it made sense, the two pointers were also tested
swapped.
Different strings, all same size:
- Single difference at double word boundary.
- Single difference at word boudary.
- Single difference at 1 off a word alignment.
- Single difference at 2 off a word alignment.
- Single difference at 3 off a word alignment.
Different sized strings, strings the same until the end:
- Shorter string ends on a double word boundary.
- Shorter string ends on word boundary.
- Shorter string ends at 1 off a word boundary.
- Shorter string ends at 2 off a word boundary.
- Shorter string ends at 3 off a word boundary.
For all different cases, run them through the same pointer alignment
cases when the strings are the same size.
For all cases the two pointers were also tested swapped.
Bug: 8005082
Merge from internal master.
(cherry-picked from commit a9a5870d16
2013-03-20 14:33:54 -07:00
Elliott Hughes
adeec09629
Merge "Hide various symbols that shouldn't be exposed."
2013-03-15 23:52:09 +00:00
Elliott Hughes
ce532721aa
Hide various symbols that shouldn't be exposed.
...
A mangled symbol in libc.so is a symbol that shouldn't be exported
by libc.so.
Change-Id: Id92d1e1968b3d11d111a5d9ef692adb1ac7694a1
2013-03-15 16:31:09 -07:00
Elliott Hughes
c14166477e
Merge "Clean up internal libc logging."
2013-03-15 23:21:36 +00:00
Elliott Hughes
8f2a5a0b40
Clean up internal libc logging.
...
We only need one logging API, and I prefer the one that does no
allocation and is thus safe to use in any context.
Also use O_CLOEXEC when opening the /dev/log files.
Move everything logging-related into one header file.
Change-Id: Ic1e3ea8e9b910dc29df351bff6c0aa4db26fbb58
2013-03-15 16:12:58 -07:00
Elliott Hughes
e23ed8c644
Merge "Remove useless workaround for HTC RIL bugs."
2013-03-15 18:26:49 +00:00
Elliott Hughes
2eb44c5aa4
Remove useless workaround for HTC RIL bugs.
...
HTC's RIL uses the liblog logging, not ours.
Change-Id: I56f9304e833ccb329df4ee55042012d7ad5f73ed
2013-03-15 11:21:15 -07:00
Elliott Hughes
4d696eb49d
Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
2013-03-15 00:30:48 +00:00
Elliott Hughes
af7f2f2fcf
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
...
Bug: 8391426
Change-Id: Ia4a8889b5a613aa96bb3fb5d89a921c913ff7626
2013-03-14 17:10:24 -07:00
Christopher Ferris
d30b9f0912
Merge "Remove unused arm defines."
2013-03-14 23:23:42 +00:00
Christopher Ferris
306a353825
Remove unused arm defines.
...
The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.
Bug: 8005082
Merge from internal master.
(cherry-picked from commit 6e1a5cf31b
2013-03-14 15:32:18 -07:00
Elliott Hughes
f861bc5cc3
Merge "Don't search off the end of the index for bad Olson ids."
2013-03-14 22:05:44 +00:00
Elliott Hughes
e0175ca7e4
Don't search off the end of the index for bad Olson ids.
...
In the old code, the index was a file to itself, so it made sense to
read until you hit the end of the file. In the new code, the index is
followed by hundreds of KiB of data, so we need to just search the
index.
Bug: 8368791
Change-Id: Icf5f8b5516cf3a93679fa849c9f6cd1cb100e0f1
2013-03-14 14:38:08 -07:00
Elliott Hughes
ec706c24ac
Merge "Use the kernel's MAX_ERRNO in the syscall stubs."
2013-03-13 00:44:33 +00:00
Elliott Hughes
9aceab5015
Use the kernel's MAX_ERRNO in the syscall stubs.
...
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Iaabf7025b153e96dc5eca231a33a32d4cb7d8116
2013-03-12 17:43:58 -07:00
Christopher Ferris
980508b0ea
Merge "Break bionic implementations into arch versions."
2013-03-12 22:24:09 +00:00
Christopher Ferris
04954a43b3
Break bionic implementations into arch versions.
...
Move arch specific code for arm, mips, x86 into separate
makefiles.
In addition, add different arm cpu versions of memcpy/memset.
Bug: 8005082
Merge from internal master (acdde8c1cf
2013-03-12 14:06:08 -07:00
Elliott Hughes
94a34010c1
Merge "Support large errno values on ARM."
2013-03-12 19:08:36 +00:00
Elliott Hughes
cb2069bf69
Support large errno values on ARM.
...
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Ic6c40be2dc50f0644a3d8b09ceae59c38f2d5b53
2013-03-12 11:55:45 -07:00
Elliott Hughes
f21aa3b61e
Merge "Use more types than just 'unsigned' in the linker."
2013-03-12 18:54:27 +00:00
Elliott Hughes
ca0c11bd82
Use more types than just 'unsigned' in the linker.
...
Still chipping away at the situation where every variable in the
linker was of type 'unsigned'. This patch switches counts over to
being size_t and adds an explicit type for init/fini function pointers
and arrays of function pointers.
Also improve logging from CallArray.
Also remove trailing "\n"s from log messages.
Change-Id: Ie036d2622caac50f4d29f0570888bb527661d77e
2013-03-12 11:26:56 -07:00
Elliott Hughes
6b4c77f854
Merge "Use Elf32_Addr instead of unsigned in linker"
2013-03-12 17:24:04 +00:00
Kito Cheng
fa8c05dc00
Use Elf32_Addr instead of unsigned in linker
...
Change-Id: I52dcbb4b0ff0a4052e0ad7a9bbeb2df65c9d2f66
2013-03-12 10:19:14 -07:00
Elliott Hughes
53630c0e5b
Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
2013-03-12 01:28:36 +00:00
Elliott Hughes
4a05bef4c0
Cache the most-recently used timezone for mktime_tz and localtime_tz.
...
Normally, the C library implicitly caches your timezone by virtue
of the fact that the prehistoric API assumes a single timezone for
the entire process.
The unfortunate mktime_tz and localtime_tz extensions work around
this, but represent timezones as strings to their callers, so code
that makes heavy use of these needs a cache to be able to perform
acceptably until it can hopefully one day be rewritten to use
java.util.Calendar or icu4c.
Bug: 8270865
Change-Id: I92e3964e86dc33ceac925f819cc5e26ff4203f50
2013-03-11 17:17:02 -07:00
Elliott Hughes
4b032ee9b9
Merge "Let bionic use the correct definition of ssize_t."
2013-03-11 17:55:27 +00:00
Elliott Hughes
62c5cd0781
Merge "Upgrade to tzdata2013b."
2013-03-11 16:42:57 +00:00
Elliott Hughes
cdb27f239b
Upgrade to tzdata2013b.
...
From the release notes:
Changes affecting current and future time stamps:
Haiti uses US daylight-saving rules this year, and presumably future years.
This changes time stamps starting today. (Thanks to Steffen Thorsen.)
Paraguay will end DST on March 24 this year.
(Thanks to Steffen Thorsen.) For now, assume it's just this year.
Morocco does not observe DST during Ramadan;
try to predict Ramadan in Morocco as best we can.
(Thanks to Erik Homoet for the heads-up.)
Change-Id: I98d5290ea5a1d9fb1eeddab1c9e72135dc9e4bd1
2013-03-11 09:41:45 -07:00
Elliott Hughes
b6e22482d4
Let bionic use the correct definition of ssize_t.
...
Bug: 8253769
Change-Id: I50c7cc20828fc089b83580e039ce9153a6c5a8cc
2013-03-08 15:28:52 -08:00
Elliott Hughes
809eed1ded
Merge "Regenerate NOTICE files."
2013-03-07 19:57:17 +00:00
Elliott Hughes
0493a6f7be
Regenerate NOTICE files.
...
Also clean up some obsolete cruft.
Change-Id: Iec3b36f6607f7a08b72de99294ed5b6cd910dd5f
2013-03-07 11:51:10 -08:00
Elliott Hughes
c9f8081425
Merge "Upgrade to current NetBSD popen/pclose."
2013-03-07 00:54:22 +00:00
Elliott Hughes
6b3f49a537
Upgrade to current NetBSD popen/pclose.
...
This gets us back to using vfork now our ARM vfork assembler stub is
fixed, and adds the missing thread safety for the 'pidlist'.
Bug: 5335385
Change-Id: Ib08bfa65b2cb9fa695717aae629ea14816bf988d
2013-03-06 16:20:55 -08:00
Brian Carlstrom
33031fed84
Merge "Fix typo of DT_NEEDED for DT_NULL"
2013-03-06 23:55:56 +00:00
Brian Carlstrom
2d4b9b7cff
Fix typo of DT_NEEDED for DT_NULL
...
(cherry-pick of 138b205ea9efc117fe522c2d7191378023a6e2cd)
Change-Id: Ia895cb3018df55554627f1f61dcdfdada4a961ce
2013-03-06 15:50:30 -08:00
Elliott Hughes
db794197cc
Merge "Fix debug malloc."
2013-03-06 23:13:01 +00:00
Elliott Hughes
642331b5dd
Fix debug malloc.
...
This was broken by the change to use AT_RANDOM for the stack guards.
Bug: 7959813
Bug: 8330764
Change-Id: I791900092b72a9a900f16585237fa7ad82aaed9f
2013-03-06 15:03:53 -08:00
Elliott Hughes
0b4a85bf1e
Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
2013-03-06 17:25:51 +00:00
Kito Cheng
5e2492eb89
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
...
Change-Id: I6432ac378816da253b83d1c7fb1d3fb64647b89e
2013-03-06 23:58:48 +08:00
Brian Carlstrom
20958207d5
Merge "Fix MIPS linker build"
2013-03-06 09:06:16 +00:00
Brian Carlstrom
43cc7f795b
Fix MIPS linker build
...
(cherry-picked from 8c7d8c2057e303985f78eab96da747ddaa013c78)
Change-Id: Idcf62ab95f8fccbc2d7c3e771a4cfbe768a1555e
2013-03-06 01:05:08 -08:00
Elliott Hughes
c41dcad040
Merge "More linker cleanup."
2013-03-06 06:26:56 +00:00
Elliott Hughes
650be4e584
More linker cleanup.
...
Change-Id: I9fb3c7c0d4b4ffef0eeaf092d4e30ffe63a08671
2013-03-05 22:24:34 -08:00
Brian Carlstrom
036f909720
Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
2013-03-06 01:01:23 +00:00
Brian Carlstrom
d4ee82dfa3
Minor linker cleanup, primarily to use Elf32_Dyn
...
Change-Id: Ifa9408e9859c6f79444715bed4808b7c13fdced5
2013-03-05 15:27:21 -08:00
Elliott Hughes
be21fe7a59
Merge "Upgrade to tzdata2013a."
2013-03-05 22:19:14 +00:00
Elliott Hughes
69af6e61e1
Upgrade to tzdata2013a.
...
From the release notes:
Chile's 2013 rules, and we guess rules for 2014 and later, will be
the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
(Thanks to Steffen Thorsen and Robert Elz.)
New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
(Thanks to Tobias Conradi and Arthur David Olson.)
Change-Id: I351e04b3348420ad7df7c648963c235b534033d2
2013-03-05 14:00:38 -08:00
Ben Cheng
133d97e4b0
Merge "Add stack unwinding directives to memcpy."
2013-03-05 21:04:38 +00:00
Elliott Hughes
cf9a9604ad
Merge "Switch to upstream-freebsd for the unmolested wchar code."
2013-03-05 20:13:33 +00:00
Elliott Hughes
eb93ebffba
Switch to upstream-freebsd for the unmolested wchar code.
...
Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
2013-03-01 18:35:56 -08:00
Elliott Hughes
d392e044c7
Merge "Move realpath.c to upstream-freebsd."
2013-03-02 01:22:04 +00:00
Elliott Hughes
f0777843c0
Move realpath.c to upstream-freebsd.
...
This is actually a slightly newer upstream version than the one I
originally pulled. Hopefully now it's in upstream-freebsd it will
be easier to track upstream, though I still need to sit down and
write the necessary scripts at some point.
Bug: 5110679
Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-01 17:11:39 -08:00
Ben Cheng
14283004f5
Add stack unwinding directives to memcpy.
...
Also include some Android specific header files.
Change-Id: Idbcbd43458ba945ca8c61bfbc04ea15fc0ae4e00
2013-03-01 14:56:04 -08:00
Ben Cheng
c5c6cb3f13
am 66273ac2: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '66273ac2b6b8c2042350204575bd290d96dea681':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Ben Cheng
8f149da08d
am b3b1ab62: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit 'b3b1ab6213df15f99c9af3088cfe733428816fd3':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Nick Kralevich
305a999589
am 8fa924e5: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '8fa924e5dff4588cca8586e0e727b9a544db7083':
unistd.h: don't include sys/capability.h
2013-03-01 10:24:57 -08:00
Ben Cheng
66273ac2b6
Merge "Adding strcmp tuned for Cortex-A15."
2013-03-01 18:18:34 +00:00
Ben Cheng
b3b1ab6213
Merge "Adding memcpy tuned for Cortex-A15."
2013-03-01 18:18:05 +00:00
Nick Kralevich
8fa924e5df
Merge "unistd.h: don't include sys/capability.h"
2013-03-01 18:14:47 +00:00
Nick Kralevich
6524d3cad7
unistd.h: don't include sys/capability.h
...
Don't pull in unnecessary header files. AFAIK, I've fixed all
the code which didn't include the correct header files.
Change-Id: If0b7bba74e77cb24a0cf9ce8968aa07400855e58
2013-03-01 10:10:55 -08:00
Greta Yorsh
eb149e954e
Adding strcmp tuned for Cortex-A15.
...
The attached patch provides a new implementation of strcmp for ARM,
using LDRD instead of LDR whenever possible.
For older architectures that do not support LDRD, this implementation
uses the same algorithm as before.
Testing and benchmarking:
* Validation: successfully passes a test that compares different strings
of length 1-128 and offsets 0-8 from a word boundary. Checked on
qemu/A15/A9, ARM/Thumb mode, Big/Little Endian.
* Integration with gcc: no regression on qemu for arm-none-eabi --with-cpu
a15/a9 --with-mode arm/thumb.
Change-Id: I9e230e1b99dbdc9119b69ee858a89038c516a4ea
Signed-off-by: Vassilis Laganakos <vasileios.laganakos@arm.com >
2013-03-01 10:41:01 +00:00
Greta Yorsh
5b349fc22e
Adding memcpy tuned for Cortex-A15.
...
The strategy for large block sizes is LDRD and STRD with offset addressing,
where the main loop copies 64 bytes in every iteration, (i.e., 8 calls to
LDRD and STRD pairs), interleaving load and stores (i.e., the pairs of LDRD
and STRD of the same data are consecutive instructions), and the writeback
of an updated address is a separate instruction, which allows us to write
back the accumulated update once per iteration.
This strategy is implemented in memcpy.S. In some configurations, a plain
version of memcpy (included from memcpy-stub.c) is used instead of the
optimized one.
Validation:
* Correctness: checked memcpy using a test harness for block sizes
ranging between 1 to 128, and source and destination buffers alignment
ranging in { 0,1,2,3,4,8,12 } bytes each.
* Performance: benchmarking on Cortex-A15 FPGA indicates that this strategy
is better for A15 than the strategy used by glibc and even slightly better
than using NEON. Benchmarking on Cortex-A9 bare metal and Linux shows
that the proposed strategy is reasonable: not as fast as the version of
memcpy from glibc (which is the best open source strategy for A9), but
comparable with csl and bionic.
* Integration with GCC: no regression for arm-none-eabi --with-cpu
cortex-a15 and cortex-a9.
Change-Id: Ied56354d8992c62ae3e02d582a2bd55585d814b9
Signed-off-by: Vassilis Laganakos <vasileios.laganakos@arm.com >
2013-03-01 10:40:50 +00:00
Elliott Hughes
7fe8229b49
am 9c1912c4: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '9c1912c4bf5eb0edc07bfd333226c4e0b7a629eb':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 11:43:11 -08:00
Elliott Hughes
9c1912c4bf
Merge "Avoid changing the C++ ABI with ssize_t."
2013-02-28 19:28:53 +00:00
Elliott Hughes
e255642dc1
Avoid changing the C++ ABI with ssize_t.
...
Bug: 8253769
Change-Id: Ia325003ed6e59da553e2bdde7c43515bc191b8ba
2013-02-28 10:51:31 -08:00
Nick Kralevich
58b997c812
am f5f906c1: Merge "libc: create sys/capability.h"
...
* commit 'f5f906c184677b8295523231cfeead9ed94661ad':
libc: create sys/capability.h
2013-02-26 13:50:03 -08:00
Nick Kralevich
f5f906c184
Merge "libc: create sys/capability.h"
2013-02-26 21:38:11 +00:00
Nick Kralevich
7c0dd555c0
libc: create sys/capability.h
...
Per "man capset", sys/capability.h is the appropriate header file
for the capget / capset definition, not unistd.h. Fixed.
As a short term hack, continue to include sys/capability.h in
unistd.h, until we can fix all the code which uses capget / capset.
Change-Id: I6e7cf55955d761ca785a14c5e4b7a44125d8fc15
2013-02-26 13:27:15 -08:00
Elliott Hughes
406968b244
am c0e9ddd0: Merge "Reimplement scandir(3)."
...
* commit 'c0e9ddd002f6084c29c26236d741d64d01713c15':
Reimplement scandir(3).
2013-02-25 14:54:54 -08:00
Elliott Hughes
c0e9ddd002
Merge "Reimplement scandir(3)."
2013-02-25 22:43:28 +00:00
Elliott Hughes
701bec2af3
Reimplement scandir(3).
...
The old scandir implementation didn't take into account the varying
size of directory entries, and didn't correctly clean up on its
error exits.
Bug: 7339844
Change-Id: Ib40e3564709752241a3119a496cbb2192e3f9abe
2013-02-25 13:14:31 -08:00
Elliott Hughes
7b8bf68133
am f6bb5bf4: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit 'f6bb5bf498810d0622f66020059c87b96738c35b':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:02:44 -08:00
Elliott Hughes
f6bb5bf498
Merge "Add the glibc-compatible names to <sys/endian.h>."
2013-02-22 21:46:59 +00:00
Elliott Hughes
440bc83d92
am 7b2c6385: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit '7b2c6385effbb6d6e98bfe29cc6c144211128d9e':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:10:15 -08:00
Nick Kralevich
cadc858329
am bc0e7ee1: Merge "libc: add sys/signal.h for compatibility"
...
* commit 'bc0e7ee18157c2ffe65644514555689f4259ccfe':
libc: add sys/signal.h for compatibility
2013-02-22 11:53:05 -08:00
Elliott Hughes
7b2c6385ef
Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
2013-02-22 19:49:39 +00:00
Nick Kralevich
bc0e7ee181
Merge "libc: add sys/signal.h for compatibility"
2013-02-22 19:33:53 +00:00
Elliott Hughes
6f1b7a6407
Fix <memory.h> to be a synonym for <string.h> like in glibc.
...
Change-Id: If23589c5d85dffd28788e04b010303620fa178ca
2013-02-22 11:11:48 -08:00
Elliott Hughes
cf820d7e96
Add the glibc-compatible names to <sys/endian.h>.
...
Also remove declarations for functions that don't exist; these
are all macros.
Bug: http://code.google.com/p/android/issues/detail?id=41769
Change-Id: Ia3774ab2ff7d3c535f83774eac61068f9b11e194
2013-02-22 11:04:27 -08:00
Nick Kralevich
b22a684990
libc: add sys/signal.h for compatibility
...
Some applications look for sys/signal.h instead of signal.h.
Work around those apps.
Change-Id: I76ac7744ebc56d196b5f0cb9ed381d32817436b9
2013-02-22 10:38:28 -08:00
Elliott Hughes
2a5b57db8c
am 580a7073: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit '580a707376d81bfcb39919f0a1203b39a39dbd8a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 17:55:28 -08:00
Elliott Hughes
580a707376
Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
2013-02-22 01:45:02 +00:00
Elliott Hughes
538f6fc202
Stop advertising rindex(3), which is both deprecated and unimplemented.
...
Change-Id: I3c775d9974e49c3f76a53e46e022659657b89034
2013-02-21 17:39:06 -08:00
Nick Kralevich
398f46dd92
am a0259b42: Merge "libc: remove bcmp prototype"
...
* commit 'a0259b42eba08e6d71a274fa3f770afccbb93107':
libc: remove bcmp prototype
2013-02-21 17:39:03 -08:00
Nick Kralevich
a0259b42eb
Merge "libc: remove bcmp prototype"
2013-02-22 01:22:35 +00:00
Nick Kralevich
11ebbc8437
libc: remove bcmp prototype
...
AFAIK, bionic only ever provided an implementation of bcmp
for x86, and even then, the code was never actually compiled.
Remove the prototype.
bcmp() has been obsoleted and replaced by memcmp()
Change-Id: I549d02ab6a9241a9acbbbfade0d98a9a02c2eaee
2013-02-21 17:17:09 -08:00
Elliott Hughes
719d46f8ac
am a9ff09d1: Merge "Fix raise(3) so it works in signal handlers."
...
* commit 'a9ff09d1fc22292adc12cf99d4d44448d619b3cf':
Fix raise(3) so it works in signal handlers.
2013-02-21 14:17:47 -08:00
Elliott Hughes
a9ff09d1fc
Merge "Fix raise(3) so it works in signal handlers."
2013-02-21 20:05:35 +00:00
Elliott Hughes
fae89fc404
Fix raise(3) so it works in signal handlers.
...
We could special-case raise(3) in non-threaded programs, but the more
conservative course is to make pthread_kill(3) work in signal handlers
at the cost of a race shared by other C libraries.
Change-Id: I59fb23d03bdabf403435e731704b33acdf3e0234
2013-02-21 11:22:23 -08:00
Jean-Baptiste Queru
818b1423d2
Fix mako builds. Do not merge.
...
Revert "Regenerate msm_ion.h."
This reverts commit 3fac8f7f49
2013-02-20 12:47:58 -08:00
Elliott Hughes
ccd403161c
Merge "use architecture-specific ssize_t definition"
2013-02-19 22:13:53 +00:00
Thorsten Glaser
c641cafbc3
use architecture-specific ssize_t definition
...
after change 32822 was rejected, this is the more light-weight
version of the fix: libc/include/sys/types.h already - via
libc/kernel/common/linux/posix_types.h - includes a definition
of __kernel_ssize_t from libc/kernel/arch-*/asm/posix_types.h
which is architecture-specific, toolchain-agnostic and also
gets rid of the gcc -Wformat warning (which it issues correctly,
since this i̲s̲ indeed a bug in bionic)
Change-Id: Ie4503ab16628bc25815a836d07556f665e9795c7
2013-02-19 14:12:55 -08:00
Elliott Hughes
593abb7b59
Merge "stdlib: atexit: include <sys/cdefs.h>"
2013-02-19 21:58:18 +00:00
Elliott Hughes
eeecff7293
Merge "Fix pthreads functions that should return ESRCH."
2013-02-19 21:37:55 +00:00
Elliott Hughes
9d23e04c43
Fix pthreads functions that should return ESRCH.
...
imgtec pointed out that pthread_kill(3) was broken, but most of the
other functions that ought to return ESRCH for invalid/exited threads
were equally broken.
Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-19 12:21:41 -08:00
Elliott Hughes
b5862d4d8a
Merge "Update linker README."
2013-02-19 19:14:26 +00:00
Elliott Hughes
aa772a33ba
Update linker README.
...
Change-Id: Icaa353e9cf1848c86e7445f4ad590bdab44f7941
2013-02-19 11:13:44 -08:00
Chirayu Desai
61ba9b526b
stdlib: atexit: include <sys/cdefs.h>
...
Change-Id: Ib9eb167710a021e0a2b5c77a06a9338cdc748e6d
2013-02-16 21:23:27 +05:30
Elliott Hughes
7f67f78ad5
Merge "dalvik is big enough and ugly enough to handle System.arraycopy itself."
2013-02-16 00:40:21 +00:00
Elliott Hughes
081318e355
dalvik is big enough and ugly enough to handle System.arraycopy itself.
...
Change-Id: I4b54a15ea101c0c6bab06cfb11e4178f5a57fc05
2013-02-15 14:27:52 -08:00
Elliott Hughes
39804dcde6
Merge "Fix the pthread_setname_np test."
2013-02-15 21:55:22 +00:00
Elliott Hughes
40eabe24e4
Fix the pthread_setname_np test.
...
Fix the pthread_setname_np test to take into account that emulator kernels are
so old that they don't support setting the name of other threads.
The CLONE_DETACHED thread is obsolete since 2.5 kernels.
Rename kernel_id to tid.
Fix the signature of __pthread_clone.
Clean up the clone and pthread_setname_np implementations slightly.
Change-Id: I16c2ff8845b67530544bbda9aa6618058603066d
2013-02-15 12:08:59 -08:00
Elliott Hughes
3e3b239d2b
Merge "Fix the stack protector death test."
2013-02-15 02:10:29 +00:00
Elliott Hughes
7fd803cdfa
Fix the stack protector death test.
...
Now __stack_chk_fail calls abort(3) directly, we terminate with
SIGSEGV rather than SIGABRT. (Because of the workaround for the
debuggerd lossage in the abort(3) implementation, which was the
motivation for switching __stack_chk_fail over to abort(3).)
Also clarify the comment on the weird pthread death test, so it
doesn't get copied and pasted onto real death tests.
Change-Id: Ie832eaded61359c99e7a10db65e28f35e8f63eed
2013-02-14 16:35:58 -08:00
Elliott Hughes
0a2cb81597
Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."
2013-02-14 23:50:13 +00:00
Nick Kralevich
b128f49fd5
Merge "bionic: Add securebits.h"
2013-02-14 22:49:28 +00:00
Elliott Hughes
fb7eb5e07f
Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.
...
Bug: 2487269
Change-Id: Iec5e470fc22cd9108404f634a9d4baa2c7b7f58f
2013-02-14 14:37:34 -08:00
Nick Kralevich
0276656daa
bionic: Add securebits.h
...
Change-Id: I2031796b9be117558b80246498b29736492cf269
2013-02-14 14:03:37 -08:00
Elliott Hughes
c2d26ce745
Merge "Turn on -Werror for ssp.cpp."
2013-02-14 19:17:33 +00:00
Elliott Hughes
dc5ec07158
Turn on -Werror for ssp.cpp.
...
libc_bionic.a is already compiled -Werror, but this one file gets
compiled into its own library because it needs to be compiled with
-fno-stack-protector.
Change-Id: I273c535ab5c73ccaccbcf793fda1f788a2589abe
2013-02-14 11:15:58 -08:00
Nick Kralevich
fe33fc790a
Merge "fix compiler warning."
2013-02-14 17:48:30 +00:00
Nick Kralevich
a261afb7c9
fix compiler warning.
...
bionic/libc/bionic/ssp.cpp:41:31: warning: converting to non-pointer type 'uintptr_t {aka unsigned int}' from NULL [-Wconversion-null]
Change-Id: Id154ed4a99520cca64ffd3dbe4d743db6e2da28a
2013-02-14 09:44:13 -08:00
Elliott Hughes
6b97c7dc03
Merge "ffs was not being built for x86."
2013-02-14 00:49:47 +00:00
Elliott Hughes
97f2ec50a7
Merge "Stop using the local gcc."
2013-02-14 00:48:53 +00:00
Elliott Hughes
26a13bcfb8
Stop using the local gcc.
...
Some build servers are still out of date, so we're better off having
the known quanitity of the consistently out-of-date prebuilt host gcc.
Change-Id: Ib6308ae926ffa1ac5d95efbbf32052344c17a6b8
2013-02-13 16:32:47 -08:00
Elliott Hughes
d2547040a1
ffs was not being built for x86.
...
Change-Id: I53e92273664a4d0a13536c2fa1aeb87e1f3cf4e8
2013-02-13 16:31:52 -08:00
Elliott Hughes
95b1ea1bb3
Merge "Add a bunch more missing ENDs to assembler routines."
2013-02-13 23:18:26 +00:00
Elliott Hughes
6719500dbd
Add a bunch more missing ENDs to assembler routines.
...
This isn't everything; I've missed out those x86 files that are
Change-Id: Idb7bb1a68796d6c0b70ea2b5c3300e49da6c62d2
2013-02-13 15:12:32 -08:00
Elliott Hughes
2fee0340a9
Merge "Everyone has CLZ."
2013-02-13 23:10:19 +00:00
Elliott Hughes
73964c592c
Everyone has CLZ.
...
Even armv5 had CLZ.
Change-Id: I51bc8d1166d09940fd0d3f4c7717edf26977082c
2013-02-13 14:40:48 -08:00
Elliott Hughes
627274292e
Merge "Update getnameinfo.c, remove dead code, and fix error reporting."
2013-02-13 21:15:05 +00:00
Elliott Hughes
d8213bb573
Update getnameinfo.c, remove dead code, and fix error reporting.
...
Also add a unit test for the salen size checking.
Bug: 1889275
Change-Id: I8ec4107df9e2e9a8571e8915525249c6e44b98ad
2013-02-13 13:11:11 -08:00
Elliott Hughes
f659b3c90d
Merge "Add a test that getaddrinfo works when hints are NULL."
2013-02-13 17:04:01 +00:00
Elliott Hughes
d3b9d11369
Add a test that getaddrinfo works when hints are NULL.
...
Bug: 1827911
Change-Id: I9e1b774c44c10a8c5391bcf3baf1607f50eaf214
2013-02-13 08:22:07 -08:00
Elliott Hughes
3002d64bcd
Merge "Everyone has a TLS register."
2013-02-13 16:03:32 +00:00
Elliott Hughes
9cbe1e63dd
Merge "Fix __pthread_clone and __bionic_clone error handling on x86."
2013-02-13 16:02:10 +00:00
Elliott Hughes
b6032515a0
Fix __pthread_clone and __bionic_clone error handling on x86.
...
Bug: 3461078
Change-Id: I93c151e27411211dd32717f206745c62c08c21ee
2013-02-12 23:02:33 -08:00
Elliott Hughes
91a9925998
Everyone has a TLS register.
...
Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-12 21:56:42 -08:00
Elliott Hughes
baf2c09f3f
Merge "Put the right number of Ls after 64-bit constants."
2013-02-13 04:20:43 +00:00
Elliott Hughes
5227663d2f
Put the right number of Ls after 64-bit constants.
...
Change-Id: I9f96259f21e42a84b9ebe20655fe0edb31f41892
2013-02-12 20:18:49 -08:00
Elliott Hughes
59aeff9417
Merge "Use ENTRY/END in custom x86 assembler too."
2013-02-13 04:01:01 +00:00
Elliott Hughes
07f7e62a25
Merge "Clean up pthread_create."
2013-02-13 01:56:46 +00:00
Elliott Hughes
899d65283d
Merge "Give up trying to build the pthread_setname_np tests for glibc."
2013-02-13 01:56:07 +00:00
Elliott Hughes
9701d4b701
Give up trying to build the pthread_setname_np tests for glibc.
...
Looks like using /usr/bin/g++ isn't enough on some of our older
build servers.
Change-Id: Id7681fb164eb6324b10050f6bb237393e95b41e9
2013-02-12 17:55:22 -08:00
Elliott Hughes
4b4a882428
Clean up pthread_create.
...
Bug: 3461078
Change-Id: I082122a86d7692cd58f4145539241be026258ee0
2013-02-12 17:15:59 -08:00
Elliott Hughes
991ee7d895
Merge "Simplify pthread_create, using more public API."
2013-02-13 00:39:41 +00:00
Elliott Hughes
6d33918207
Simplify pthread_create, using more public API.
...
Change-Id: I08e65ba88ed01436223e4e528631c9e41ec0e7f4
2013-02-12 16:36:04 -08:00
Elliott Hughes
4912782c6a
Merge "Really set errno if __pthread_clone fails."
2013-02-13 00:12:42 +00:00
Elliott Hughes
9f878c2fca
Really set errno if __pthread_clone fails.
...
If r0 == 0, we're the child. If r0 > 0, we're the parent.
Otherwise set errno.
The __bionic_clone code I copy & pasted was wrong. This patch
fixes both.
Bug: 3461078
Change-Id: Ibb7d6cc7e54e666841f2f0dc59a141a0b31982e4
2013-02-12 16:07:06 -08:00
Elliott Hughes
558a8b1d3b
Merge "Revert "Revert "More pthreads cleanup."""
2013-02-13 00:05:24 +00:00
Elliott Hughes
3e898476c7
Revert "Revert "More pthreads cleanup.""
...
This reverts commit 6f94de3ca4
2013-02-12 15:27:18 -08:00
Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00:00
Elliott Hughes
bfa199ab40
am fcaf4e9f: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
Revert "More pthreads cleanup."
2013-02-11 22:16:56 -08:00
Elliott Hughes
fcaf4e9f9b
Merge "Revert "More pthreads cleanup.""
2013-02-12 06:07:32 +00:00
Elliott Hughes
6f94de3ca4
Revert "More pthreads cleanup."
...
This reverts commit 2a1bb4e646
2013-02-12 06:06:22 +00:00
Elliott Hughes
a2a9817f4c
am 85f491f9: Merge "More pthreads cleanup."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '85f491f96da3b79d0d7cc5368bc1f649e1a82340':
More pthreads cleanup.
2013-02-11 18:35:56 -08:00
Elliott Hughes
85f491f96d
Merge "More pthreads cleanup."
2013-02-12 02:33:08 +00:00
Elliott Hughes
605cc29358
am 83bf28e6: Merge "Fix MIPS build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '83bf28e6a38dbf28707147b50d29e81f4b555046':
Fix MIPS build.
2013-02-11 18:19:34 -08:00
Elliott Hughes
83bf28e6a3
Merge "Fix MIPS build."
2013-02-12 02:08:05 +00:00
Elliott Hughes
ba342c11ad
Fix MIPS build.
...
Change-Id: I4863f21f3c2fd597ea36cb7096fc72db808643a3
2013-02-11 18:06:23 -08:00
Elliott Hughes
8e2b28cb6c
am c56be54a: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c56be54a18eff7e1c35c9a19cfc8b84a80780b73':
Use ENTRY/END in ARM __get_sp.
2013-02-11 17:27:40 -08:00
Elliott Hughes
bdff26df27
Use ENTRY/END in custom x86 assembler too.
...
Change-Id: Ic2e482e5daff29c65d3b2ab0b2111c996bbc6226
2013-02-11 17:08:16 -08:00
Elliott Hughes
c56be54a18
Merge "Use ENTRY/END in ARM __get_sp."
2013-02-12 00:59:43 +00:00
Elliott Hughes
d7a3a403c1
Use ENTRY/END in ARM __get_sp.
...
Change-Id: If2f159b266f5fa4ad9d188a17d4cd318b605e446
2013-02-11 16:58:34 -08:00
Elliott Hughes
c440d24423
am cae7b2cf: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'cae7b2cfb509e7d5d10a8085b1ec319daaef768f':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 16:55:16 -08:00
Elliott Hughes
cae7b2cfb5
Merge "Fix __pthread_clone on ARM to set errno on failure."
2013-02-12 00:49:28 +00:00
Elliott Hughes
5e3fc43dde
Fix __pthread_clone on ARM to set errno on failure.
...
MIPS and x86 appear to have been correct already.
(Also fix unit tests that ASSERT_EQ with errno so that the
arguments are in the retarded junit order.)
Bug: 3461078
Change-Id: I2418ea98927b56e15b4ba9cfec97f5e7094c6291
2013-02-11 16:39:10 -08:00
Elliott Hughes
03798dd23c
am 1fea0f25: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1fea0f258a45d918fe5ae8e9769f45c0348bd095':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 16:17:48 -08:00
Elliott Hughes
1fea0f258a
Merge "Clean up ARM assembler files to use ENTRY/END."
2013-02-12 00:05:27 +00:00
Elliott Hughes
f94fd3ccc6
Clean up ARM assembler files to use ENTRY/END.
...
We also don't need legacy syscall support (non-"swi 0").
Change-Id: Id1012e8ca18bf13f3f4e42200f39ba0e2e632cbf
2013-02-11 15:36:59 -08:00
Elliott Hughes
2a1bb4e646
More pthreads cleanup.
...
POSIX says pthread_create returns EAGAIN, not ENOMEM.
Also pull pthread_attr_t functions into their own file.
Also pull pthread_setname_np into its own file.
Also remove unnecessary #includes from pthread_key.cpp.
Also account for those pthread keys used internally by bionic,
so they don't count against the number of keys available to user
code. (They do with glibc, but glibc's limit is the much more
generous 1024.)
Also factor out the common errno-restoring idiom to reduce gotos.
Bug: 6702535
Change-Id: I555e66efffcf2c1b5a2873569e91489156efca42
2013-02-11 14:56:39 -08:00
Elliott Hughes
6b73d13fa4
am 2d3e7233: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2d3e72336e76180fb00822386da4f14203d117ce':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 12:38:30 -08:00
Elliott Hughes
2d3e72336e
Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
2013-02-11 20:21:59 +00:00
Elliott Hughes
e4b08318c1
am 8397cdba: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review
* commit '8397cdba9424febeaed4068829a5b0174ee1138c':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 12:21:50 -08:00
Elliott Hughes
44b53ad681
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
This reverts commit 6260553d48
2013-02-11 12:20:33 -08:00
Elliott Hughes
8397cdba94
Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 20:18:28 +00:00
Elliott Hughes
6260553d48
Revert "Pull the pthread_key_t functions out of pthread.c."
...
This reverts commit ad59322ae4
2013-02-11 20:18:16 +00:00
Elliott Hughes
024246ec27
am 09e89c3c: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '09e89c3ced51d846e13c2508fbb6812bb61475cd':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 12:05:45 -08:00
Elliott Hughes
09e89c3ced
Merge "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 20:02:29 +00:00
Elliott Hughes
ad59322ae4
Pull the pthread_key_t functions out of pthread.c.
...
This was originally motivated by noticing that we were setting the
wrong bits for the well-known tls entries. That was a harmless bug
because none of the well-known tls entries has a destructor, but
it's best not to leave land mines lying around.
Also add some missing POSIX constants, a new test, and fix
pthread_key_create's return value when we hit the limit.
Change-Id: Ife26ea2f4b40865308e8410ec803b20bcc3e0ed1
2013-02-11 12:00:48 -08:00
Elliott Hughes
8f509e8be1
am 9a9bb243: Merge "Switch to using AT_RANDOM for the stack guards."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9a9bb243b50be5e3910b8edad72327bc216e72d0':
Switch to using AT_RANDOM for the stack guards.
2013-02-08 11:22:05 -08:00
Elliott Hughes
9a9bb243b5
Merge "Switch to using AT_RANDOM for the stack guards."
2013-02-08 19:17:33 +00:00
Elliott Hughes
d3920b3a99
Switch to using AT_RANDOM for the stack guards.
...
Bug: 7959813
Change-Id: I8db4b8912ba649bfe668c6f22aa44690ddd401a2
2013-02-08 11:16:13 -08:00
Elliott Hughes
636d21f32b
am 03579da2: Merge "Add a few more missing libm long double stubs."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '03579da2d91a57a0f22da14e4216ecaf811869f4':
Add a few more missing libm long double stubs.
2013-02-07 18:15:06 -08:00
Elliott Hughes
03579da2d9
Merge "Add a few more missing libm long double stubs."
2013-02-08 02:02:39 +00:00
Elliott Hughes
170dbe25d6
Add a few more missing libm long double stubs.
...
Change-Id: I6c44b9f3eee730253a958d6cefdac99e6f79da3e
2013-02-07 17:45:11 -08:00
Nick Kralevich
f156b901b1
am fa75fce5: Merge "update xattr.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fa75fce56641255a571b8b472f010863c3095b70':
update xattr.h
2013-02-07 16:50:08 -08:00
Nick Kralevich
fa75fce566
Merge "update xattr.h"
2013-02-08 00:42:29 +00:00
Nick Kralevich
b184d3ba33
update xattr.h
...
Change-Id: Ibd91167ba56e2692359b92fe3108da271f0c2e38
2013-02-07 16:23:16 -08:00
Elliott Hughes
86e4e23408
am 964886af: Merge "Remove dead code from gensyscalls.py."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '964886afa339959aedad1c09af738df4ffa4091d':
Remove dead code from gensyscalls.py.
2013-02-07 14:57:41 -08:00
Elliott Hughes
964886afa3
Merge "Remove dead code from gensyscalls.py."
2013-02-07 22:17:55 +00:00
Elliott Hughes
cd6780b167
Remove dead code from gensyscalls.py.
...
Change-Id: I0df69f8fd990f829ccbfcd5123c17b523d5a4d45
2013-02-07 14:07:00 -08:00
Elliott Hughes
5bb67760f0
am f6afd3b6: Merge "Fix x86 build, remove void* arithmetic."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6afd3b670e23f56bf341d12136416aee17ea249':
Fix x86 build, remove void* arithmetic.
2013-02-07 12:34:24 -08:00
Elliott Hughes
8ddef40dad
am 59e9a496: Merge "__progname should be const char*, not char*."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59e9a496b4341fd2b11d4a01544bf7edf3d00cc5':
__progname should be const char*, not char*.
2013-02-07 12:34:23 -08:00
Elliott Hughes
f6afd3b670
Merge "Fix x86 build, remove void* arithmetic."
2013-02-07 20:27:40 +00:00
Elliott Hughes
59e9a496b4
Merge "__progname should be const char*, not char*."
2013-02-07 20:16:32 +00:00
Elliott Hughes
646e058136
Fix x86 build, remove void* arithmetic.
...
Change-Id: Idc7f14af2e094ac33de315e808176237af063bb8
2013-02-07 12:16:10 -08:00
Elliott Hughes
e4ccf5a138
__progname should be const char*, not char*.
...
Change-Id: I8e846872c30a712fbc05c8da59ffa1cec1be31a4
2013-02-07 12:06:44 -08:00
Elliott Hughes
6f67cd224e
am 2f41531f: Merge "Clean up the argc/argv/envp/auxv handling."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2f41531ff9f48dbdaf2ba711e14c669031728e99':
Clean up the argc/argv/envp/auxv handling.
2013-02-07 11:56:57 -08:00
Elliott Hughes
2f41531ff9
Merge "Clean up the argc/argv/envp/auxv handling."
2013-02-07 19:48:17 +00:00
Elliott Hughes
42b2c6a5ee
Clean up the argc/argv/envp/auxv handling.
...
There's now only one place where we deal with this stuff, it only needs to
be parsed once by the dynamic linker (rather than by each recipient), and it's
now easier for us to get hold of auxv data early on.
Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 11:44:21 -08:00
Elliott Hughes
4e9d9e4df8
am d4187efd: Merge "Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd4187efd7f9c30ffaff4738862e3d08be27a52e9':
Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs.
2013-02-07 09:12:18 -08:00
Elliott Hughes
d4187efd7f
Merge "Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs."
2013-02-07 16:55:28 +00:00
Elliott Hughes
7582a9c119
Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs.
...
Also update the x86 asm.h to support this; we need it for libm assembler
anyway.
Also clean up the _FBSDID hack in <sys/cdefs.h>.
Change-Id: Iababd977b8110ec022bf7c93f4d62ece47630e7c
2013-02-06 17:08:15 -08:00
Elliott Hughes
09559dd046
am d32fdbaf: Merge "Add a missing logbl stub."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd32fdbaf03f688497adbec885e85c0a69f7a4542':
Add a missing logbl stub.
2013-02-06 16:30:26 -08:00
Elliott Hughes
d32fdbaf03
Merge "Add a missing logbl stub."
2013-02-07 00:09:49 +00:00
Elliott Hughes
926a307ce1
Add a missing logbl stub.
...
This doesn't usually matter because there's a weak reference; you'd
miss this if you stopped using s_logb.c though.
Change-Id: I912fceae327a378031cd24a64aefa9dfd84f7f90
2013-02-06 16:07:54 -08:00
Elliott Hughes
d2a6d8d77d
am c9ab32e4: Merge "Improve benchmarking tool, add a few math benchmarks."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c9ab32e4e94f770de347d6da8e7615fa131bcfbb':
Improve benchmarking tool, add a few math benchmarks.
2013-02-06 16:06:24 -08:00
Elliott Hughes
c9ab32e4e9
Merge "Improve benchmarking tool, add a few math benchmarks."
2013-02-07 00:04:24 +00:00
Elliott Hughes
9edb3e004b
Improve benchmarking tool, add a few math benchmarks.
...
Change-Id: I641305dd0e4ac0705381e735ed1604c5be7aa536
2013-02-06 15:47:09 -08:00
Elliott Hughes
5fe286618f
am d10a5a02: Merge "Remove the currently-unused i387 assembler to make way for the new."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd10a5a02d1e9315dd7d780c2f221d116ced45a69':
Remove the currently-unused i387 assembler to make way for the new.
2013-02-06 12:22:30 -08:00
Elliott Hughes
d10a5a02d1
Merge "Remove the currently-unused i387 assembler to make way for the new."
2013-02-06 19:57:51 +00:00
Elliott Hughes
0e51a86124
am 4fc2a74b: Merge "Remove partial implementation of MIPS non-PIC support."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4fc2a74b29a12ed7fb4edc6b76db96b9d7dfa3f2':
Remove partial implementation of MIPS non-PIC support.
2013-02-06 11:51:12 -08:00
Elliott Hughes
ef545a29ad
Remove the currently-unused i387 assembler to make way for the new.
...
Change-Id: I37e4e8fce881246b9b028f9e1619247b1ac25261
2013-02-06 11:50:19 -08:00
Elliott Hughes
4fc2a74b29
Merge "Remove partial implementation of MIPS non-PIC support."
2013-02-06 19:40:47 +00:00
Elliott Hughes
d2b1a7311f
Remove partial implementation of MIPS non-PIC support.
...
Change-Id: I3c287e52aae10559508174e73113367aea40e5c2
2013-02-06 11:02:28 -08:00
Elliott Hughes
df8c72e510
am d7ff139f: Merge "Remove bogus extra alignment from sbrk."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd7ff139fec5cec08793523aa97503ade2b13c38e':
Remove bogus extra alignment from sbrk.
2013-02-05 17:09:55 -08:00
Elliott Hughes
d7ff139fec
Merge "Remove bogus extra alignment from sbrk."
2013-02-06 00:57:44 +00:00
Elliott Hughes
428f5567be
Remove bogus extra alignment from sbrk.
...
Bug: https://code.google.com/p/android/issues/detail?id=37349
Change-Id: I970c7b6be7bb7fbe6bbbe2c332f05816aeb0e09f
2013-02-05 16:10:59 -08:00
Elliott Hughes
3cbcb87bd1
am a4f88fdc: Merge "Document the mallinfo struct, add missing attributes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a4f88fdcf0e9be084d04048ad65671716298c3c2':
Document the mallinfo struct, add missing attributes.
2013-02-04 13:59:15 -08:00
Elliott Hughes
a4f88fdcf0
Merge "Document the mallinfo struct, add missing attributes."
2013-02-04 21:53:18 +00:00
Elliott Hughes
24fad01755
Document the mallinfo struct, add missing attributes.
...
Change-Id: Ia97acce1f6a83bd8b3ba8dd20efd962bc96f35a9
2013-02-04 13:44:14 -08:00
Elliott Hughes
384bdb3776
am a3120aaf: Merge "Add basic tests for posix_memalign."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a3120aaf2f4e20261a2ea9fd8862e2b360183fc5':
Add basic tests for posix_memalign.
2013-02-04 13:25:55 -08:00
Elliott Hughes
a3120aaf2f
Merge "Add basic tests for posix_memalign."
2013-02-04 21:19:19 +00:00
Elliott Hughes
b16b72248b
Add basic tests for posix_memalign.
...
Change-Id: Ie34fcc87aa9e8bfc715e25161752024b11e2032a
2013-02-04 13:18:00 -08:00
Elliott Hughes
ada6de673b
am a1821f01: Merge "Regenerate msm_ion.h."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a1821f015306e221e6a51e5acc27176ae2d72f6b':
Regenerate msm_ion.h.
2013-02-04 10:52:16 -08:00
Elliott Hughes
a1821f0153
Merge "Regenerate msm_ion.h."
2013-02-04 18:42:14 +00:00
Elliott Hughes
3fac8f7f49
Regenerate msm_ion.h.
...
Bug: 8000377
Change-Id: If496d9972cb8aebfc996ac641aa762220aa71f3b
2013-02-01 18:21:08 -08:00
Elliott Hughes
16444e0f85
am 3dc6b57c: Merge "Don\'t claim there were no leaks if we weren\'t even checking."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3dc6b57cf54b15a756551deeda33df5715e519bb':
Don't claim there were no leaks if we weren't even checking.
2013-02-01 17:26:56 -08:00
Elliott Hughes
3dc6b57cf5
Merge "Don't claim there were no leaks if we weren't even checking."
2013-02-02 01:18:44 +00:00
Elliott Hughes
9c81892c2e
Don't claim there were no leaks if we weren't even checking.
...
Bug: 8107016
Change-Id: I9059f1f8374ebcdf00dfc6ac74d3709f501292c9
2013-02-01 17:07:40 -08:00
Elliott Hughes
33e4365d87
am 1bf83555: Merge "Make sincosl call sinl and cosl."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1bf835558a3f7424c805766250ace88fa70e0630':
Make sincosl call sinl and cosl.
2013-02-01 16:50:49 -08:00
Elliott Hughes
1bf835558a
Merge "Make sincosl call sinl and cosl."
2013-02-02 00:42:01 +00:00
Elliott Hughes
422c400dd3
am ae70b946: Merge "Update the libm/NOTICE file after the upgrade."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'ae70b9467419c5a9b21e06dc1dba201a112a83be':
Update the libm/NOTICE file after the upgrade.
2013-02-01 16:35:08 -08:00
Elliott Hughes
9b05df325c
Make sincosl call sinl and cosl.
...
Bug: 2748728
Change-Id: Id18070963b91b144758c567ad7ac80758e3a638b
2013-02-01 16:32:50 -08:00
Elliott Hughes
ae70b94674
Merge "Update the libm/NOTICE file after the upgrade."
2013-02-02 00:26:12 +00:00
Elliott Hughes
704d9c5b45
am a9dd3670: Merge "Restore bionic\'s <linux/elf-em.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a9dd36702f4a9d65d084387050b688b8965b13b3':
Restore bionic's <linux/elf-em.h>.
2013-02-01 16:19:37 -08:00
Elliott Hughes
d65bd8400e
Update the libm/NOTICE file after the upgrade.
...
Change-Id: Icf9c44402d6f86117d61307219bb1cccd288854d
2013-02-01 16:16:54 -08:00
Elliott Hughes
a9dd36702f
Merge "Restore bionic's <linux/elf-em.h>."
2013-02-02 00:11:33 +00:00
Elliott Hughes
a48e1b2aac
Restore bionic's <linux/elf-em.h>.
...
Used by <linux/audit.h>.
Change-Id: Ica4ebb7f52a7fce13c52fdff35e187ded3939382
2013-02-01 16:10:28 -08:00
Elliott Hughes
ff26e25b51
am 44badc70: Merge "Upgrade libm."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '44badc70ccd35d7690bda9f107e3e5da0b80d295':
Upgrade libm.
2013-02-01 15:24:27 -08:00
Elliott Hughes
44badc70cc
Merge "Upgrade libm."
2013-02-01 23:07:49 +00:00
Elliott Hughes
a0ee07829a
Upgrade libm.
...
This brings us up to date with FreeBSD HEAD, fixes various bugs, unifies
the set of functions we support on ARM, MIPS, and x86, fixes "long double",
adds ISO C99 support, and adds basic unit tests.
It turns out that our "long double" functions have always been broken
for non-normal numbers. This patch fixes that by not using the upstream
implementations and just forwarding to the regular "double" implementation
instead (since "long double" on Android is just "double" anyway, which is
what BSD doesn't support).
All the tests pass on ARM, MIPS, and x86, plus glibc on x86-64.
Bug: 3169850
Bug: 8012787
Bug: https://code.google.com/p/android/issues/detail?id=6697
Change-Id: If0c343030959c24bfc50d4d21c9530052c581837
2013-02-01 14:51:19 -08:00
Elliott Hughes
9743d7fb60
am fb55511e: am e1a124e5: Merge "Say explicitly if there were no leaks."
...
# Via Android Git Automerger (1) and others
* commit 'fb55511e71900476fd03f9c490dc60269d076d1f':
Say explicitly if there were no leaks.
2013-01-30 12:11:30 -08:00
Elliott Hughes
fb55511e71
am e1a124e5: Merge "Say explicitly if there were no leaks."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'e1a124e5c93b59e2b6792e4de8a2c72dc0a78be1':
Say explicitly if there were no leaks.
2013-01-30 12:09:14 -08:00
Elliott Hughes
e1a124e5c9
Merge "Say explicitly if there were no leaks."
2013-01-30 19:53:49 +00:00
Elliott Hughes
1d12d57416
Say explicitly if there were no leaks.
...
Otherwise people trying to use this are left wondering "did I not leak, or did
the leak checking code not get called when I exited?".
Change-Id: If79b225f8a2e24dd69aba1fb836bf9e81bb00efe
2013-01-30 11:38:26 -08:00
Elliott Hughes
9d43c07987
am 4e882503: am a990cf5b: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Android Git Automerger (1) and others
* commit '4e8825038e08762dcc973fa435b531f10290ffa8':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:31:24 -08:00
Elliott Hughes
4e8825038e
am a990cf5b: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a990cf5b3392c5aef767aee1e67b4d7ef651afc6':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:28:59 -08:00
Elliott Hughes
a990cf5b33
Merge "Clean up trailing whitespace in the kernel headers."
2013-01-30 18:13:29 +00:00
Elliott Hughes
c95eb57405
Clean up trailing whitespace in the kernel headers.
...
And fix the scripts so they stop letting trailing whitespace through.
Change-Id: Ie109fbe1f63321e565ba0fa60fee8e9cf3a61cfc
2013-01-30 10:13:07 -08:00
Elliott Hughes
5821e11d0b
am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."
...
# Via Android Git Automerger (1) and others
* commit '7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4':
Fix valgrind build.
2013-01-29 18:09:26 -08:00
Elliott Hughes
7bc49fcfc0
am 323287ea: Merge "Fix valgrind build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '323287ea7fb1d22f64b49d701b33cef9fbaf757d':
Fix valgrind build.
2013-01-29 18:06:19 -08:00
Elliott Hughes
323287ea7f
Merge "Fix valgrind build."
2013-01-30 01:50:16 +00:00
Elliott Hughes
6fe67c3cf2
Fix valgrind build.
...
Change-Id: Ie375d32565d10f4c0c56da5422f52b68cb069654
2013-01-29 17:49:12 -08:00
Elliott Hughes
9d995d6721
am 1cc09402: am f6721978: Merge "Fix x86 build to use <elf.h>."
...
# Via Android Git Automerger (1) and others
* commit '1cc09402e86b91213e06a9a349c5c510cefcf1d5':
Fix x86 build to use <elf.h>.
2013-01-29 17:04:14 -08:00
Elliott Hughes
0a383883fa
am be11de2b: am 5fb409b7: Merge "Bring the NOTICE files back up to date."
...
# Via Android Git Automerger (1) and others
* commit 'be11de2b52ac5f8cbb5a733821cb27002f2ea975':
Bring the NOTICE files back up to date.
2013-01-29 17:04:13 -08:00
Elliott Hughes
a7f44b5afe
am 172e038f: am f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
...
# Via Android Git Automerger (1) and others
* commit '172e038f9e5b711a77afe7e8899343215cf25c9e':
Use the NetBSD <sys/exec_elf.h>.
2013-01-29 17:04:11 -08:00
Elliott Hughes
1cc09402e8
am f6721978: Merge "Fix x86 build to use <elf.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f67219783fa7c38c1f4f077364290d10d3aa1db4':
Fix x86 build to use <elf.h>.
2013-01-29 16:58:45 -08:00
Elliott Hughes
be11de2b52
am 5fb409b7: Merge "Bring the NOTICE files back up to date."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '5fb409b7b0b0a4ecca5fd2a6c7dc5ce421f6b7cf':
Bring the NOTICE files back up to date.
2013-01-29 16:42:04 -08:00
Elliott Hughes
f67219783f
Merge "Fix x86 build to use <elf.h>."
2013-01-30 00:41:24 +00:00
Elliott Hughes
d070df4c74
Fix x86 build to use <elf.h>.
...
Change-Id: I7b697d5eae69dc08eb31471a42cb8bbe5360be76
2013-01-29 16:40:39 -08:00
Elliott Hughes
5fb409b7b0
Merge "Bring the NOTICE files back up to date."
2013-01-30 00:33:53 +00:00
Elliott Hughes
172e038f9e
am f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f09f6db5dd87856bbbb7a3d465187b9d8799a788':
Use the NetBSD <sys/exec_elf.h>.
2013-01-29 16:26:10 -08:00
Elliott Hughes
448080d372
Bring the NOTICE files back up to date.
...
Change-Id: I978275cf6604b90595ee79d897c0460eeadc7dc8
2013-01-29 16:25:06 -08:00
Elliott Hughes
f09f6db5dd
Merge "Use the NetBSD <sys/exec_elf.h>."
2013-01-30 00:06:11 +00:00
Elliott Hughes
a6a3ac5924
Use the NetBSD <sys/exec_elf.h>.
...
Replace a kernel header file dependency with files from NetBSD.
They're more complete, and ELF is ELF, whether you're on Linux or a BSD.
Bug: 7973611
Change-Id: I83ee719e7efdf432ec2ddbe8be271d05b2f558d7
2013-01-29 15:02:50 -08:00
Elliott Hughes
f5d6238c4b
am 3f20ecc2: am 3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
...
# Via Android Git Automerger (1) and others
* commit '3f20ecc20486ae8fe8d9332102b503135f83c62d':
Don't collect useless stack frames; do demangle C++ symbols.
2013-01-29 12:07:13 -08:00
Elliott Hughes
3f20ecc204
am 3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3db2fc5acb4894a2cb22533b165a0de1bbafc3f6':
Don't collect useless stack frames; do demangle C++ symbols.
2013-01-29 12:03:53 -08:00
Elliott Hughes
3db2fc5acb
Merge "Don't collect useless stack frames; do demangle C++ symbols."
2013-01-29 19:59:30 +00:00
Elliott Hughes
35b621c5f4
Don't collect useless stack frames; do demangle C++ symbols.
...
Previously, we'd collect every stack frame and then throw some away
when we came to log them. This meant that stack traces were effectively
shorter than the buffers that had been allocated for them. This patch
only stores frames we'll actually output.
Also dynamically call the C++ demangler so we don't have to try to
read mangled names. Because no one knows the mangling of operator new[]
for int arrays off the top of their head.
Bug: 7291287
Change-Id: I42b022fd7cd61675d05171de4c3b2704d058ef2a
2013-01-29 09:56:31 -08:00
Elliott Hughes
2218b89ca7
am d383ac15: am a0151cbf: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
Unit tests for formatting code, fix %%.
2013-01-28 14:11:54 -08:00
Elliott Hughes
d383ac1570
am a0151cbf: Merge "Unit tests for formatting code, fix %%."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a0151cbfbaa37965dbcd188a55a78d3ad4802b9b':
Unit tests for formatting code, fix %%.
2013-01-28 14:10:08 -08:00
Elliott Hughes
a0151cbfba
Merge "Unit tests for formatting code, fix %%."
2013-01-28 22:04:45 +00:00
Elliott Hughes
41b3179c9e
Unit tests for formatting code, fix %%.
...
Also fix <signal.h> and <stdio.h> so they don't cause compiler warnings.
Change-Id: Ib1a746bf01de22d47dbd964de0e6af80a7c96303
2013-01-28 10:36:31 -08:00
Elliott Hughes
d265d36749
am f07db754: am 0a91b11d: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
More debug malloc fixes.
2013-01-25 18:09:45 -08:00
Elliott Hughes
f07db75443
am 0a91b11d: Merge "More debug malloc fixes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a91b11d286446fe7849a6f537b4a21a52f63399':
More debug malloc fixes.
2013-01-25 18:07:23 -08:00
Elliott Hughes
0a91b11d28
Merge "More debug malloc fixes."
2013-01-26 01:55:43 +00:00
Elliott Hughes
239e7a0756
More debug malloc fixes.
...
Include the leaky executable's name in the log output. Fix the "sh" test.
Use uintptr_t instead of intptr_t.
Also fix debug formatting of NULL with %s.
Bug: 7291287
Change-Id: I015bf341cd48d43a247173612e6ccb1bf1243d53
2013-01-25 17:13:45 -08:00
Elliott Hughes
88af723267
am 7ae99845: am 6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (1) and others
* commit '7ae998456c2564aff4ecbe6a6df214821f6e26cc':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:10:02 -08:00
Nick Kralevich
2ebcd19cbc
am 27818d2a: am b871e5d6: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (1) and others
* commit '27818d2a16e4972acba15368f55a59cc0ed990f0':
system_properties: do more checking of file
2013-01-25 14:10:01 -08:00
Elliott Hughes
7ae998456c
am 6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Gerrit Code Review (1) and Matthieu Castet (1)
* commit '6a94cb748bf63278c3271b0ab610061b0dc6f04a':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:08:26 -08:00
Nick Kralevich
27818d2a16
am b871e5d6: Merge "system_properties: do more checking of file"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b871e5d6b3b4a214c7f19bdfca7663f1fe49fda8':
system_properties: do more checking of file
2013-01-25 14:08:26 -08:00
Elliott Hughes
6a94cb748b
Merge "arm syscall : for eabi call_default don't use stack"
2013-01-25 21:57:58 +00:00
Nick Kralevich
b871e5d6b3
Merge "system_properties: do more checking of file"
2013-01-25 21:52:00 +00:00
Nick Kralevich
c16961b8c3
system_properties: do more checking of file
...
Check that the permissions on the properties file
are exactly as we expect them to be.
Make sure we close the fd if fstat fails.
Refactor the code slightly.
Change-Id: I5503fd58c3b8093ce7e6d05920748ed70eaf8e2c
2013-01-25 13:07:31 -08:00
Nick Kralevich
151e91e66c
am da2d2c61: am 82ef8296: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (1) and others
* commit 'da2d2c618c23f212f8dec0c0615bf75d7c18b88d':
prctl.h: include sys/cdefs.h
2013-01-24 16:11:56 -08:00
Nick Kralevich
da2d2c618c
am 82ef8296: Merge "prctl.h: include sys/cdefs.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '82ef8296dc5e25b9cc8e7231f9515f50185dac9d':
prctl.h: include sys/cdefs.h
2013-01-24 08:59:00 -08:00
Nick Kralevich
82ef8296dc
Merge "prctl.h: include sys/cdefs.h"
2013-01-24 16:44:59 +00:00
Nick Kralevich
8e70b0d5c3
prctl.h: include sys/cdefs.h
...
prctl.h uses __BEGIN_DECLS but fails to include sys/cdefs.h
(where it's defined). Code which includes prctl.h without
previously including sys/cdefs.h will fail to compile.
Fixed.
Change-Id: If4c9f3308f08b93596dcd00e351ae786807e9320
2013-01-23 16:49:47 -08:00
Nick Kralevich
b8726037ee
am e7d937b5: am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'e7d937b52f183ce84751701c369ffe6a4c81d033':
libc: use more secure system properties if available
2013-01-23 11:09:40 -08:00
Nick Kralevich
e7d937b52f
am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'b3351f12047747b603efb070069e7afdf3040335':
libc: use more secure system properties if available
2013-01-23 11:07:23 -08:00
Nick Kralevich
b3351f1204
Merge "libc: use more secure system properties if available"
2013-01-23 18:50:24 +00:00
Nick Kralevich
32417fb376
libc: use more secure system properties if available
...
Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.
Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable. Fall back to the environment variable
if the file doesn't exist.
Bug: 8045561
Change-Id: I54f3efa98cf7d63d88788da5ce0d19e34fd7851a
2013-01-23 09:28:35 -08:00
Elliott Hughes
c08ab018ad
am 40107623: am 778a68e1: Merge "Don\'t free anything when reporting leaks."
...
* commit '40107623b05fdc2b6c61d9c885483abd3add486a':
Don't free anything when reporting leaks.
2013-01-22 22:14:32 -08:00
Elliott Hughes
ce8732b188
am 552e02fa: am 5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '552e02fa9c99fd234c57d756358e3208d11a13ad':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:14:31 -08:00
Elliott Hughes
40107623b0
am 778a68e1: Merge "Don\'t free anything when reporting leaks."
...
* commit '778a68e1e57408be04806b5bfc3150aade44bcbf':
Don't free anything when reporting leaks.
2013-01-22 22:11:55 -08:00
Elliott Hughes
552e02fa9c
am 5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '5c8f75ef8bd89498de1d1108efa54869a2784738':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:11:54 -08:00
Elliott Hughes
778a68e1e5
Merge "Don't free anything when reporting leaks."
2013-01-23 06:06:21 +00:00
Elliott Hughes
5c8f75ef8b
Merge "Disable leak checking for mksh; it's way too leaky."
2013-01-23 06:05:19 +00:00
Elliott Hughes
848247a972
Don't free anything when reporting leaks.
...
We don't know that they're not going to be cleaned up by a
C++ global destructor that runs after us. This is the case with
bootanimation, for example.
Bug: 7291287
Change-Id: Iba402514d1735fdc2ae4bc95b65396d816be46c0
2013-01-22 18:36:28 -08:00
Elliott Hughes
84f8b5f401
Disable leak checking for mksh; it's way too leaky.
...
When each shell leaks ~240 allocations, you can't see the leaks from
the program you ran with "adb shell".
Bug: 7291287
Change-Id: Ib8780db72ba0114ebdb24768537da74bbb61f354
2013-01-22 18:35:14 -08:00
Elliott Hughes
a8e0f2b956
am b16ec162: am 28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'b16ec162881110a30f665ce7bd1432ccefba60b7':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:29:01 -08:00
Elliott Hughes
b16ec16288
am 28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit '28f82b260c9076aae437dafb57193a174aef1eb3':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:26:45 -08:00
Elliott Hughes
28f82b260c
Merge "Add const for first argument of sigismember for fit POSIX spec"
2013-01-23 01:11:28 +00:00
Elliott Hughes
5f79f75ba6
am 57edf36c: am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '57edf36c5f83fa7bcf9d8d028cde0acc7ddfadcc':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:33:24 -08:00
Elliott Hughes
57edf36c5f
am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:31:26 -08:00
Elliott Hughes
8d6302cdcf
Merge "Our strcoll(3) is no different from NetBSD's, so take exactly theirs."
2013-01-22 23:19:35 +00:00
Elliott Hughes
2b47307012
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
...
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
2013-01-22 15:10:19 -08:00
Elliott Hughes
ad551eaa04
am 5f7b6b83: am 547eba0a: Merge "Avoid overflow in memccpy."
...
* commit '5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
Avoid overflow in memccpy.
2013-01-22 15:08:58 -08:00
Elliott Hughes
5f7b6b8301
am 547eba0a: Merge "Avoid overflow in memccpy."
...
* commit '547eba0a63951d7db93c0542e1ecab891725b9a8':
Avoid overflow in memccpy.
2013-01-22 15:05:31 -08:00
Elliott Hughes
547eba0a63
Merge "Avoid overflow in memccpy."
2013-01-22 22:53:54 +00:00
Elliott Hughes
1029364ec5
am e8e1f34a: am 85597e2b: Merge "Clean up debuggerd-related logging."
...
* commit 'e8e1f34a33158290aa3bb9059e31ddc7a73ac1e6':
Clean up debuggerd-related logging.
2013-01-22 14:53:25 -08:00
Elliott Hughes
e8e1f34a33
am 85597e2b: Merge "Clean up debuggerd-related logging."
...
* commit '85597e2b59af91be0607ed073b6574b934ed369d':
Clean up debuggerd-related logging.
2013-01-22 14:49:11 -08:00
Elliott Hughes
c51cd764a2
Avoid overflow in memccpy.
...
Just take the upstream NetBSD code.
Bug: http://code.google.com/p/android/issues/detail?id=43078
Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
2013-01-22 14:41:23 -08:00
Elliott Hughes
85597e2b59
Merge "Clean up debuggerd-related logging."
2013-01-22 22:37:28 +00:00
Elliott Hughes
0dfb2ecaab
am 0609c0fe: am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:35:06 -08:00
Elliott Hughes
0609c0fe8d
am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '7af7895eeb810ff1a1ca8b60fcda13595d551114':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:32:02 -08:00
Elliott Hughes
7af7895eeb
Merge "Use the new non-allocating logging for dlmalloc failures."
2013-01-22 22:26:35 +00:00
Elliott Hughes
ce4cf90d79
Use the new non-allocating logging for dlmalloc failures.
...
Change-Id: I88afe0201ee5766a295fc5a9e710fba9d6e0d363
2013-01-22 14:24:52 -08:00
Elliott Hughes
6b8e321e61
Clean up debuggerd-related logging.
...
Bug: 7291287
Change-Id: Ia7aa386e8b75b8058d7d9e707e11b1da7dc62f00
2013-01-22 14:17:14 -08:00
Nick Kralevich
98ae1a85b0
am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
...
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00
Nick Kralevich
e652ed3051
am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0':
bionic_auxv.h: fix #define conflict
2013-01-22 13:38:53 -08:00
Nick Kralevich
244bee5bb6
Merge "bionic_auxv.h: fix #define conflict"
2013-01-22 21:30:27 +00:00
Nick Kralevich
abc21c8056
bionic_auxv.h: fix #define conflict
...
Both libc/include/sys/auxv.h and libc/private/bionic_auxv.h
use _SYS_AUXV_H_ to see if a header file has already been included.
This prevents both of these files from being included at the same
time.
Fix this name conflict.
Change-Id: Ifaec88aa9779d784b95f8e75145117acf3d5cfc5
2013-01-22 13:09:04 -08:00
Elliott Hughes
04afcd25a3
am 8ef83bc4: am 02f96b9d: Merge "Add missing extern "C"."
...
* commit '8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
Add missing extern "C".
2013-01-22 11:34:25 -08:00
Elliott Hughes
8ef83bc46e
am 02f96b9d: Merge "Add missing extern "C"."
...
* commit '02f96b9db0242711fe1dfe0713c0c4e698561da5':
Add missing extern "C".
2013-01-22 11:32:16 -08:00
Elliott Hughes
02f96b9db0
Merge "Add missing extern "C"."
2013-01-22 19:22:47 +00:00
Elliott Hughes
f90b95ea1a
Add missing extern "C".
...
Change-Id: Idbf24ce8482ff03f24caa89bafb08677b1c5cec3
2013-01-22 11:20:45 -08:00
Elliott Hughes
4cd5703b9e
am 75b64a1b: am ca483765: Merge "Fix the duplication in the debugging code."
...
* commit '75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
Fix the duplication in the debugging code.
2013-01-22 10:02:12 -08:00
Elliott Hughes
75b64a1b64
am ca483765: Merge "Fix the duplication in the debugging code."
...
* commit 'ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
Fix the duplication in the debugging code.
2013-01-22 09:59:44 -08:00
Elliott Hughes
ca483765bd
Merge "Fix the duplication in the debugging code."
2013-01-22 17:44:15 +00:00
Kito Cheng
f373b11f9f
Add const for first argument of sigismember for fit POSIX spec
...
Change-Id: Icbc67375282f2a22dce02e4bacab15ddae846057
2013-01-20 00:15:23 +08:00
Elliott Hughes
1e980b6bc8
Fix the duplication in the debugging code.
...
We had two copies of the backtrace code, and two copies of the
libcorkscrew /proc/pid/maps code. This patch gets us down to one.
We also had hacks so we could log in the malloc debugging code.
This patch pulls the non-allocating "printf" code out of the
dynamic linker so everyone can share.
This patch also makes the leak diagnostics easier to read, and
makes it possible to paste them directly into the 'stack' tool (by
using relative PCs).
This patch also fixes the stdio standard stream leak that was
causing a leak warning every time tf_daemon ran.
Bug: 7291287
Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
2013-01-18 22:20:06 -08:00
Nick Kralevich
9468ee53ac
am f246ae98: am 5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit 'f246ae984baa133b93af4e14f94ba35990b43dbb':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 13:11:13 -08:00
Nick Kralevich
f246ae984b
am 5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit '5496bbf6a3592fd99cee6b8c20c8624c2aeea0c1':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 13:10:04 -08:00
Nick Kralevich
5496bbf6a3
Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
2013-01-18 20:50:41 +00:00
Guang Zhu
4df577fef7
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
...
Temporarily revert the change since DNS resolution seems
broken right now in ping util.
Bug: 8029617
This reverts commit a0f64756a4
2013-01-18 11:28:47 -08:00
Nick Kralevich
8e833972c2
am 0a0c2321: am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
...
* commit '0a0c23216766adf76739dc38dcb45934105cd41c':
FORTIFY_SOURCE: optimize
2013-01-17 17:06:11 -08:00
Nick Kralevich
0a0c232167
am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
...
* commit '4bfaf1e5f62748b305406ff4ceebd5f4b750038c':
FORTIFY_SOURCE: optimize
2013-01-17 17:04:33 -08:00
Elliott Hughes
a4723742c1
am 261e9d08: am e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit '261e9d08dbf1cd7fea7e1799338238d11d18cb7c':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:51:09 -08:00
Nick Kralevich
4bfaf1e5f6
Merge "FORTIFY_SOURCE: optimize"
2013-01-18 00:49:36 +00:00
Elliott Hughes
261e9d08db
am e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit 'e4ca88d9fa8757e4fb4056fcafa5bc15b406a2fd':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:48:45 -08:00
Elliott Hughes
e4ca88d9fa
Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
2013-01-18 00:34:13 +00:00
Nick Kralevich
a44e9afdd1
FORTIFY_SOURCE: optimize
...
Don't do the fortify_source checks if we can determine, at
compile time, that the provided operation is safe.
This avoids silliness like calling fortify source on things like:
size_t len = strlen("asdf");
printf("%d\n", len);
and allows the compiler to optimize this code to:
printf("%d\n", 4);
Defer to gcc's builtin functions instead of pointing our code
to the libc implementation.
Change-Id: I5e1dcb61946461c4afaaaa983e39f07c7a0df0ae
2013-01-17 15:41:33 -08:00
Raghu Gandham
a864c2c234
Add functionlity to the scripts to replace tokens in kernel headers
...
based on architecture.
2013-01-17 14:39:09 -08:00
Nick Kralevich
36c4eb188c
am 3a72fe58: am f3fe1945: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit '3a72fe587f454a2eea79b5564e4ab1d3880b51c8':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 09:01:14 -08:00
Nick Kralevich
3a72fe587f
am f3fe1945: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit 'f3fe19459fd9263e8cc8a413a5313b1ec3cf3975':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 08:58:27 -08:00
Nick Kralevich
f3fe19459f
Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
2013-01-17 16:41:31 +00:00
Nick Kralevich
d89ce40d8e
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
...
The linker is essentially a shared library, and incorporates
it's own copy of libc. Even though it's unnecessary, currently
/system/bin/linker is exporting various libc symbols (only to
apps which explicitly dlopen /system/bin/linker)
Add --exclude-libs,ALL, which tells the static linker to mark
all of the imported libc symbols as hidden. This reduces the
size of /system/bin/linker from 92K to 67K with no obvious
loss in functionality.
$ adb shell ls -l /system/bin/linker
-rwxrwxrwx root root 92260 2013-01-16 16:52 linker
$ adb shell ls -l /system/bin/linker
-rwxrwxrwx root root 67660 2013-01-16 16:49 linker
Documentation on exclude-libs can be found at
http://sourceware.org/binutils/docs-2.21/ld/Options.html
Change-Id: I4508287770e4b7a845def2e6b4af969f9c866c6a
2013-01-16 16:43:58 -08:00
Nick Kralevich
91bc5865a3
am 8d01c055: am 1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '8d01c0557bb2b7ea30f4038b6c84b816800073a7':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:55:55 -08:00
Nick Kralevich
8d01c0557b
am 1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '1271cdc1c91c6ae688917bc8f4ae59d2a97b3e99':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:53:25 -08:00
Nick Kralevich
1271cdc1c9
Merge "Revert "stack protector: use AT_RANDOM""
2013-01-16 21:36:53 +00:00
Nick Kralevich
27ff1ae414
am de666485: am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit 'de666485b8123ac35be94109336f7c56a7e9e3c2':
stack protector: use AT_RANDOM
2013-01-16 13:31:24 -08:00
Nick Kralevich
079e435655
am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '30894bdfd6e4c74ab673d47391e62fb14fb51381':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 13:31:23 -08:00
Nick Kralevich
36bd371e26
Revert "stack protector: use AT_RANDOM"
...
The AT_RANDOM changes broke setuid / setgid executables
such as "ping". When the linker executes a setuid program,
it cleans the environment, removing any invalid environment
entries, and adding "NULL"s to the end of the environment
array for each removed variable. Later on, we try to determine
the location of the aux environment variable, and get tripped
up by these extra NULLs.
Reverting this patch will get setuid executables working again,
but getauxval() is still broken for setuid programs because of
this bug.
This reverts commit e3a49a8661
2013-01-16 13:16:42 -08:00
Nick Kralevich
de666485b8
am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit 'ba117e4172fe6f160bf5f4d58b37e12c08c34245':
stack protector: use AT_RANDOM
2013-01-16 11:31:00 -08:00
Nick Kralevich
ba117e4172
Merge "stack protector: use AT_RANDOM"
2013-01-16 11:23:26 -08:00
Nick Kralevich
30894bdfd6
am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '1b34228bb289723c4ba0534eae57d0d085a3d0fa':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 11:14:01 -08:00
Nick Kralevich
1b34228bb2
Merge "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-16 11:11:17 -08:00
Elliott Hughes
b989c9ceda
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c39
2013-01-16 10:34:33 -08:00
Nick Kralevich
e3a49a8661
stack protector: use AT_RANDOM
...
Populate the stack canaries from the kernel supplied
AT_RANDOM value, which doesn't involve any system calls.
This is slightly faster (6 fewer syscalls) and avoids
unnecessarily reading /dev/urandom, which depletes entropy.
Bug: 7959813
Change-Id: If2b43100a2a9929666df3de56b6139fed969e0f1
2013-01-16 10:09:52 -08:00
Elliott Hughes
e05709b1df
am e611fad0: am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit 'e611fad0d055f2d869981136e5e51b7a01d525fc':
Fix signalfd for MIPS.
2013-01-16 09:48:04 -08:00
Elliott Hughes
e611fad0d0
am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit '14e1975e13c197180ed0481f305f83a362b16a24':
Fix signalfd for MIPS.
2013-01-16 09:45:57 -08:00
Elliott Hughes
14e1975e13
Merge "Fix signalfd for MIPS."
2013-01-16 09:42:51 -08:00
Elliott Hughes
f193b9fc21
Fix signalfd for MIPS.
...
Also mark signalfd's sigset_t* argument as non-nullable.
Change-Id: I466e09cdf3fb92480744c496da92274a97f99dd1
2013-01-16 09:40:25 -08:00
Matthieu Castet
faa0fdb119
arm syscall : for eabi call_default don't use stack
...
In the default case, we don't need to use the stack, we can save r7 with
ip register (that what does eglibc).
This allow to fix vfork data corruption
(see 3884bfe966
2013-01-16 14:53:37 +01:00
Nick Kralevich
a0f64756a4
Filter ANDROID_PROPERTY_WORKSPACE
...
When executing a setuid executable, filter out ANDROID_PROPERTY_WORKSPACE
from the environment. Some applications implicitly trust the property
space and don't realize that it's passed by an environment variable
which can be modified by the caller.
Change-Id: I3e3a98941f0a1f249a2ff983ecbcfe1278aa9159
2013-01-15 16:02:03 -08:00
Elliott Hughes
04aa0fdda6
am 42c5847d: (-s ours) am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
...
* commit '42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-15 13:37:56 -08:00
Elliott Hughes
42c5847d65
am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
...
* commit '791e26d9598a72376b8a16a5ccfb5d1ae0010965':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-15 13:35:58 -08:00
Elliott Hughes
791e26d959
Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
2013-01-15 13:21:52 -08:00
Nick Kralevich
d29c9fc188
am b59e358b: Merge "fix strerror_r test"
...
* commit 'b59e358bb902124cc7d648266a97f96beefc8142':
fix strerror_r test
2013-01-15 11:15:21 -08:00
Elliott Hughes
acb907fb0d
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c39
2013-01-15 11:12:18 -08:00
Nick Kralevich
b59e358bb9
Merge "fix strerror_r test"
2013-01-15 10:56:07 -08:00
Nick Kralevich
606058933c
fix strerror_r test
...
e6e60065ff
2013-01-15 10:35:09 -08:00
Ben Cheng
4130af46bf
am b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
...
* commit 'b09d7d86004ab75b774358454d8ee261987af96b':
Add __aeabi_idiv to the dummy reference list.
2013-01-14 15:44:01 -08:00
Ben Cheng
b09d7d8600
Merge "Add __aeabi_idiv to the dummy reference list."
2013-01-14 15:35:04 -08:00
Ben Cheng
35f5385aa5
Add __aeabi_idiv to the dummy reference list.
...
If the platform code is compiled with -mcpu=cortex-a15, then without this
change prebuilt libraries built against -march=armv7 cannot resolve the
dependency on __aeabi_idiv (provided by libgcc.a).
Bug: 7961327
cherry-picked from internal master.
Change-Id: I8fe59a98eb53d641518b882523c1d6a724fb7e55
2013-01-14 15:33:40 -08:00
Nick Kralevich
1519690cfb
am 29fe857e: Merge "headers: update auxvec.h from Linux kernel"
...
* commit '29fe857ec80e59347e28458a5396eb68d1cba0e4':
headers: update auxvec.h from Linux kernel
2013-01-14 14:31:28 -08:00
Nick Kralevich
29fe857ec8
Merge "headers: update auxvec.h from Linux kernel"
2013-01-14 14:14:49 -08:00
Nick Kralevich
a67e4de662
headers: update auxvec.h from Linux kernel
...
Pull a new version of auxvec.h from the upstream Linux
kernel at commit b719f43059903820c31edb30f4663a2818836e7f
These files were generated using the following commands:
cd bionic/libc/kernel
./tools/clean_header.py -u ../../../external/kernel-headers/original/uapi/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/asm-x86/auxvec.h
This change is needed to get AT_RANDOM defined.
Change-Id: Ib064649684b17af6ff4b1a31d501a05f78bb81d0
2013-01-14 11:49:59 -08:00
Ian Rogers
763d4bb345
am 68fa57f0: Merge "Name anonymous mmap mallocs."
...
* commit '68fa57f000285af20100c00db3d2bc143ad32294':
Name anonymous mmap mallocs.
2013-01-14 11:19:00 -08:00
Ian Rogers
68fa57f000
Merge "Name anonymous mmap mallocs."
2013-01-14 10:54:44 -08:00
Nick Kralevich
13bd37160e
am bb897fa9: Merge "libc_init_static: apply relro earlier."
...
* commit 'bb897fa9f79d25e4445fe3ab46b86657d6660c10':
libc_init_static: apply relro earlier.
2013-01-14 10:25:16 -08:00
Nick Kralevich
bb897fa9f7
Merge "libc_init_static: apply relro earlier."
2013-01-14 10:21:23 -08:00
Elliott Hughes
375db86aea
am 09d13c39: Merge "Fix my git mistake."
...
* commit '09d13c393e7b6a77cc33e5ef87e5c92ccd13fe63':
Fix my git mistake.
2013-01-14 10:08:56 -08:00
Elliott Hughes
09d13c393e
Merge "Fix my git mistake."
2013-01-14 09:57:45 -08:00
Elliott Hughes
99c32055cb
Fix my git mistake.
...
This was the formatting change that was supposed to be in
cf23905a4b
2013-01-14 09:56:21 -08:00
Elliott Hughes
bc3c718346
am 48c632a3: Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
...
* commit '48c632a381b10996ec72a53cc95b009b06785d09':
[MIPS] Set DT_DEBUG dyntab entry if it is writable
2013-01-14 09:46:19 -08:00
Elliott Hughes
48c632a381
Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
2013-01-14 09:31:04 -08:00
Chris Dearman
cf23905a4b
[MIPS] Set DT_DEBUG dyntab entry if it is writable
...
This is primarily for MIPS exutables that do not have a
DT_MIPS_RLD_MAP entry.
Change-Id: I4c221d92debcfed961eeee2515123f3fb21ec8e6
Signed-off-by: Chris Dearman <chris@mips.com >
2013-01-14 09:30:25 -08:00
Nick Kralevich
9fb48ac257
libc_init_static: apply relro earlier.
...
The dynamic linker applies relro before the preinit and init
arrays are executed, so we should be consistent for statically
linked executables.
Change-Id: Ia0a49d0e981a6e8791f74eed00280edf576ba139
2013-01-11 18:38:26 -08:00
Ian Rogers
8921060253
Name anonymous mmap mallocs.
...
Change-Id: Icc53ba1eecb8445210623826d8e99a611d686f7f
2013-01-11 17:42:17 -08:00
Nick Kralevich
fdd6dfa863
am 2c5153b0: libc: add getauxval()
...
* commit '2c5153b043b44e9935a334ae9b2d5a4bc5258b40':
libc: add getauxval()
2013-01-11 16:59:57 -08:00
Nick Kralevich
2c5153b043
libc: add getauxval()
...
Add support for getauxval(). This method allows a program an easy way
to retrieve information from the kernel auxiliary vector, and will
hopefully replace other clumsy ways of accessing this same information.
This particular function was also added to glibc in glibc 2.16.
See the following URLs for more details.
* http://lwn.net/Articles/519085/
* http://www.gnu.org/software/libc/manual/html_node/Auxiliary-Vector.html
This change is a prerequisite for bug 7959813.
Bug: http://code.google.com/p/android/issues/detail?id=38441
Change-Id: Iba19d899df334bddc6f4899077ece2fc87564ea8
2013-01-11 16:44:15 -08:00
Andrew Boie
07564f2d3a
add factory property file definition
...
This property file is used for properties which are set at device
provisioning time or in the factory. They are never touched by
a software update or factory data reset and typically contain
data specific to the particular unit.
Change-Id: I2e7c2fe62cb684cb2449eea917c42b19462e89a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com >
2013-01-11 13:02:27 -08:00
Nick Kralevich
d0f81466e4
am 69c89942: Merge "Add stack canaries / strcpy tests."
...
* commit '69c89942db2ed472c71aa84903d0259cc84aa074':
Add stack canaries / strcpy tests.
2013-01-11 11:26:54 -08:00
Nick Kralevich
69c89942db
Merge "Add stack canaries / strcpy tests."
2013-01-11 11:03:40 -08:00
Nick Kralevich
dcab1b2c76
Add stack canaries / strcpy tests.
...
Add a test to ensure that stack canaries are working
correctly. Since stack canaries aren't normally generated
on non-string functions, we have to enable stack-protector-all.
Add a test to ensure that an out of bounds strcpy generates
a runtime failure.
Change-Id: Id0d3e59fc4b9602da019e4d35c5c653e1a57fae4
2013-01-11 10:52:36 -08:00
Wink Saville
801aeefe2d
am a12c5445: Fix unused warnings in pthread.c
...
* commit 'a12c54454f3a6132988b68873903f6e9eed7f384':
Fix unused warnings in pthread.c
2013-01-11 10:12:12 -08:00
Wink Saville
a12c54454f
Fix unused warnings in pthread.c
...
Change-Id: I0287aadb825fd8cda29dc976bce55d75a1279fc5
2013-01-10 16:30:22 -08:00
Elliott Hughes
0f9be1eaee
am bfde0b6f: Merge "glibc 2.15 treats errno as signed in strerror(3)."
...
* commit 'bfde0b6fd9e5de545746ab963d3a05ed2a8014f6':
glibc 2.15 treats errno as signed in strerror(3).
2013-01-10 16:27:26 -08:00
Elliott Hughes
bfde0b6fd9
Merge "glibc 2.15 treats errno as signed in strerror(3)."
2013-01-10 16:24:36 -08:00
Elliott Hughes
e6e60065ff
glibc 2.15 treats errno as signed in strerror(3).
...
And the only reason I hadn't done that in bionic is because I wanted to behave
the same as glibc.
Change-Id: I2cf1bf0aac82a748cd6305a2cabbac0790058570
2013-01-10 16:01:59 -08:00
Elliott Hughes
34c7a3c2b0
am 0d3700d9: Merge "Only have one copy of the kernel_sigset_t hack, and add more tests."
...
* commit '0d3700d957debe841c385f66a8026ca8b3755815':
Only have one copy of the kernel_sigset_t hack, and add more tests.
2013-01-10 15:28:46 -08:00
Elliott Hughes
0d3700d957
Merge "Only have one copy of the kernel_sigset_t hack, and add more tests."
2013-01-10 15:12:46 -08:00
Elliott Hughes
c5d028fc91
Only have one copy of the kernel_sigset_t hack, and add more tests.
...
Change-Id: I377522fcba6fb4b5fd2754ab15b091014bd7c16f
2013-01-10 14:42:14 -08:00
Elliott Hughes
4ff6fa97e7
am 2bbb8fac: Merge "Add signalfd call to bionic"
...
* commit '2bbb8fac61e482dd96386620cc6f7f193e9c6840':
Add signalfd call to bionic
2013-01-10 13:30:16 -08:00
Elliott Hughes
2bbb8fac61
Merge "Add signalfd call to bionic"
2013-01-10 13:17:27 -08:00
Rom Lemarchand
a4b2dc016f
Add signalfd call to bionic
...
Add signalfd() call to bionic.
Adding the signalfd call was done in 3 steps:
- add signalfd4 system call (function name and syscall
number) to libc/SYSCALLS.TXT
- generate all necessary headers by calling
libc/tools/gensyscalls.py. This patch is adding
the generated files since the build system
does not call gensyscalls.py.
- create the signalfd wrapper in signalfd.cpp and add
the function prototype to sys/signalfd.h
(cherry-pick of 0c11611c11
2013-01-10 13:14:46 -08:00
Elliott Hughes
5c5fe07e43
am 364d9ee6: Merge "Don\'t test GNU-style ELF hashes on MIPS."
...
* commit '364d9ee62f583bca795a2b40f71a04e272c80389':
Don't test GNU-style ELF hashes on MIPS.
2013-01-07 15:00:28 -08:00
Elliott Hughes
364d9ee62f
Merge "Don't test GNU-style ELF hashes on MIPS."
2013-01-07 14:46:13 -08:00
Elliott Hughes
a43e906221
Don't test GNU-style ELF hashes on MIPS.
...
The MIPS toolchain can't generate them because they're incompatible
with the MIPS ABI (which requires .dynsym match the GOT, while GNU-style
requires .dynsym to be sorted by hash code), so there's nothing to test.
Change-Id: I2220f452fe6fe595ec1312544cc741dd390a36a5
2013-01-07 14:44:36 -08:00
Elliott Hughes
79cecbd421
am 7e22db03: Merge "Fix an off-by-one error in the sigset_t function error handling."
...
* commit '7e22db037e6d9ab117bf5d50c7aca85fe74941a0':
Fix an off-by-one error in the sigset_t function error handling.
2013-01-07 14:21:26 -08:00
Elliott Hughes
7e22db037e
Merge "Fix an off-by-one error in the sigset_t function error handling."
2013-01-07 14:11:43 -08:00
Elliott Hughes
fb5e5cbdd4
Fix an off-by-one error in the sigset_t function error handling.
...
Spotted while running the tests on MIPS, where sigset_t is
actually large enough. The bits in sigset_t are used such that
signal 1 is represented by bit 0, so the range of signals is
actually [1, 8*sizeof(sigset_t)]; it seems clearer to reword
the code in terms of valid bit offsets [0, 8*sizeof(sigset_t)),
which leads to the usual bounds checking idiom.
Change-Id: Id899c288e15ff71c85dd2fd33c47f8e97aa1956f
2013-01-07 13:58:49 -08:00
Elliott Hughes
2458d06fc1
am 26c5b2d4: Merge "[MIPS] Rewrite fenv.h for Android"
...
* commit '26c5b2d460e3b2595eb7f0605edcd02753a13594':
[MIPS] Rewrite fenv.h for Android
2013-01-07 13:48:55 -08:00
Elliott Hughes
26c5b2d460
Merge "[MIPS] Rewrite fenv.h for Android"
2013-01-07 13:30:58 -08:00
Raghu Gandham
d199017101
[MIPS] Rewrite fenv.h for Android
...
Change-Id: I4d1e2f0b37b587426ccc9f26c525ec0d36637c7d
2013-01-04 16:32:54 -08:00
Elliott Hughes
ec1370191e
am 63dc5927: Merge "Add AF_CAN and PF_CAN (and other missing families)."
...
* commit '63dc592789e386ba2cd4e748090ba71d449a1e7c':
Add AF_CAN and PF_CAN (and other missing families).
2013-01-03 16:59:39 -08:00
Elliott Hughes
63dc592789
Merge "Add AF_CAN and PF_CAN (and other missing families)."
2013-01-03 16:55:30 -08:00
Elliott Hughes
81508de3d2
am f0036944: Merge "Fix debug malloc."
...
* commit 'f0036944a13a76dddda70347032128d4a27081d6':
Fix debug malloc.
2013-01-03 16:42:42 -08:00
Elliott Hughes
d73c0b300e
Add AF_CAN and PF_CAN (and other missing families).
...
Change-Id: I2c183a6f5f7a7e81e87dad85d8c9aff9c43ed33a
2013-01-03 16:25:47 -08:00
Elliott Hughes
f0036944a1
Merge "Fix debug malloc."
2013-01-03 16:20:01 -08:00
Elliott Hughes
db492b3ca7
Fix debug malloc.
...
...which has been broken since the linker data structures went read-only.
Bug: 7941716
Change-Id: If28f6bac0fcb13e371e4d85b064544f561c8d692
2013-01-03 15:44:03 -08:00
Elliott Hughes
c654f4fda8
am b1b53177: Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."
...
* commit 'b1b5317799a34ac9e93f568af82952e52a9e9a13':
sysconf.c was renamed to sysconf.cpp (and modified)...
2013-01-03 12:04:48 -08:00
Elliott Hughes
b1b5317799
Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."
2013-01-03 11:54:57 -08:00
Elliott Hughes
7cbff41ba3
sysconf.c was renamed to sysconf.cpp (and modified)...
...
...but sysconf.c still lingers on due to some git/repo accident. Kill it.
Change-Id: Iae354ecb21abf03a3f718cc45cfdddb7a9347778
2013-01-03 11:53:35 -08:00
Elliott Hughes
1287d106ed
am fb62558b: Merge "Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK)."
...
* commit 'fb62558bb4c25c8f71e0b949ba8552c674578674':
Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK).
2013-01-02 15:55:42 -08:00
Elliott Hughes
fb62558bb4
Merge "Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK)."
2013-01-02 15:51:15 -08:00
Elliott Hughes
a55f63083f
Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK).
...
Bug: http://code.google.com/p/android/issues/detail?id=39680
Change-Id: I11cf10a66f9d305868a725f04f581099fb88bbfc
2013-01-02 14:23:43 -08:00
Elliott Hughes
c0c05ff8ec
am 918d776f: Merge "Support System.loadLibrary for libraries with transitive dependencies."
...
* commit '918d776f7edf1a9c4209ada4c2401ef0ea0bf660':
Support System.loadLibrary for libraries with transitive dependencies.
2012-12-21 17:54:07 -08:00
Elliott Hughes
918d776f7e
Merge "Support System.loadLibrary for libraries with transitive dependencies."
2012-12-21 17:46:22 -08:00
Elliott Hughes
df5c77c91a
am f6524f8b: Merge "Fix format_number."
...
* commit 'f6524f8bda87f7d25dad7bed7091a93f3de58728':
Fix format_number.
2012-12-21 10:04:27 -08:00
Elliott Hughes
f6524f8bda
Merge "Fix format_number."
2012-12-20 19:08:17 -08:00
Elliott Hughes
eababde214
Fix format_number.
...
I broke this the other day when silencing x86 gcc warnings.
Bug: 7904160
Change-Id: I8e60cc1f8cbaff95248c8738d84e515413d839e4
2012-12-20 19:00:48 -08:00
Elliott Hughes
cade4c36e7
Support System.loadLibrary for libraries with transitive dependencies.
...
Also fix the FLAG_ERROR annoyance --- it's not helpful to cache failures.
Bug: 7896159
Bug: http://code.google.com/p/android/issues/detail?id=34416
Bug: http://code.google.com/p/android/issues/detail?id=22143
Change-Id: I60f235edb4ea4756e1f7ce56f7739f18e8a50789
2012-12-20 14:42:14 -08:00
Elliott Hughes
5fd31f6891
am 4b582142: Merge "Fix x86 dynamic linker build."
...
* commit '4b58214205d3d29dbdfed49964010235ef3f0403':
Fix x86 dynamic linker build.
2012-12-19 09:46:32 -08:00
Elliott Hughes
a0edecf343
am a4ebdcf5: Merge "Check for unknown flags passed to dlopen(3)."
...
* commit 'a4ebdcf5bd20072f9a0e48c22fff401acda43e1e':
Check for unknown flags passed to dlopen(3).
2012-12-18 19:41:24 -08:00
Elliott Hughes
4b58214205
Merge "Fix x86 dynamic linker build."
2012-12-18 18:16:09 -08:00
Elliott Hughes
45288c5ce3
Fix x86 dynamic linker build.
...
Change-Id: Ia9fc6342e3d409de86dcd187c7402e8ac2ae96c8
2012-12-18 18:13:19 -08:00
Elliott Hughes
a4ebdcf5bd
Merge "Check for unknown flags passed to dlopen(3)."
2012-12-18 16:38:37 -08:00
Elliott Hughes
e66190d2a9
Check for unknown flags passed to dlopen(3).
...
Change-Id: I56f4aab0e5a1487bc32d2c4d231e8bd15c4ac8da
2012-12-18 15:57:55 -08:00
Elliott Hughes
607bd47707
am 4c4b08a3: Merge "Fix <endian.h> and <sys/endian.h>."
...
* commit '4c4b08a32eace878e4780ee340a57c43be950159':
Fix <endian.h> and <sys/endian.h>.
2012-12-11 17:27:41 -08:00
Elliott Hughes
4c4b08a32e
Merge "Fix <endian.h> and <sys/endian.h>."
2012-12-11 17:18:58 -08:00
Elliott Hughes
4fa35d8ae8
Fix <endian.h> and <sys/endian.h>.
...
Previously we'd been relying on getting the machine-specific <endian.h>
instead of the top-level <endian.h>, and <sys/endian.h> was basically broken.
Now, with this patch and the previous patch we should have <endian.h>
and <sys/endian.h> behaving the same. This is basically how NetBSD's endian.h
works, and was probably how ours was originally intended to work.
Bug: http://code.google.com/p/android/issues/detail?id=39824
Change-Id: I71de5a507e633de166013a658b5764df9e1aa09c
2012-12-11 16:17:33 -08:00
Elliott Hughes
f822e7f68e
am 0521ff82: Merge "Use pthread_kill() in raise()"
...
* commit '0521ff8234cafcc61060961b2f856fcf4dae1e7d':
Use pthread_kill() in raise()
2012-12-10 11:40:04 -08:00
Elliott Hughes
0521ff8234
Merge "Use pthread_kill() in raise()"
2012-12-10 11:21:42 -08:00
Chris Dearman
d8a5a6f513
Use pthread_kill() in raise()
...
raise() should use pthread_kill() in a pthreads environment.
For bionic this means it should always be used.
Change-Id: Ic679272b664d2b8a7068b628fb83a9f7395c441f
2012-12-10 11:20:57 -08:00
Geremy Condra
28996f8006
am 6fcf1770: Merge "Added audit.h from the kernel."
...
* commit '6fcf1770e5829b8439b7e7ed7efb39ee5d425e23':
Added audit.h from the kernel.
2012-12-07 14:32:21 -08:00
Geremy Condra
6fcf1770e5
Merge "Added audit.h from the kernel."
2012-12-07 14:21:16 -08:00
Geremy Condra
03e1ebbdd6
Added audit.h from the kernel.
...
Just followed the recipe in I1ca996541d05b0d5927ab828a6ce49c09877ea01
Change-Id: I5713d9ce5ff62e310a694ecfbe21cad6577bcb4d
2012-12-07 14:13:23 -08:00
Nick Kralevich
080210c16a
am c8354f50: Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
...
* commit 'c8354f501ef9a6d3430de27386bf0b42c30981d9':
FORTIFY_SOURCE: remove memcpy overlap checks
2012-12-07 12:19:08 -08:00
Nick Kralevich
79e1a01e9e
am 5dfdb701: Merge "FORTIFY_SOURCE: fix up previous commit"
...
* commit '5dfdb701292c53e74e319f277d808e598389c8e7':
FORTIFY_SOURCE: fix up previous commit
2012-12-07 12:18:58 -08:00
Nick Kralevich
c8354f501e
Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
2012-12-07 10:10:49 -08:00
Nick Kralevich
5787475390
FORTIFY_SOURCE: remove memcpy overlap checks
...
These checks haven't been as useful as I hoped, and it's
causing a false positive finding. Remove the overlap
compile time checks.
Change-Id: I5d45dde10ae4663d728230d41fa904adf20acaea
2012-12-07 09:57:01 -08:00
Nick Kralevich
5dfdb70129
Merge "FORTIFY_SOURCE: fix up previous commit"
2012-12-06 14:48:24 -08:00
Nick Kralevich
8b6fea59ac
FORTIFY_SOURCE: fix up previous commit
...
I forgot two files in 326ea5413d
2012-12-05 15:26:54 -08:00
Nick Kralevich
8717c3db2f
am 7a34ed2b: Merge "clean up FORTIFY_SOURCE handling."
...
* commit '7a34ed2bb36fcbe6967d8b670f4d70ada1dcef49':
clean up FORTIFY_SOURCE handling.
2012-12-04 15:52:53 -08:00
Nick Kralevich
7a34ed2bb3
Merge "clean up FORTIFY_SOURCE handling."
2012-12-04 15:44:22 -08:00
Nick Kralevich
326ea5413d
clean up FORTIFY_SOURCE handling.
...
Avoid duplicating huge chunks of code.
Change-Id: Id6145cdfce781c5ffba2abaaa79681d25a7ab28f
2012-12-04 15:27:30 -08:00
Nick Kralevich
ded6e3bfca
am db79e827: Merge "FORTIFY_SOURCE: fortify strrchr"
...
* commit 'db79e827ebcb077ebaa6d6c96915c5bffba9a0ca':
FORTIFY_SOURCE: fortify strrchr
2012-12-04 11:43:30 -08:00
Nick Kralevich
db79e827eb
Merge "FORTIFY_SOURCE: fortify strrchr"
2012-12-04 11:30:18 -08:00
Nick Kralevich
9a4d305340
FORTIFY_SOURCE: fortify strrchr
...
This change compliments 049e58369c
2012-12-03 10:39:16 -08:00
Elliott Hughes
3960fb602c
am 60fb6833: Merge "mmap: Remove madvise() workaround"
...
* commit '60fb68338b7541b6022fc343857b90c088c399cd':
mmap: Remove madvise() workaround
2012-12-03 09:36:47 -08:00
Elliott Hughes
60fb68338b
Merge "mmap: Remove madvise() workaround"
2012-12-03 09:13:20 -08:00
Elliott Hughes
43701d68a9
am 46d64ed2: Merge "Add argument checking to sigemptyset(3) and friends."
...
* commit '46d64ed2e5cf8e37d53b116f2281b4a39cc4f288':
Add argument checking to sigemptyset(3) and friends.
2012-12-03 07:53:28 -08:00
Elliott Hughes
46d64ed2e5
Merge "Add argument checking to sigemptyset(3) and friends."
2012-12-03 07:45:46 -08:00
Nick Kralevich
4140d90c60
am 3acc908c: Merge "FORTIFY_SOURCE: fortify strchr"
...
* commit '3acc908c79aa9cba975861fa23fa2672733b5d5d':
FORTIFY_SOURCE: fortify strchr
2012-11-30 17:13:20 -08:00
Nick Kralevich
3acc908c79
Merge "FORTIFY_SOURCE: fortify strchr"
2012-11-30 16:50:59 -08:00
Elliott Hughes
da73f655fc
Add argument checking to sigemptyset(3) and friends.
...
You could argue that this is hurting people smart enough to have manually
allocated a large-enough sigset_t, but those people are smart enough to
implement their own sigset functions too.
I wonder whether our least unpleasant way out of our self-inflicted 32-bit
cesspool is to have equivalents of _FILE_OFFSET_BITS such as _SIGSET_T_BITS,
so calling code could opt in? You'd have to be careful passing sigset_t
arguments between code compiled with different options.
Bug: 5828899
Change-Id: I0ae60ee8544835b069a2b20568f38ec142e0737b
2012-11-30 16:40:55 -08:00
Nick Kralevich
049e58369c
FORTIFY_SOURCE: fortify strchr
...
Detect when strchr reads off the end of a buffer.
Change-Id: I0e952eedcff5c36d646a9c3bc4e1337b959224f2
2012-11-30 15:19:15 -08:00
Elliott Hughes
7beaa5024f
am 16c61f08: Merge "Reduce the exposure of the __set_errno implementation detail."
...
* commit '16c61f088524756ef0fa1b030719f6745eaef2db':
Reduce the exposure of the __set_errno implementation detail.
2012-11-30 14:45:23 -08:00
Elliott Hughes
16c61f0885
Merge "Reduce the exposure of the __set_errno implementation detail."
2012-11-30 14:41:07 -08:00
Elliott Hughes
4a9e837840
Reduce the exposure of the __set_errno implementation detail.
...
Change-Id: I395e1b46a9491e34fc53e71853e932ea90b3d1cc
2012-11-30 12:05:18 -08:00
Elliott Hughes
4835e6ef51
am 97b70b2b: Merge "Replace .S version of x86 crtfiles with .c version"
...
* commit '97b70b2bda47af46adf58dfde61050357114aa1f':
Replace .S version of x86 crtfiles with .c version
2012-11-30 10:13:57 -08:00
Elliott Hughes
97b70b2bda
Merge "Replace .S version of x86 crtfiles with .c version"
2012-11-30 10:07:19 -08:00
Pavel Chupin
20c4a3a8ee
Replace .S version of x86 crtfiles with .c version
...
This patch replaces .S versions of x86 crtfiles with .c which are much
easier to support. Some of the files are matching .c version of Arm
crtfiles. x86 files required some cleanup anyway and this cleanup actually
led to matching Arm files.
I didn't change anything to share the same crt*.c between x86 and Arm. I
prefer to keep them separate for a while in case any change is required
for one of the arch, but it's good thing to do in the following patches.
Change-Id: Ibcf033f8d15aa5b10c05c879fd4b79a64dfc70f3
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2012-11-30 17:41:25 +04:00
Elliott Hughes
55210f74c7
am 07c0b73a: Merge "Remove (near-)duplicate definitions of size_t and ssize_t."
...
* commit '07c0b73a7fc9214e50fc6b9a15a06aeef0506e0f':
Remove (near-)duplicate definitions of size_t and ssize_t.
2012-11-29 19:43:50 -08:00
Elliott Hughes
07c0b73a7f
Merge "Remove (near-)duplicate definitions of size_t and ssize_t."
2012-11-29 19:33:01 -08:00
Elliott Hughes
3975cec694
Remove (near-)duplicate definitions of size_t and ssize_t.
...
The near duplicates upset fussier compilers that insist that
typedefs be exactly the same, but the fix isn't to make all
copies identical...
Change-Id: Icfdace41726f36ec33c9ae919dbb5a54d3529cc9
2012-11-29 17:25:23 -08:00
Elliott Hughes
c5861c09d5
am 50e62e40: Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"
...
* commit '50e62e4051c14d7d2a5e07ebe66afd2a81693a26':
Bug: __WINT_TYPE__ and wint_t reference to different types
2012-11-29 15:58:13 -08:00
Elliott Hughes
50e62e4051
Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"
2012-11-29 15:51:57 -08:00
The Android Open Source Project
d6d5cbb02a
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ib3c4bb83421360add15219251a389d25f1211497
2012-11-29 15:40:29 -08:00
Elliott Hughes
9ea86011a2
am 99ea84b1: Merge "[MIPS] Fix the MIPS getsid system call"
...
* commit '99ea84b12dd3ebebbbd527b8748f0d74bb1dfc0d':
[MIPS] Fix the MIPS getsid system call
2012-11-29 14:51:57 -08:00
Elliott Hughes
852935b68f
am 5d4b8421: Merge "Verify architecture neutral syscall numbers"
...
* commit '5d4b8421b3d040e8c2bdb83c8adb2752eab7b4b6':
Verify architecture neutral syscall numbers
2012-11-29 14:51:56 -08:00
Elliott Hughes
99ea84b12d
Merge "[MIPS] Fix the MIPS getsid system call"
2012-11-29 14:37:14 -08:00
Elliott Hughes
56eb0bfedb
am 78114220: Merge "Define DEFFILEMODE and friends"
...
* commit '781142208033e72b3773bcfab83cddf5ca34c9b2':
Define DEFFILEMODE and friends
2012-11-29 14:37:06 -08:00
Elliott Hughes
5d4b8421b3
Merge "Verify architecture neutral syscall numbers"
2012-11-29 14:34:19 -08:00
Elliott Hughes
7811422080
Merge "Define DEFFILEMODE and friends"
2012-11-29 14:31:19 -08:00
Naseer Ahmed
ef7eea5538
am 940e4c9d: am f61e5020: msm_mdp: Update header for 4 layer support
...
* commit '940e4c9d9218ee183c8eb522beb9838c0482084b':
msm_mdp: Update header for 4 layer support
2012-11-29 14:28:29 -08:00
Naseer Ahmed
5115d4348e
msm_mdp: Update header for 4 layer support
...
Bug: 7626586
Change-Id: I37730470dc09b7a9d6336b1603f87efd98f45e97
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-11-29 14:00:46 -08:00
Naseer Ahmed
940e4c9d92
am f61e5020: msm_mdp: Update header for 4 layer support
...
* commit 'f61e50201b7d5e793a479979c304d3388ca1405f':
msm_mdp: Update header for 4 layer support
2012-11-29 12:40:57 -08:00
Chris Dearman
58aaaa730b
[MIPS] Fix the MIPS getsid system call
...
Change-Id: I30a27941125bccb35d73a572a729ecf7dd555389
Signed-off-by: Chris Dearman <chris@mips.com >
2012-11-29 12:05:25 -08:00
Chris Dearman
285b02582b
Verify architecture neutral syscall numbers
...
Also removed some dead code and fixed comment
Change-Id: I5d6a04b4af3d95e34368136cf2eeb3c9b6f99769
Signed-off-by: Chris Dearman <chris@mips.com >
2012-11-29 12:04:23 -08:00
Hakan Kvist
f27b7fb056
Define DEFFILEMODE and friends
...
Define the macros ACCESSPERMS, ALLPERMS and DEFFILEMODE.
These macros originates from BSD but has been available in glibc
for quite some time.
Change-Id: I429cd30aa4e73f53b153ee7740070cebba166c57
2012-11-29 11:53:33 -08:00
Naseer Ahmed
f61e50201b
msm_mdp: Update header for 4 layer support
...
Bug: 7626586
Change-Id: I37730470dc09b7a9d6336b1603f87efd98f45e97
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-11-29 10:47:35 -08:00
Elliott Hughes
dea13da340
Merge "Clean up _BYTE_ORDER definitions for better x86 portability."
2012-11-27 17:34:52 -08:00
Elliott Hughes
b15c58bb0f
Clean up _BYTE_ORDER definitions for better x86 portability.
...
We'd manually hacked _BYTE_ORDER into the arm and mips "_types.h" headers,
but not into the x86 one. Judging by upstream, _BYTE_ORDER should be in
the "endian.h" headers instead, so let's uniformly do that.
I've also ironed out some of the other differences between the different
architectures' header files too.
Bug: http://code.google.com/p/android/issues/detail?id=39824
Change-Id: I19d3af7ffd74e1c02b1b6886aec0f0d11f44ab8d
2012-11-27 14:18:04 -08:00
Elliott Hughes
f2de6b0f6e
Merge "Do not include '\0' when writing error messages to stderr"
2012-11-26 15:44:58 -08:00
Chris Dearman
20a24403bc
Do not include '\0' when writing error messages to stderr
...
Change-Id: I6adc806c3920e5a4ae61ca55c40613fcf338b18c
Signed-off-by: Chris Dearman <chris@mips.com >
2012-11-26 15:43:17 -08:00
Elliott Hughes
429b05a1df
Merge "Upgrade to tzdata2012j."
2012-11-26 14:52:07 -08:00
Elliott Hughes
5d2ef8724d
Upgrade to tzdata2012j.
...
This reflects the following changes recently circulated on the tz mailing list:
Libya moved to CET [2012-11-11], but with DST planned [2013].
(Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.)
I also had to change the script to cope with:
Signatures now have the extension .asc, not .sign, as that's more
standard. (Thanks to Phil Pennock.)
Change-Id: Ie9711c5c796b3c122daea9690929edcc3ddd32da
2012-11-26 14:51:39 -08:00
Sergey Melnikov
a437bff914
Bug: __WINT_TYPE__ and wint_t reference to different types
...
__WINT_TYPE__ type provided by gcc. It references to unsigned int
type for android and linux. Patch corrects wint_t typedef to
__WINT_TYPE__.
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
Change-Id: Iabeb9fcb0b7bb303a8b220043e339126f125dd68
2012-11-26 12:01:58 +04:00
Nick Kralevich
635df850e5
mmap: Remove madvise() workaround
...
Remove mmap() calling madvise(MADV_MERGEABLE) added
in b8e1e9685e
2012-11-19 11:46:33 -08:00
Nick Kralevich
8784709a2c
Merge "We should use load_bias. This patch fixes MIPS NDK device exception test failures."
2012-11-19 10:45:18 -08:00
Chao-Ying Fu
c5db969aa4
We should use load_bias. This patch fixes MIPS NDK device exception test failures.
...
Change-Id: I4b718c36666e66062c1f13e4deea1ec7a7951c54
2012-11-19 10:30:15 -08:00
Nick Kralevich
fe07ca04e4
Merge "Support GNU_RELRO for static executables."
2012-11-16 08:45:52 -08:00
Nick Kralevich
170168cdf3
Merge "Temporarily address gcc 4.7 breakage."
2012-11-15 15:57:15 -08:00
Nick Kralevich
83697b8b76
Temporarily address gcc 4.7 breakage.
...
Change-Id: I8ebb2d5df2f8f8aedf252c94ff69505e61ed0a74
2012-11-15 15:48:19 -08:00
Nick Kralevich
ac3de8d080
Support GNU_RELRO for static executables.
...
In 9ec0f03a0d
2012-11-15 12:52:06 -08:00
Elliott Hughes
c079dfe415
am 6542ac03: Merge "Add a memmove(3) benchmark."
...
* commit '6542ac0380581e0cd0ad47e2763b732d93e9d6bd':
Add a memmove(3) benchmark.
2012-11-09 16:21:08 -08:00
Elliott Hughes
6542ac0380
Merge "Add a memmove(3) benchmark."
2012-11-09 16:17:35 -08:00
Elliott Hughes
d86d713b63
am b62e2770: Merge "Add optimized version of memset for Cortex A9"
...
* commit 'b62e2770e7c41f9cbe41acca4f25966eea2bc533':
Add optimized version of memset for Cortex A9
2012-11-09 15:15:09 -08:00
Elliott Hughes
b62e2770e7
Merge "Add optimized version of memset for Cortex A9"
2012-11-09 15:06:50 -08:00
Henrik Smiding
884e4f839b
Add optimized version of memset for Cortex A9
...
Adds new code to function memset, optimized for Cortex A9.
Copyright (C) ST-Ericsson SA 2010
Added neon implementation
Author: Henrik Smiding henrik.smiding@stericsson.com for ST-Ericsson.
Change-Id: Id3c87767953439269040e15bd30a27aba709aef6
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com >
2012-11-09 15:05:32 -08:00
Elliott Hughes
fbe44ec043
Add a memmove(3) benchmark.
...
Change-Id: I9c0ffae0b5aae29521b7e68e5ce2318b5a401cba
2012-11-09 14:59:21 -08:00
Elliott Hughes
0b25791a28
am 49677dec: Merge "Add optimized version of memcpy for Cortex A9"
...
* commit '49677deca2c2984ae6c0a3df8fbada7132e82940':
Add optimized version of memcpy for Cortex A9
2012-11-08 18:13:30 -08:00
Elliott Hughes
49677deca2
Merge "Add optimized version of memcpy for Cortex A9"
2012-11-08 18:04:28 -08:00
Henrik Smiding
6d0bcdc832
Add optimized version of memcpy for Cortex A9
...
Adds new code to memcpy function, optimized for Cortex A9.
Adds new ARM-only loop, for operations where source and
destination are aligned.
Copyright (C) ST-Ericsson SA 2010
Modified neon implementation to fit Cortex A9 cache line size,
for those running 32 bytes L2 cache line size.
Also split the implementation in aligned and unaligned access,
for those that allows unaligned memory access with Neon.
For totally aligned operations, arm-only code is used.
Change-Id: I95ebf6164cd6486b12a7e3e98e369db21e7e18d2
Author: Henrik Smiding henrik.smiding@stericsson.com for ST-Ericsson.
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com >
2012-11-08 18:02:14 -08:00
Elliott Hughes
6181aead7b
am c2132915: Merge "Add optimized version of memcmp for Cortex A9"
...
* commit 'c2132915158014f578c3f003c9399961fe8d6da2':
Add optimized version of memcmp for Cortex A9
2012-11-08 17:53:41 -08:00
Elliott Hughes
c213291515
Merge "Add optimized version of memcmp for Cortex A9"
2012-11-08 17:48:19 -08:00
Elliott Hughes
66eada9632
am 7aca3103: Merge "Simple google3-compatible benchmarking."
...
* commit '7aca3103069d7603cff47db7141b64f6a9d94f86':
Simple google3-compatible benchmarking.
2012-11-08 16:31:13 -08:00
Elliott Hughes
7aca310306
Merge "Simple google3-compatible benchmarking."
2012-11-08 16:26:45 -08:00
Elliott Hughes
7be369d4c6
Simple google3-compatible benchmarking.
...
Based on our open-source RE2 benchmarking code.
Includes benchmarks for a handful of <string.h> functions.
Change-Id: I30eb70d25dbf4ad5f2ca44976a8ce3b1ff7dad01
2012-11-08 15:37:43 -08:00
Elliott Hughes
70827cc85a
am d460f3f1: Merge "Tests for string routines."
...
* commit 'd460f3f1af80af40d8c3fab12a68459d8d1ec4c5':
Tests for string routines.
2012-11-08 09:29:33 -08:00
Elliott Hughes
d460f3f1af
Merge "Tests for string routines."
2012-11-08 09:15:22 -08:00
Elliott Hughes
e4180f85b7
am 5408ac3c: Merge "Fix dlopen_library_with_only_gnu_hash_Test."
...
* commit '5408ac3c8dfe4857985b94fb7bd883fd3899c48b':
Fix dlopen_library_with_only_gnu_hash_Test.
2012-11-07 18:31:37 -08:00
Elliott Hughes
5408ac3c8d
Merge "Fix dlopen_library_with_only_gnu_hash_Test."
2012-11-07 18:19:00 -08:00
Elliott Hughes
6e33b0296d
Fix dlopen_library_with_only_gnu_hash_Test.
...
Change-Id: Id3395f155587cfa74061f97a2cb4c6a6e59c13dc
2012-11-07 18:16:02 -08:00
Anna Tikhonova
036154b0c2
Tests for string routines.
...
Change-Id: I24068a228f59df1c3b758c5b2026a09720490616
Signed-off-by: Anna Tikhonova <anna.tikhonova@intel.com >
2012-11-07 18:14:29 -08:00
The Android Open Source Project
92b7fbf872
am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '414aadc79de68713e0a80a033c03b651615176f8':
2012-11-06 11:16:38 -08:00
The Android Open Source Project
414aadc79d
am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '3bf2fcf9a2bc811bbee194b19f2a00c4cfb24701':
Revert "Update ion header"
:Revert "Update ion header"
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Restore posix_memalign"
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
When compiling with clang, don't "fortify_source" the strlen.
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
Update msm_camera.h to version that supports instance handle based lookup
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-11-06 11:13:52 -08:00
The Android Open Source Project
3bf2fcf9a2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I8a58a6aebc81829d15af6802f16d956cad2d39c8
2012-11-06 11:12:01 -08:00
Elliott Hughes
8baaf6ff96
am 604a163e: Merge "Rewrite <fenv.h> for ARM."
...
* commit '604a163e4c7724f881605fdbda94db4f7c8f0e7a':
Rewrite <fenv.h> for ARM.
2012-11-05 16:51:53 -08:00
Elliott Hughes
604a163e4c
Merge "Rewrite <fenv.h> for ARM."
2012-11-05 16:43:35 -08:00
Elliott Hughes
062240853d
am bb91e9fb: Merge "Upgrade to tzdata2012i."
...
* commit 'bb91e9fb96ec6ea8a6ebcf17bf70f66f957df30b':
Upgrade to tzdata2012i.
2012-11-05 10:57:20 -08:00
Elliott Hughes
bb91e9fb96
Merge "Upgrade to tzdata2012i."
2012-11-05 10:42:58 -08:00
Elliott Hughes
ce876bebf2
am a41e6426: Merge "Tone down some of the overly-verbose linker logging."
...
* commit 'a41e6426073c57881f49bdaec46ca90a5b164401':
Tone down some of the overly-verbose linker logging.
2012-11-05 09:19:57 -08:00
Elliott Hughes
a41e642607
Merge "Tone down some of the overly-verbose linker logging."
2012-11-05 09:13:31 -08:00
Elliott Hughes
9c94fc9fbe
Tone down some of the overly-verbose linker logging.
...
We don't need to see every dlopen(3)/dlsym(3) failure unless LD_DEBUG is on.
Change-Id: I1edfe8b72f32ff54dd30e1acf32e20d470d5e9f7
2012-11-05 09:11:43 -08:00
Elliott Hughes
e3063f4e55
Upgrade to tzdata2012i.
...
Also support GPG signature verification of updates, and fix remaining
pylint complaints.
The 2012i release of the tz data reflects the following changes recently
circulated on the tz mailing list:
* Cuba switches from DST [2012-11-04] at 01:00. (Thanks to Steffen Thorsen.)
Change-Id: Ie81d395afa40aa217a0196aad8ca1f9a870bbc31
2012-11-05 08:53:28 -08:00
Elliott Hughes
90e10d41c4
Rewrite <fenv.h> for ARM.
...
The old code was one big no-op.
Bug: http://code.google.com/p/android/issues/detail?id=38196
Change-Id: I201a6ffa477385b2629f45e8c948bdfbd47b5bf1
2012-11-05 08:50:19 -08:00
Elliott Hughes
bc35807fc6
am 9df2e000: Merge "Cleaning the linker environment as we initialize it requires less API."
...
* commit '9df2e000b5d56b2e529656034d684e370aa6a8d1':
Cleaning the linker environment as we initialize it requires less API.
2012-11-02 13:56:00 -07:00
Elliott Hughes
cfb47daf4e
am 01271b18: Merge "Make dynamic linker debugging always available."
...
* commit '01271b1812f2cec8aaf3c105b9f960f027b33a95':
Make dynamic linker debugging always available.
2012-11-02 13:55:59 -07:00
Elliott Hughes
9df2e000b5
Merge "Cleaning the linker environment as we initialize it requires less API."
2012-11-02 13:47:50 -07:00
Elliott Hughes
01271b1812
Merge "Make dynamic linker debugging always available."
2012-11-02 13:46:55 -07:00
Elliott Hughes
61a9ccb41e
Make dynamic linker debugging always available.
...
If you need to build your own linker to get debugging, the debugging
is never available when you need it.
Change-Id: I5ff7e55753459d49a2990f25d9aa155e0b8602e0
2012-11-02 13:46:23 -07:00
Elliott Hughes
0894b2c5d3
Cleaning the linker environment as we initialize it requires less API.
...
Change-Id: I612fd699e46833a411589478564a1f859223c380
2012-11-02 12:40:11 -07:00
Elliott Hughes
cdc5a17cef
am ed537239: Merge "Adjust symbol lookup for DT_SYMBOLIC case"
...
* commit 'ed537239a94ebd11a8c262a319d81fd1f0d3f73f':
Adjust symbol lookup for DT_SYMBOLIC case
2012-11-02 11:37:40 -07:00
Elliott Hughes
ed537239a9
Merge "Adjust symbol lookup for DT_SYMBOLIC case"
2012-11-02 11:25:49 -07:00
Pavel Chupin
c77c434149
Adjust symbol lookup for DT_SYMBOLIC case
...
According ELF spec re. DT_SYMBOLIC:
This element's presence in a shared object library alters the dynamic
linker's symbol resolution algorithm for references within the library.
Instead of starting a symbol search with the executable file, the
dynamic linker starts from the shared object itself. If the shared
object fails to supply the referenced symbol, the dynamic linker then
searches the executable file and other shared objects as usual.
This change implements the last part.
Change-Id: Iae95d53d455313a4306f11733941bcd3596ac85f
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2012-11-02 18:34:22 +04:00
Elliott Hughes
e109930e9f
am dc77a228: Merge "Allow dlopen("egl/blah.so")."
...
* commit 'dc77a22850e31eb369ec9776c13c967566bf61d0':
Allow dlopen("egl/blah.so").
2012-11-01 23:08:27 -07:00
Elliott Hughes
dc77a22850
Merge "Allow dlopen("egl/blah.so")."
2012-11-01 23:01:58 -07:00
Elliott Hughes
6971fe4ca5
Allow dlopen("egl/blah.so").
...
NVIDIA binary blobs construct strings to pass to dlopen(3) that
contain '/' but require that we fall back to LD_LIBRARY_PATH.
Change-Id: Iad831899986baace6962f4b335eeb288250a1e22
2012-11-01 22:59:19 -07:00
Elliott Hughes
7f7ac8cd19
am e3c7b519: Merge "Don\'t corrupt the thread list if the main thread exits."
...
* commit 'e3c7b5192e65eeb0bd90bf884d3435ed9adfad0e':
Don't corrupt the thread list if the main thread exits.
2012-11-01 17:37:04 -07:00
Elliott Hughes
e3c7b5192e
Merge "Don't corrupt the thread list if the main thread exits."
2012-11-01 17:28:01 -07:00
Elliott Hughes
4f251bee5d
Don't corrupt the thread list if the main thread exits.
...
...and don't pass a non-heap pointer to free(3), either.
This patch replaces the "node** prev" with the clearer "node* prev"
style and fixes the null pointer dereference in the old code. That's
not sufficient to fix the reporter's bug, though. The pthread_internal_t*
for the main thread isn't heap-allocated --- __libc_init_tls causes a
pointer to a statically-allocated pthread_internal_t to be added to
the thread list.
Bug: http://code.google.com/p/android/issues/detail?id=37410
Change-Id: I112b7f22782fc789d58f9c783f7b323bda8fb8b7
2012-11-01 17:27:07 -07:00
Elliott Hughes
6db8f5bb75
am d30116cf: Merge "Keep the dynamic linker\'s soinfo pools mostly read-only."
...
* commit 'd30116cf4a590e7bea3b73fa49bb27502a920819':
Keep the dynamic linker's soinfo pools mostly read-only.
2012-11-01 17:00:13 -07:00
Elliott Hughes
d30116cf4a
Merge "Keep the dynamic linker's soinfo pools mostly read-only."
2012-11-01 16:49:37 -07:00
Elliott Hughes
d23736e4f2
Keep the dynamic linker's soinfo pools mostly read-only.
...
We'll need a lot more refactoring of this code before we can reduce
the granularity, but this is a step forward.
Change-Id: I07061720e734b571a8399c1d5b4f2f35cd681307
2012-11-01 16:48:14 -07:00
Elliott Hughes
65ba5b62c5
am 064f862d: Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
...
* commit '064f862d557ab741575dfae479499a07ca0ab742':
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.
2012-11-01 14:14:00 -07:00
Elliott Hughes
064f862d55
Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
2012-11-01 13:57:00 -07:00
Elliott Hughes
1a6961650c
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.
...
Also remove an unnecessary #include and a now-obsolete TODO.
Change-Id: I36d923721e349a286934b9534090a67ce0786e7b
2012-11-01 13:53:26 -07:00
Elliott Hughes
3bb62578be
am 0be1819b: Merge "Dynamically allocate soinfo-structs in linker"
...
* commit '0be1819b22b33fbedcb150f96a196ed096abe2fc':
Dynamically allocate soinfo-structs in linker
2012-11-01 11:44:29 -07:00
Elliott Hughes
0be1819b22
Merge "Dynamically allocate soinfo-structs in linker"
2012-11-01 11:36:02 -07:00
Magnus Malmborn
ba98d9237b
Dynamically allocate soinfo-structs in linker
...
Request memory from the system when needed instead of having a fixed
array for soinfo structs. Note that malloc() et al can't be used in
linker, so use mmap() instead.
Change-Id: I4b495995931d7752b0e8c944e64d1fe41b9f7144
2012-11-01 11:31:39 -07:00
Elliott Hughes
1de3af51d4
am c0ac7eba: Merge "Reject .so files with no sysv hash table."
...
* commit 'c0ac7eba934fb88f321c75a71312ea482e9a85e9':
Reject .so files with no sysv hash table.
2012-10-31 15:13:30 -07:00
Elliott Hughes
c0ac7eba93
Merge "Reject .so files with no sysv hash table."
2012-10-31 15:09:46 -07:00
Elliott Hughes
124fae9eab
Reject .so files with no sysv hash table.
...
Also ensure that dlopen(3) errors always include the name of the library we
failed to open.
Also fix a bug where we'd fall back to searching LD_LIBRARY_PATH and the
built-in paths for names that include slashes.
Bug: http://code.google.com/p/android/issues/detail?id=38479
Change-Id: Ib2c009ed083344a7a012749d58f8679db2f26c78
2012-10-31 14:30:50 -07:00
Elliott Hughes
f510fc789a
am b46530bd: Merge "Start cleaning up libm."
...
* commit 'b46530bd3e5984047bd780f5d3a6a5ebabd9f02d':
Start cleaning up libm.
2012-10-31 13:51:50 -07:00
Elliott Hughes
b46530bd3e
Merge "Start cleaning up libm."
2012-10-31 13:43:41 -07:00
Elliott Hughes
0f7809d5c3
Start cleaning up libm.
...
We have two copies of fenv.h for every architecture, one of which
isn't used. We also have unused makefiles and files for architectures
we don't support.
This patch removes all the obviously useless files.
Bug: http://code.google.com/p/android/issues/detail?id=38196
Change-Id: I1919b6621ba513aa24aa947a34815bc51191487c
2012-10-31 13:32:34 -07:00
The Android Open Source Project
089111a80a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4
2012-10-31 09:15:16 -07:00
The Android Automerger
f29c214d6a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:11:57 -07:00
Elliott Hughes
3cd7a1653a
am 084be591: Merge "linker: handle R_ARM_COPY relocations in a proper way"
...
* commit '084be591923d3d509cea0a0f4b11b073e362d730':
linker: handle R_ARM_COPY relocations in a proper way
2012-10-30 17:18:04 -07:00
Elliott Hughes
084be59192
Merge "linker: handle R_ARM_COPY relocations in a proper way"
2012-10-30 17:10:30 -07:00
Ard Biesheuvel
5ae44f302b
linker: handle R_ARM_COPY relocations in a proper way
...
If an executable contain copy relocations, other references
to the symbol it points to should be preempted and made to
point to the copy instead.
Also, the linker should make sure the target area has
sufficient space to contain the copy. It also checks
whether the library that supplies the symbol is built
with -Bsymbolic, and errors out if this is the case.
Change-Id: If135c83590092741cfd8f82f54816f363a4a4a3b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com >
2012-10-30 17:09:21 -07:00
Elliott Hughes
914112ea21
am 155e8d1d: Merge "More dynamic linker cleanup."
...
* commit '155e8d1df5b8fdfeabda3e7b61d95beb5b8d1467':
More dynamic linker cleanup.
2012-10-30 16:56:29 -07:00
Elliott Hughes
155e8d1df5
Merge "More dynamic linker cleanup."
2012-10-30 16:41:01 -07:00
Elliott Hughes
18a206c81d
More dynamic linker cleanup.
...
I still want to break linker_format out into its own library so we can reuse
it for malloc debugging and so forth. (There are many similar pieces of code
in bionic, but the linker's one seems to be the most complete/functional.)
Change-Id: If3721853d28937c8e821ca1d23cf200e228a409a
2012-10-30 16:35:38 -07:00
Elliott Hughes
b0ac82e9ba
Merge commit 'bd8ee3d3' into mm
2012-10-30 15:20:13 -07:00
Elliott Hughes
bd8ee3d35e
am a811d7a8: Upgrade to tzdata2012h.
...
* commit 'a811d7a8e638ca49aee704c613cb9f1e03c3698d':
Upgrade to tzdata2012h.
2012-10-30 14:30:12 -07:00
Elliott Hughes
4569ab9773
am 06b59610: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
...
* commit '06b596104a9ed3ac089abd00186a5698d7e8544f':
Fix bug in pthread_join, pthread_exit, pthread_detach
2012-10-30 13:04:23 -07:00
Elliott Hughes
06b596104a
Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
2012-10-30 12:57:58 -07:00
Elliott Hughes
743a273e40
am 1f21ece4: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '1f21ece48a87abbbdd9fb939b79a1dd81fb867eb':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-29 17:15:12 -07:00
Elliott Hughes
5f787190a9
am 4d36b0bd: Merge "Fix the pthread_join on self error case."
...
* commit '4d36b0bd38559ae0376b61a0ac2f5fa8329ec56d':
Fix the pthread_join on self error case.
2012-10-29 17:15:09 -07:00
Elliott Hughes
0b8fa1d456
am 9297af94: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '9297af943887d9d6974aaec8c45a4e7d93422965':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-29 17:15:03 -07:00
Elliott Hughes
40e467ec66
am 33c4a3ad: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '33c4a3adde3cf1753af0661f48ce86358e105277':
libc: Fix alphasort() signature (and implementation).
2012-10-29 17:15:02 -07:00
Elliott Hughes
8576560979
am 8f9a1eb1: Merge "Upgrade to tzdata2012h."
...
* commit '8f9a1eb108f22fc2ce7283ef184d909ec0ca1152':
Upgrade to tzdata2012h.
2012-10-29 17:15:01 -07:00
Elliott Hughes
a67cedb52c
am 9e783963: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit '9e783963d58acf48e06902236ea64c7f5b337a0f':
Clean up the implementation of the <dirent.h> functions.
2012-10-29 17:14:59 -07:00
Elliott Hughes
1f21ece48a
Merge "Clean up the <libgen.h> implementation a little, bring in tests."
2012-10-29 15:03:36 -07:00
Elliott Hughes
58b575485c
Clean up the <libgen.h> implementation a little, bring in tests.
...
Most of these tests were in system/extras, but I've added more to cover other
cases explicitly mentioned by POSIX.
Change-Id: I5e8d77e4179028d77306935cceadbb505515dcde
2012-10-29 14:27:10 -07:00
Sergey Melnikov
10ce96944e
Fix bug in pthread_join, pthread_exit, pthread_detach
...
pthread_no_op_detach_after_join test from bionic-unit-tests hangs
on x86 emulator. There is a race in the pthread_join, pthread_exit,
pthread_detach functions:
- pthread_join waits for the non-detached thread
- pthread_detach sets the detached flag on that thread
- the thread executes pthread_exit which just kills the now-detached
thread, without sending the join notification.
This patch improves the test so it fails on ARM too, and modifies
pthread_detach to behave more like glibc, not setting the detach state if
called on a thread that's already being joined (but not returning an error).
Change-Id: I87dc688221ce979ef5178753dd63d01ac0b108e6
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
2012-10-29 11:31:26 -07:00
Elliott Hughes
4d36b0bd38
Merge "Fix the pthread_join on self error case."
2012-10-29 10:30:16 -07:00
Elliott Hughes
14f19592ae
Fix the pthread_join on self error case.
...
We should return EDEADLK, not deadlock the calling thread.
Change-Id: I1243483f709c11b2a60e41142725c54c7dbfcbc9
2012-10-29 10:19:44 -07:00
Elliott Hughes
9297af9438
Merge "Fix a potential NULL pointer dereference in _init_thread()."
2012-10-29 08:26:01 -07:00
Xi Wang
ae8eb74675
Fix a potential NULL pointer dereference in _init_thread().
...
The first NULL pointer check against `attr' suggests that `attr' can
be NULL. Then later `attr' is directly dereferenced, suggesting the
opposite.
if (attr == NULL) {
...
} else {
...
}
...
if (attr->stack_base == ...) { ... }
The public API pthread_create(3) allows NULL, and interprets it as "default".
Our implementation actually swaps in a pointer to the global default
pthread_attr_t, so we don't need any NULL checks in _init_thread. (The other
internal caller passes its own pthread_attr_t.)
Change-Id: I0a4e79b83f5989249556a07eed1f2887e96c915e
Signed-off-by: Xi Wang <xi.wang@gmail.com >
2012-10-29 08:22:13 -07:00
Elliott Hughes
33c4a3adde
Merge "libc: Fix alphasort() signature (and implementation)."
2012-10-29 07:45:13 -07:00
David 'Digit' Turner
c30396f5f2
libc: Fix alphasort() signature (and implementation).
...
The declaration for alphasort() in <dirent.h> used the deprecated:
int alphasort(const void*, const void*);
while both Posix and GLibc use instead:
int alphasort(const struct dirent** a, const struct dirent** b);
See: http://pubs.opengroup.org/onlinepubs/9699919799/functions/alphasort.html
This patch does the following:
- Update the declaration to match Posix/GLibc
- Get rid of the upstream BSD code which isn't compatible with the new
signature.
- Implement a new trivial alphasort() with the right signature, and
ensure that it uses strcoll() instead of strcmp().
- Remove Bionic-specific #ifdef .. #else .. #endif block in
dirent_test.cpp which uses alphasort().
Even through strcoll() currently uses strcmp(), this does the right
thing in the case where we decide to update strcoll() to properly
implement locale-specific ordered comparison.
Change-Id: I4fd45604d8a940aaf2eb0ecd7d73e2f11c9bca96
2012-10-29 07:44:27 -07:00
Elliott Hughes
8f9a1eb108
Merge "Upgrade to tzdata2012h."
2012-10-29 07:29:13 -07:00
Elliott Hughes
f93fc10fc4
Upgrade to tzdata2012h.
...
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug: 7429010
Change-Id: I0ec5fb72343e42f3f79490dfdea5f7f1946ae76f
2012-10-28 11:34:35 -07:00
Elliott Hughes
a811d7a8e6
Upgrade to tzdata2012h.
...
The 2012h release reflects the following changes recently circulated
on the tz mailing list:
[Brazil] Bahia no longer has DST. (Thanks to Kelley Cook.)
[Brazil] Tocantins has DST. (Thanks to Rodrigo Severo.)
[Israel] Israel has new DST rules next year. (Thanks to Ephraim Silverberg.)
[Jordan] Jordan stays on DST this winter. (Thanks to Steffen Thorsen.)
Bug: 7429010
Change-Id: I82f19ce49f944f928b6dd8dc5a893786266e5cb9
2012-10-28 11:33:56 -07:00
Elliott Hughes
9e783963d5
Merge "Clean up the implementation of the <dirent.h> functions."
2012-10-26 16:42:48 -07:00
Elliott Hughes
063cfb2084
Clean up the implementation of the <dirent.h> functions.
...
Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 16:42:06 -07:00
Elliott Hughes
8cacc639b6
am 7193731a: Merge "Workaround g++ 4.7 compfail"
...
* commit '7193731ae6b8083bc7a5e5e468fb98b1dbcf3f3d':
Workaround g++ 4.7 compfail
2012-10-25 15:20:29 -07:00
Elliott Hughes
85819efe8f
am f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
...
* commit 'f2b3ac9502e08ef53d4eedd7e93ea9a00d185055':
Fix recovery: don't assert if there's no tzdata.
2012-10-25 15:09:29 -07:00
Elliott Hughes
7193731ae6
Merge "Workaround g++ 4.7 compfail"
2012-10-25 15:00:45 -07:00
Elliott Hughes
f2b3ac9502
Merge "Fix recovery: don't assert if there's no tzdata."
2012-10-25 14:56:53 -07:00
Elliott Hughes
49271d89da
Fix recovery: don't assert if there's no tzdata.
...
Change-Id: I4d808b57c63ec1ccc024da7fd6a65691e0d455c5
2012-10-25 14:56:08 -07:00
Elliott Hughes
df7f24f310
am 7b68e3f7: Merge "Per-thread -fstack-protector guards for x86."
...
* commit '7b68e3f799d87e84c56687033326924fd8fec84c':
Per-thread -fstack-protector guards for x86.
2012-10-25 12:22:34 -07:00
Elliott Hughes
7b68e3f799
Merge "Per-thread -fstack-protector guards for x86."
2012-10-25 12:08:50 -07:00
Elliott Hughes
ad88a08631
Per-thread -fstack-protector guards for x86.
...
Based on a pair of patches from Intel:
https://android-review.googlesource.com/#/c/43909/
https://android-review.googlesource.com/#/c/44903/
For x86, this patch supports _both_ the global that ARM/MIPS use
and the per-thread TLS entry (%gs:20) that GCC uses by default. This
lets us support binaries built with any x86 toolchain (right now,
the NDK is emitting x86 code that uses the global).
I've also extended the original tests to cover ARM/MIPS too, and
be a little more thorough for x86.
Change-Id: I02f279a80c6b626aecad449771dec91df235ad01
2012-10-25 12:04:03 -07:00
Pavel Chupin
20aa6c0f4c
Workaround g++ 4.7 compfail
...
error: C99 designator 'name' outside aggregate initializer
G++ 4.7+ can't handle some of C99 designated initializers.
Most likely it's just not implemented yet. Other possible workarounds is
to compile this as C not C++ or define name as char* instead of char[SIZE].
Appeared after this change https://android-review.googlesource.com/#/c/44470
Change-Id: Ib28157848ce759b8bb5dbb2ac0d9a768fa4e5107
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2012-10-25 17:58:45 +04:00
Elliott Hughes
60c7ac2622
am d0f2b7e7: Merge "More upstream NetBSD upgrades."
...
* commit 'd0f2b7e7e65f19f978c59abcbb522c08e76b1508':
More upstream NetBSD upgrades.
2012-10-23 17:15:07 -07:00
Elliott Hughes
d0f2b7e7e6
Merge "More upstream NetBSD upgrades."
2012-10-23 16:55:19 -07:00
Elliott Hughes
ab44f52202
More upstream NetBSD upgrades.
...
Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-23 16:05:09 -07:00
Elliott Hughes
45f075556b
am e3dbe1e3: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit 'e3dbe1e3820d6ab0370566055e9cdc593c5cce48':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:55:59 -07:00
Elliott Hughes
e3dbe1e382
Merge "Upgrade more functions to the current upstream NetBSD copy."
2012-10-23 13:45:37 -07:00
Elliott Hughes
e8bcca3a2c
Upgrade more functions to the current upstream NetBSD copy.
...
Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 12:29:53 -07:00
Elliott Hughes
4280143d37
am fb93e6a5: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit 'fb93e6a5b322a87e61de19421a72d6dfcc82b614':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:06:55 -07:00
Elliott Hughes
fb93e6a5b3
Merge "Move setlocale(3) and the wchar stubs over to .cpp."
2012-10-22 17:50:27 -07:00
Elliott Hughes
29c7f0b4d1
Move setlocale(3) and the wchar stubs over to .cpp.
...
Also separate out the C++ files so we can use -Werror on them. I'd
rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us
see which files still need to be sorted into one bucket or the other.
Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-22 17:05:27 -07:00
Elliott Hughes
69ec117b22
am 5a9911e9: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '5a9911e94086a15a7f2d5a7c9173847f123a46ea':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:29:13 -07:00
Elliott Hughes
9d5a96c0d9
am 574773b1: Merge "Clean up warnings in stubs.cpp."
...
* commit '574773b1eae797e2f7a1d11d0176755d2e74eb41':
Clean up warnings in stubs.cpp.
2012-10-22 16:29:12 -07:00
Elliott Hughes
5a9911e940
Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
2012-10-22 16:13:04 -07:00
Elliott Hughes
574773b1ea
Merge "Clean up warnings in stubs.cpp."
2012-10-22 16:12:47 -07:00
Elliott Hughes
ce45fea03d
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
...
Change-Id: I35ceb09fedf873c5e98e1e26efce5e4f00a17e74
2012-10-22 16:10:27 -07:00
Elliott Hughes
6fa26e21bc
Clean up warnings in stubs.cpp.
...
Change-Id: Ie0792846de7cf5f5c72737494bf78ab8dcb8cc3e
2012-10-22 16:04:56 -07:00
Elliott Hughes
75f33adcb1
am 4e457759: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '4e457759893a6a6ab4f84a5aea231d0a11c7bb13':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 15:57:42 -07:00
Elliott Hughes
4e45775989
Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
2012-10-22 15:51:12 -07:00
Elliott Hughes
4035b7a321
Move the FORTIFY_SOURCE helpers over to .cpp.
...
Change-Id: Ib5067d51b983cac7760c975becce7fe2408ead04
2012-10-22 15:32:01 -07:00
Elliott Hughes
008744ceda
am df92635a: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit 'df92635a57e8093d9cbffc38bbf513f3361ee91e':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:08:38 -07:00
Elliott Hughes
df92635a57
Merge "Support zone.tab in bionic, and remove the file format version."
2012-10-22 14:56:32 -07:00
Elliott Hughes
2393535f0d
Support zone.tab in bionic, and remove the file format version.
...
Bug: 7012465
Change-Id: I6335c91ebadc609fae85bad94db972be7574b6e4
2012-10-22 14:47:58 -07:00
Elliott Hughes
417834b17e
am eb370aa3: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit 'eb370aa31dd549ad7a7a2044dedab1140a7aeda9':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:53:22 -07:00
Elliott Hughes
eb370aa31d
Merge "Make bionic look in /data/misc for tzdata updates."
2012-10-22 11:37:26 -07:00
Elliott Hughes
1c29572034
Make bionic look in /data/misc for tzdata updates.
...
Bug: 7012465
Change-Id: I4d1018f686f2409600fdb6630732cae33efe8f02
2012-10-22 11:34:05 -07:00
Elliott Hughes
629a28cdf3
am dc595d83: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit 'dc595d830898e5859bf98d7436af2a777a11f810':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:21:41 -07:00
Elliott Hughes
58d08711af
am 7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:21:40 -07:00
Elliott Hughes
dc595d8308
Merge "Change ZoneCompator to generate the single "tzdata" file."
2012-10-19 17:12:37 -07:00
Elliott Hughes
7a85c42b8f
Merge "Update generate-NOTICE.py to know about tzdata."
2012-10-19 17:07:46 -07:00
The Android Automerger
5ba74660e3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 15:45:58 -07:00
Elliott Hughes
5b1497acdb
Change ZoneCompator to generate the single "tzdata" file.
...
Also remove the obsolete individual files, and the temporary script
that converted between the formats.
Bug: 7012465
Change-Id: I5a4030098e4d53e747fd6d395df2679d1567ee1f
2012-10-19 15:45:46 -07:00
Elliott Hughes
4612763b44
Update generate-NOTICE.py to know about tzdata.
...
Also regenerate the NOTICE files. One had slipped behind.
Bug: 7012465
Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a
2012-10-19 14:55:19 -07:00
Elliott Hughes
af72df5b98
am e75c273a: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'e75c273ac434043153f22b1c2f89c042928407bc':
Track the tzdata2012g update in the new file format.
2012-10-19 14:40:25 -07:00
Elliott Hughes
e75c273ac4
Merge "Track the tzdata2012g update in the new file format."
2012-10-19 14:30:05 -07:00
Elliott Hughes
8af5412efc
Track the tzdata2012g update in the new file format.
...
Change-Id: Id18aeb1122df769d83c4be06fbf37681231e79f0
2012-10-19 14:28:56 -07:00
Elliott Hughes
98533cfa4b
am 88cd1a21: Merge "Upgrade to tzdata2012g."
...
* commit '88cd1a2188cde62d9f94881549791b7c197b2116':
Upgrade to tzdata2012g.
2012-10-19 13:51:19 -07:00
Elliott Hughes
f0af78c27b
am 551ca77e: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit '551ca77e35098272abfe9484457827c661d23ef0':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:51:18 -07:00
Elliott Hughes
88cd1a2188
Merge "Upgrade to tzdata2012g."
2012-10-19 13:45:55 -07:00
Elliott Hughes
c2c2a48845
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
(cherry-pick of f0e402dbd257ab495eab514b347db4b3d6844826.)
Change-Id: I8202292b11accedb811194a821dacf837a1bbd6e
2012-10-19 13:43:10 -07:00
Elliott Hughes
551ca77e35
Merge "Do all the zoneinfo.* file generation in Java."
2012-10-19 13:37:25 -07:00
Elliott Hughes
356c0af60b
am 2266e495: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '2266e4956f4b245903acd66f0cc32ec5caf5abae':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:18:07 -07:00
Elliott Hughes
328a484588
Do all the zoneinfo.* file generation in Java.
...
Bug: 7012465
Change-Id: Ia5d5ad75db94d680a6b34ccc26eb68d5bd2bfc29
2012-10-19 13:03:52 -07:00
Elliott Hughes
2266e4956f
Merge "Switch bionic over to using libcore's copy of libcore.util.ZoneInfo."
2012-10-19 13:01:04 -07:00
Elliott Hughes
eb06129c5c
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
...
Bug: 7012465
Change-Id: I1225494c5d77a20fd48be1e904d8695ef95860e3
2012-10-19 12:05:24 -07:00
Elliott Hughes
fb8ecd6e2f
am bc77942a: am f0e402db: Upgrade to tzdata2012g.
...
* commit 'bc77942a9a5b2a30eb04fab495cb30ac21bb150d':
Upgrade to tzdata2012g.
2012-10-19 09:59:52 -07:00
Elliott Hughes
bc77942a9a
am f0e402db: Upgrade to tzdata2012g.
...
* commit 'f0e402dbd257ab495eab514b347db4b3d6844826':
Upgrade to tzdata2012g.
2012-10-19 09:57:49 -07:00
Elliott Hughes
f0e402dbd2
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
Change-Id: I52d9d2cd6e8e755885dc258200c014bee75527c9
2012-10-18 16:34:48 -07:00
Elliott Hughes
4d71adbc0d
am 10225071: Merge "Fixes x86 build."
...
* commit '102250719f8aff443741e54ba5633c7722544620':
Fixes x86 build.
2012-10-18 13:56:02 -07:00
Elliott Hughes
102250719f
Merge "Fixes x86 build."
2012-10-18 13:43:41 -07:00
Elliott Hughes
8b95404d00
Fixes x86 build.
...
Change-Id: I0e576784b2224668d58ebea03986d534ee0e43b4
2012-10-18 13:42:59 -07:00
Elliott Hughes
79c6a8d2b1
am ca7466d2: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit 'ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:37:54 -07:00
Elliott Hughes
ca7466d2b8
Merge "Make bionic's dependency on the tzdata explicit."
2012-10-18 13:19:14 -07:00
Elliott Hughes
914d8d4cff
Make bionic's dependency on the tzdata explicit.
...
Also stop building the obsolete three files, now bionic and libcore
both use the new single file.
Bug: 7012465
Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
2012-10-18 12:23:34 -07:00
Elliott Hughes
1b315363c2
am 5ae762a3: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '5ae762a393168932602eb7269a7d30a53de1c83c':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 10:59:27 -07:00
Elliott Hughes
e5c8ced4f9
am 9ffaabcc: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit '9ffaabcc49776676cb2ea60f0846f2c208f6d715':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:26:36 -07:00
Elliott Hughes
c2e4c310ff
am 32ea9fe5: Merge "Put all the tzdata in one file."
...
* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
Put all the tzdata in one file.
2012-10-17 16:09:31 -07:00
Elliott Hughes
06abe13c5f
am a2f596b6: Merge "Make dlerror(3) thread-safe."
...
* commit 'a2f596b65075db7916ffffa2f5059e7953719578':
Make dlerror(3) thread-safe.
2012-10-17 11:03:12 -07:00
David 'Digit' Turner
c7dc842529
am 42ac0e50: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit '42ac0e50302c4d5ce855444e44615489ab662452':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:30:01 -07:00
David 'Digit' Turner
423a0740b5
am 4136c3a2: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '4136c3a2b7f7546968c5a305aa2ef0663fcb6c6d':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:32:56 -07:00
Elliott Hughes
ee7a28c529
am a9944cfe: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'a9944cfe9e152ca46afb0a77300ec5a2a1a24e64':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:20:50 -07:00
Elliott Hughes
1452324ff5
am fcf901d5: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit 'fcf901d5c0924a71a1405a2535051663281da048':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:14:29 -07:00
Elliott Hughes
c2483ea9b6
am 9434e8fe: Merge "Make the dlfcn mutex static."
...
* commit '9434e8febc8b223db2d49e7f97140771700113b9':
Make the dlfcn mutex static.
2012-10-12 11:21:59 -07:00
Elliott Hughes
ab4e2ed182
am db4fdf1a: Merge "Fix dlerror(3)."
...
* commit 'db4fdf1aafb63b09ee967066d9b8107a9812db2d':
Fix dlerror(3).
2012-10-12 10:47:59 -07:00
The Android Open Source Project
cf3fa7f457
Reconcile with jb-mr1-factory-release - do not merge
...
Change-Id: I833db3c1458b360d17442413b86b546dc650bc0c
2012-10-12 07:30:26 -07:00
Elliott Hughes
2facd5b5ef
am 417fd233: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '417fd2334a694cf6a831b81cd672b4ca31ff2f54':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:42:00 -07:00
The Android Automerger
b5f1e03079
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:18:46 -07:00
The Android Open Source Project
d1844d4b30
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I8ceb7a33ab427c2d3e884e8b71064ecbc531fd1e
2012-10-11 05:56:36 -07:00
The Android Automerger
7cc2dec82e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 14:06:19 -07:00
Ying Wang
0620122763
am ecbded40: am 2c287e95: Set up the private variables.
...
* commit 'ecbded40ff1278ddb155d3e1a5d137285f18629f':
Set up the private variables.
2012-10-10 13:52:59 -07:00
Ying Wang
ecbded40ff
am 2c287e95: Set up the private variables.
...
* commit '2c287e9510ec1d379b3cd779651b595dafb6a2ff':
Set up the private variables.
2012-10-10 13:51:30 -07:00
Ying Wang
2c287e9510
Set up the private variables.
...
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Cherry-picked from master.
Bug: 7170098
Change-Id: Ic8f1d36a116fce24f3ea6a3ff5e9bfab6cafee99
2012-10-10 10:25:13 -07:00
Elliott Hughes
4c3d7a86bb
am 1ceb9824: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '1ceb9824ab39501e98300bc87f7984ee6b455ce8':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:27:11 -07:00
Elliott Hughes
c7f654dffe
am b83cad79: Merge "Fix two comment typos."
...
* commit 'b83cad79838f780779bd129da9ed4662b741bd31':
Fix two comment typos.
2012-10-09 17:38:01 -07:00
Ying Wang
a55f0a1007
am b04598a6: Set up the private variables.
...
* commit 'b04598a63c3f0df597f6186beea3adafc665ef56':
Set up the private variables.
2012-10-08 14:21:38 -07:00
Ying Wang
b04598a63c
Set up the private variables.
...
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Bug: 7170098
Change-Id: I6e505b33001b76f4b11fcbbb1d35392c4ddf4c70
2012-10-08 14:12:56 -07:00
Elliott Hughes
7e7853230f
am 9a7366e8: am fa7e2586: Merge "Test flags before using "info""
...
* commit '9a7366e8943990619c494548050aa906f1971332':
Test flags before using "info"
2012-10-03 17:42:35 -07:00
The Android Open Source Project
ae8000f368
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I80b71067d1e628d18a19d94219fcfa1000133abf
2012-10-03 07:33:03 -07:00
The Android Automerger
956092e07c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:12 -07:00
Naseer Ahmed
9c3892558f
am 6b1ba118: am 3ef4fecd: bionic: update processed msm_mdp.h
...
* commit '6b1ba1184a5e0884686b63da837a85f8c861d1fc':
bionic: update processed msm_mdp.h
2012-10-03 01:03:04 -07:00
Naseer Ahmed
6b1ba1184a
am 3ef4fecd: bionic: update processed msm_mdp.h
...
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30
bionic: update processed msm_mdp.h
...
-- Has display commit ioctl
Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-10-02 23:37:34 -07:00
Andy McFadden
51c7167d22
am 7c67e4e4: am 98957db5: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '7c67e4e423f7608c50a1fc7c355d87593cfdbcca':
Test flags before using "info"
2012-10-02 15:27:09 -07:00
Andy McFadden
7c67e4e423
am 98957db5: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '98957db5536e93724c2e9e6bd19d5063f9d4dc2c':
Test flags before using "info"
2012-10-02 15:24:25 -07:00
Andy McFadden
98957db553
Merge "Test flags before using "info"" into jb-mr1-dev
2012-10-02 15:23:20 -07:00
Andreas Huber
3a0aa5e0a0
am cafbc940: am 2e0452cb: bionic: update processed msm_vidc_enc.h
...
* commit 'cafbc9404310828ecddc55a1eed5fc897008b1f3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:42:35 -07:00
Andreas Huber
cafbc94043
am 2e0452cb: bionic: update processed msm_vidc_enc.h
...
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1
bionic: update processed msm_vidc_enc.h
...
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-10-02 14:34:03 -07:00
Andy McFadden
f84bc8d6f6
Test flags before using "info"
...
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one. Test to see if SA_SIGINFO is
still set before we try to use the argument.
Bug: 7272866
Change-Id: If682a2262fe8a575f3802fb0c60a53eea3082456
2012-10-02 14:30:41 -07:00
Elliott Hughes
92e6de6f94
am b95ad82f: am 95a2a7f3: Merge "Fix MIPS build."
...
* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
Fix MIPS build.
2012-10-02 11:33:03 -07:00
Elliott Hughes
80a2983272
am 90172541: am b98204a9: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '90172541866696a5a46fae7ff7e186126ee37318':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:25:12 -07:00
The Android Open Source Project
4cf143f1c8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2c724a28984aa03b2887b3db58bd59699b428e85
2012-10-02 09:16:33 -07:00
Elliott Hughes
15edd80a69
am 39d7c607: am 75f43525: Merge "Always take GCC\'s definition of NULL."
...
* commit '39d7c6072dc4d587c32405f3c7de12e60559cfc8':
Always take GCC's definition of NULL.
2012-10-01 18:21:35 -07:00
Elliott Hughes
baa7ee0370
am bb7dfcd3: am d3bf954e: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'bb7dfcd3b8744fdf37857375ffe279d2b87a8b22':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:52:56 -07:00
Elliott Hughes
a54d08a7c1
am a428bc12: am fe712e6c: Merge "Upgrade seed48 too."
...
* commit 'a428bc1288e28a05b036597db4f0409fa7f3923d':
Upgrade seed48 too.
2012-10-01 14:47:52 -07:00
Elliott Hughes
6ed5bc12da
am b650111a: am cd195eba: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit 'b650111a11b84d7c91145c4f29b58b5742afa572':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:15:36 -07:00
Elliott Hughes
068f33981d
am 0fa6279f: am 5b6346f6: Merge "bionic: linker: Need update the map->l_addr for execution."
...
* commit '0fa6279f394bb5a5cfeb7996d28b8fd2365477e7':
bionic: linker: Need update the map->l_addr for execution.
2012-10-01 09:23:11 -07:00
The Android Automerger
f27642c082
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:14 -07:00
Jean-Baptiste Queru
adc32bc3b1
Merge from jb-mr1-aah-dev
...
Change-Id: Iea13ecd8b6edd42b3dc9c59755d51c1bb36afe4a
2012-09-28 17:06:59 -07:00
Saurabh Shah
c556da9ed7
am 204b26b4: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:00:03 -07:00
Saurabh Shah
52b4ccbc49
am 204b26b4: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 14:59:36 -07:00
Jean-Baptiste Queru
de1efebdca
Merge from jb-mr1-aah-dev
...
Change-Id: I56ae94f8efe9eecedc17da2f573e8fde2b80d151
2012-09-28 14:29:56 -07:00
Saurabh Shah
204b26b440
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
This change adds msm_mdp.h header changes to bionic.
This IOCTL is a substitute for PAN on external panel. It waits for DMAE to
finish before returning and avoid delays in the PAN path.
Bug: 7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org >
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-09-28 13:46:13 -07:00
Elliott Hughes
8e1a87b547
am bb892a1b: am d03bfe68: Merge "Define ssize_t if necessary."
...
* commit 'bb892a1b63a2e88c98a2ba31aa659b7efac44e4f':
Define ssize_t if necessary.
2012-09-28 10:28:30 -07:00
Elliott Hughes
fb1e192e12
am 72b08af3: am f9163dd1: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit '72b08af300703a08bf2081304ab81b9e4dba003c':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:55:02 -07:00
Elliott Hughes
209d67d448
am fd6ca57f: am e4030e0b: Merge "Fix several compiler warnings."
...
* commit 'fd6ca57f24cbfd8a8074ee6f1c22dd973f1b172f':
Fix several compiler warnings.
2012-09-26 16:07:02 -07:00
Elliott Hughes
bdc514700d
am 2c29bcf7: am 827a2604: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit '2c29bcf77f0d7dd7fce284ac0c17ff12663413d0':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:19:22 -07:00
Elliott Hughes
0792223a8a
am dd9fbc86: am 8e630dac: Merge "Simple tests for dladdr(3)."
...
* commit 'dd9fbc8646178dc34a92c5fbc0adc8b503cc3cd9':
Simple tests for dladdr(3).
2012-09-26 12:19:34 -07:00
Elliott Hughes
66569e3d53
am a48d5e5f: am 855dde44: Merge "Fix tmpfile(3)."
...
* commit 'a48d5e5f127df0f76b49e046be042f46f211e8bc':
Fix tmpfile(3).
2012-09-26 12:19:33 -07:00
Nick Kralevich
06abf4edbf
am 5989ed5c: am 25937d36: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '5989ed5cb8a1d11c140aa61a718e386c2cc88307':
FORTIFY_SOURCE: add umask check
2012-09-26 11:14:12 -07:00
Elliott Hughes
c323317810
am 00f33977: am 3307bff0: Merge "Revert dl_fbase initialization to the address where the shared object is loaded."
...
* commit '00f339771b7b5bca1abeb375feb3ce9a04f6daa7':
Revert dl_fbase initialization to the address where the shared object is loaded.
2012-09-26 10:45:06 -07:00
The Android Open Source Project
db2b9d052b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I5d92da8a0dae14bcd6a61f1e015f818d25066763
2012-09-26 09:05:40 -07:00
The Android Automerger
9014818f61
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:12 -07:00
Elliott Hughes
354867d702
am 0eb4f255: am 6e0e03c3: Merge "Add the cleaned kernel headers"
...
* commit '0eb4f255d2dc1778b9a5fabb0f65c81ac4dad4a4':
Add the cleaned kernel headers
2012-09-24 13:50:04 -07:00
Elliott Hughes
a06e11cc34
am c746bed8: am 7b0377ed: Merge "[MIPS] Removed the unused header"
...
* commit 'c746bed88931fab8abcc4d01a5c53b95fff1ba8f':
[MIPS] Removed the unused header
2012-09-24 13:40:53 -07:00
Elliott Hughes
28bd96cc0b
am d5c654c0: am 3b6914bf: Merge "Fix dlsym and dladdr to use load_bias instead of base"
...
* commit 'd5c654c053bb100cb2d4a71260a507e20eb30e79':
Fix dlsym and dladdr to use load_bias instead of base
2012-09-24 13:40:42 -07:00
Elliott Hughes
a9a1d8a5d2
am f4b34b6c: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:43 -07:00
Elliott Hughes
f153ed380d
am f4b34b6c: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:37 -07:00
Elliott Hughes
f4b34b6c39
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
This reverts commit 3a936a4980
2012-09-24 10:13:12 -07:00
The Android Open Source Project
51d270af6d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I933866be4d956f18dff51676c8027f807cea26d7
2012-09-24 10:11:18 -07:00
Elliott Hughes
82ec685054
am 6c0e373d: am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '6c0e373d38a9cb424bd6d9c4d5d6168960846aa5':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:47:01 -07:00
Elliott Hughes
6da07f02bd
am ecf67e15: am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit 'ecf67e152aecb67bff950d72582ef54b56191096':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:46:47 -07:00
Elliott Hughes
0349e3d3ff
am d2eea0e6: am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'd2eea0e6d6d4e7c406b06d90316713482d650290':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 09:46:46 -07:00
Elliott Hughes
6c0e373d38
am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -07:00
Naseer Ahmed
21e0a7ee8b
am f7070074: bionic: Update MDP header for sync
...
* commit 'f707007435ee4798815bd507d86b1460204cfc4f':
bionic: Update MDP header for sync
2012-09-24 09:26:33 -07:00
Elliott Hughes
ecf67e152a
am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6
am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:52:14 -07:00
The Android Automerger
cc95d69c25
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:22 -07:00
The Android Automerger
e0a00a8a2c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 06:59:14 -07:00
Naseer Ahmed
f707007435
bionic: Update MDP header for sync
...
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -07:00
Rebecca Schultz Zavin
27cfd6afd4
am a9dca773: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit 'a9dca77315b85f61e7386ca8dc931f79f6396531':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 14:00:15 -07:00
The Android Open Source Project
0a6cbb97a8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I487c32c629ef85a9aea22fb7564fd868618f56c3
2012-09-20 10:34:47 -07:00
Rebecca Schultz Zavin
a9dca77315
Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com >
2012-09-20 09:47:37 -07:00
The Android Automerger
8ab03a28d0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:27 -07:00
Iliyan Malchev
e55218223b
am 4430aa6a: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit '4430aa6aaaa8e93bb7fbca761bf18540a7d95ca0':
Update headers for Adreno graphics driver
2012-09-18 20:30:06 -07:00
Iliyan Malchev
4430aa6aaa
Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
2012-09-18 20:27:34 -07:00
Jeff Boody
02e06782fc
Update headers for Adreno graphics driver
...
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-09-18 19:52:01 -07:00
Elliott Hughes
ae0bccf7d3
am 0ef00090: am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit '0ef00090444883508b6405726150fe7e12ca5476':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:26:14 -07:00
Elliott Hughes
0ef0009044
am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit '30289f0dd6ab644290bfb37b22b03b7d006628f4':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:18:39 -07:00
The Android Automerger
4513ad77ef
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 06:59:21 -07:00
Dave Burke
baa09d1e0a
am e5830324: Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
...
* commit 'e58303249b9e799a4fe84c5a2dfe71518441a6ec':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 00:05:21 -07:00
Dave Burke
e58303249b
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
2012-09-17 21:55:24 -07:00
Elliott Hughes
1f1e7b70b7
am 2aceb4bc: am e2a17ef4: am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit '2aceb4bcb30def2207fd8d6e7d30df35f9f91504':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:57:46 -07:00
Elliott Hughes
2aceb4bcb3
am e2a17ef4: am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit 'e2a17ef444e1d3b3e27e649440a320139038d1d9':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:53:22 -07:00
The Android Automerger
dd526b010d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:15 -07:00
Elliott Hughes
469bd6692b
am 4b3ff1f0: am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
...
* commit '4b3ff1f0fa141b95bacf52960be588c343d8e5d6':
Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-14 16:23:07 -07:00
Elliott Hughes
4b3ff1f0fa
am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
...
* commit 'f8902bf7079be1a7ad51b82ebb24556ff40a1fff':
Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-14 16:21:18 -07:00
Elliott Hughes
e409645c99
am b67d4ec5: am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"
...
* commit 'b67d4ec5babf7d26bc0e52b942779012d14e14c8':
Add tty defaults to bionic
2012-09-14 16:06:15 -07:00
Elliott Hughes
b67d4ec5ba
am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"
...
* commit '950a3c010cfbb18bb5974a78040ab9946370e553':
Add tty defaults to bionic
2012-09-14 16:04:30 -07:00
The Android Automerger
9d1defbf47
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:00 -07:00
Elliott Hughes
7e9d6d8abb
am b2af8b68: am 66a97ea9: am 4e9d953a: Merge "libc: add ftw / nftw functions"
...
* commit 'b2af8b6848bfd5dbc6dbc10a8267b0e387780888':
libc: add ftw / nftw functions
2012-09-13 17:13:57 -07:00
Elliott Hughes
c913407490
am 1eaa3e6f: am 77fd7075: am e895e6de: Merge "Update libc/NOTICE and record the incantation."
...
* commit '1eaa3e6f72bd20eeea64bb3f46d965658695dade':
Update libc/NOTICE and record the incantation.
2012-09-13 17:13:56 -07:00
Elliott Hughes
b2af8b6848
am 66a97ea9: am 4e9d953a: Merge "libc: add ftw / nftw functions"
...
* commit '66a97ea9fbc96c8ebf7f9aae8c2512ec3ffbdb80':
libc: add ftw / nftw functions
2012-09-13 17:12:40 -07:00
Elliott Hughes
1eaa3e6f72
am 77fd7075: am e895e6de: Merge "Update libc/NOTICE and record the incantation."
...
* commit '77fd70758ae579aadf153124f7c26494e4a54988':
Update libc/NOTICE and record the incantation.
2012-09-13 17:12:39 -07:00
Kenny Root
c01915fd04
am 2b270a0c: am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205
...
* commit '2b270a0caceaf79a799a55fc29fe43b6f0482ba9':
Print out shared app gids correctly
Add tests for Android-specific stubs
2012-09-13 15:36:06 -07:00
Elliott Hughes
c9829a2b6f
am 155a70b9: am de9db8f7: am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit '155a70b93fcccf8e5dec108fb730e25471eaecba':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:36:05 -07:00
Elliott Hughes
953dbbda49
am c7fda6a9: am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."
...
* commit 'c7fda6a96daeb6d089f3d8f4426b6fc211017289':
Upgrade to tzdata2012f.
2012-09-13 15:36:03 -07:00
Kenny Root
2b270a0cac
am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205
...
* commit 'a4ea1a3d2e12f8b240a70d90ddf1f54af06c286c':
Print out shared app gids correctly
Add tests for Android-specific stubs
2012-09-13 15:33:57 -07:00
Elliott Hughes
155a70b93f
am de9db8f7: am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit 'de9db8f7efb10cdab1c81f1d3164f3b55e5f08e9':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:33:57 -07:00
Elliott Hughes
c7fda6a96d
am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."
...
* commit 'd4623e56fb61b38e2c436f214a1282252908b93b':
Upgrade to tzdata2012f.
2012-09-13 15:33:56 -07:00
Elliott Hughes
3d01901774
am bec648ee: am 8db4b91b: am d2236e2c: Merge "Fix Mac build."
...
* commit 'bec648ee9f47c4120e5a4f82c7f0e6d225cb107f':
Fix Mac build.
2012-09-13 11:14:23 -07:00
Elliott Hughes
bec648ee9f
am 8db4b91b: am d2236e2c: Merge "Fix Mac build."
...
* commit '8db4b91bd2a069b2afb377f7e5190f625c3002cf':
Fix Mac build.
2012-09-13 11:11:54 -07:00
Elliott Hughes
c005a55c74
am 478f8ff3: am b2550dd4: am 4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit '478f8ff3f0bd0b805702eb1f90bd03eef6d19e89':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:54:31 -07:00
Elliott Hughes
00f927f137
am 29861b5d: am 58d15966: am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '29861b5d8edf9506acd2289fb5b993b9a7997a59':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:54:30 -07:00
Elliott Hughes
478f8ff3f0
am b2550dd4: am 4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit 'b2550dd4c85845974bf61d3e4071b2b957fbcf09':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:52:38 -07:00
Elliott Hughes
29861b5d8e
am 58d15966: am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '58d15966c8f95998f82a90a5b24e23d56ba6254f':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:52:37 -07:00
The Android Automerger
f238e06d3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:18 -07:00
Elliott Hughes
cf57515f70
am f801cf55: resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
...
* commit 'f801cf55bebc8d0d397fbe6db8cc91b3afb78149':
Update the kernel headers to match external/kernel-headers.
2012-09-12 16:11:21 -07:00
Elliott Hughes
f801cf55be
resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
...
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
2012-09-12 16:08:14 -07:00
Elliott Hughes
7f59867170
am ccd7ee62: am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit 'ccd7ee624a81d61675fa08e149fe190a317341eb':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:08:30 -07:00
Elliott Hughes
ccd7ee624a
am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:07:12 -07:00
The Android Open Source Project
76a3777a4d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1cd7d82959c5e821c23be974b7eb9d4914593bef
2012-09-12 07:39:34 -07:00
The Android Automerger
5766b0932f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:18 -07:00
Elliott Hughes
68221a76b7
am cc0f2253: am 7f798147: am cc8668f2: Merge "[MIPS] Check error status from pipe system call"
...
* commit 'cc0f225365d7103baaba80517850489a5ff17d89':
[MIPS] Check error status from pipe system call
2012-09-11 16:48:50 -07:00
Elliott Hughes
cc0f225365
am 7f798147: am cc8668f2: Merge "[MIPS] Check error status from pipe system call"
...
* commit '7f798147980798718ac893229ae20dba9e3a26c7':
[MIPS] Check error status from pipe system call
2012-09-11 16:47:25 -07:00
The Android Automerger
49b5eb4ded
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:14 -07:00
Elliott Hughes
eeabbaee88
am f50b99f4: am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'f50b99f471a9af07b2dec6ac3fe1abca5ba9a20b':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:06:50 -07:00
Elliott Hughes
f50b99f471
am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'e8b4d67a37e27ffc34086562ad13dcd9316a8249':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:04:28 -07:00
Ying Wang
33d552a4d1
am e3738414: am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'e3738414a62f9c9b43e158af590d127b9659030d':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:09:13 -07:00
Ying Wang
e3738414a6
am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:07:17 -07:00
The Android Automerger
9209fd3868
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 06:59:39 -07:00
Elliott Hughes
934e18e715
am af4371b4: am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
...
* commit 'af4371b46b71116bd40b6ef1eb32fdfc301a38e9':
Add more pthreads tests.
2012-09-07 20:36:20 -07:00
Elliott Hughes
af4371b46b
am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
...
* commit '56ba6336d9c07cdfb5af2324aaa52da0c8d00ef2':
Add more pthreads tests.
2012-09-07 20:35:01 -07:00
Elliott Hughes
5804b88a44
am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit 'b010245490f50601b13ee17238e31162b6143d71':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:11:35 -07:00
Elliott Hughes
ffcb92e779
am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
...
* commit 'b18d4f6361c4ae011c7661da46ad0501eecba591':
Add mlockall and munlockall for Google TV.
2012-09-07 11:11:34 -07:00
Elliott Hughes
b010245490
am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361
am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
...
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Ian Rogers
e9859df7cc
am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
...
* commit '973bf681b74d418704202cbfefef5d3be031b066':
Fix build warning of initialization but no use.
2012-09-06 11:52:24 -07:00
Ian Rogers
973bf681b7
am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
...
* commit '77039d34449e369b9425a36eaed38d41b9d20884':
Fix build warning of initialization but no use.
2012-09-06 11:50:22 -07:00
Elliott Hughes
684669dfd7
am de0dc251: am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
...
* commit 'de0dc251120e03622d89d7af2ce44530d665e065':
Don't corrupt the thread list in static executables.
2012-09-06 10:46:41 -07:00
Elliott Hughes
de0dc25112
am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '41ff8b98044de19d6ea5228452c2d555c4224da7':
Don't corrupt the thread list in static executables.
2012-09-06 10:44:13 -07:00
The Android Open Source Project
c0ee117170
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If42e786ae4ba616676fad3872f3c36f0c0be16f8
2012-09-06 07:52:32 -07:00
The Android Automerger
abce26b05a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:33:25 -07:00
Ajay Dudani
d58928e831
am 183d0a57: Update msm_ion.h ioctls so they dont conflict with ion.h
...
* commit '183d0a57a292a33d92baa099b14425805a94306d':
Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:49:44 -07:00
Ajay Dudani
183d0a57a2
Update msm_ion.h ioctls so they dont conflict with ion.h
...
Change-Id: Ib6ffcc147e39b3f9f2eb9a8ed403b74d99bc755f
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-09-05 21:47:32 -07:00
Ajay Dudani
bf3da78e69
am 85811fc7: Revert "msm_ion: switch to using legacy_ion.h"
...
* commit '85811fc7c244c977186cff501063d5f67fb5352b':
Revert "msm_ion: switch to using legacy_ion.h"
2012-09-05 21:45:39 -07:00
Ajay Dudani
7649d62255
am dc81b447: Revert "add legacy_ion.h"
...
* commit 'dc81b44759b30a7fe0951d35f658700afd806bea':
Revert "add legacy_ion.h"
2012-09-05 21:44:13 -07:00
Ajay Dudani
85811fc7c2
Revert "msm_ion: switch to using legacy_ion.h"
...
This reverts commit 66edcd9dad
2012-09-05 21:43:15 -07:00
Ajay Dudani
dc81b44759
Revert "add legacy_ion.h"
...
This reverts commit 5f1d206de3
2012-09-05 21:42:10 -07:00
Elliott Hughes
8140487f60
am 2da90705: am 008f4df5: am ff4608ae: Merge "Add missing dependencies."
...
* commit '2da907059e187ffdcc25b15af91f912eecdcf776':
Add missing dependencies.
2012-09-05 14:57:27 -07:00
Elliott Hughes
2da907059e
am 008f4df5: am ff4608ae: Merge "Add missing dependencies."
...
* commit '008f4df5ba52ff502651da957ad8dbe149ff2ed6':
Add missing dependencies.
2012-09-05 14:55:45 -07:00
Elliott Hughes
d5b14e3552
am faf361a6: am 2fc3e1ef: am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'faf361a6ac23af030268728f6eb02a3d1080a5ff':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:34:23 -07:00
Elliott Hughes
faf361a6ac
am 2fc3e1ef: am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit '2fc3e1efda003d9eb110c3fc08bb32f29c6e8a4b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:32:25 -07:00
Elliott Hughes
340ff83f98
am ac3e35cd: am a76f2eca: am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'ac3e35cd8f1ba8133905ee3700e092efef98ab12':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:03:37 -07:00
Elliott Hughes
ac3e35cd8f
am a76f2eca: am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'a76f2ecaa203bd8b5cc2ca157f06c0d2de66a52f':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:01:48 -07:00
Ian Rogers
64f4e71418
am f71d757f: am 7310a1c4: am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit 'f71d757f6eea0394654b5c07a580bf3b4d048853':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:54:35 -07:00
Ian Rogers
f71d757f6e
am 7310a1c4: am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '7310a1c4326bc875aeea2ce091a4b6558d183b2d':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:52:12 -07:00
The Android Automerger
3a8807df34
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:22 -07:00
Elliott Hughes
9deb460a26
am ab558163: am b9f0a6eb: am be19a367: Merge "termios: add tcdrain"
...
* commit 'ab558163a3f79834d4aa3107f4fed20bb242860b':
termios: add tcdrain
2012-09-04 18:15:48 -07:00
Elliott Hughes
ab558163a3
am b9f0a6eb: am be19a367: Merge "termios: add tcdrain"
...
* commit 'b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8':
termios: add tcdrain
2012-09-04 18:13:50 -07:00
Elliott Hughes
fe7ac11afa
am f34c6d77: am bc374078: am 5ff23471: Merge "Add getsid system call to bionic"
...
* commit 'f34c6d7796102cf33bd8887efd0ba3f70884acd9':
Add getsid system call to bionic
2012-09-04 16:49:27 -07:00
Elliott Hughes
f34c6d7796
am bc374078: am 5ff23471: Merge "Add getsid system call to bionic"
...
* commit 'bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
Add getsid system call to bionic
2012-09-04 16:47:44 -07:00
Elliott Hughes
ad639c1d2b
am 877ad30f: am 507bcabb: am e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '877ad30fd6e8745b43063947a9220d1f1398ee02':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:03:30 -07:00
Elliott Hughes
877ad30fd6
am 507bcabb: am e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '507bcabb3565d20541242ad61f987bc1a6483ba1':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:00:20 -07:00
Elliott Hughes
1d07eda8db
am c0e3b9dd: am b438c54d: am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"
...
* commit 'c0e3b9ddd6c7dae0a402067c79609ddefcde125b':
bionic: Fix TINY_ANDROID build
2012-09-04 13:51:57 -07:00
Elliott Hughes
c0e3b9ddd6
am b438c54d: am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"
...
* commit 'b438c54d02b722a93a72ff6e834ab78053ca3add':
bionic: Fix TINY_ANDROID build
2012-09-04 13:49:41 -07:00
The Android Automerger
2b49277d84
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:33:17 -07:00
Ian Rogers
5b0e2de6ae
am b9ad1a1e: am 6abab301: am 6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit 'b9ad1a1e001cc06db121994ca0da7deb4c60914a':
Upgrade to dlmalloc 2.8.6.
2012-08-31 09:01:07 -07:00
Ian Rogers
b9ad1a1e00
am 6abab301: am 6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '6abab301db84af7c98a4873fbf49997078aa19cc':
Upgrade to dlmalloc 2.8.6.
2012-08-31 08:58:33 -07:00
The Android Automerger
83d5e567d6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:33:17 -07:00
Elliott Hughes
418ecb7ec8
am 8c368b5d: am dde94f4c: am 8b4e8a93: Merge "Improve the dynamic linker diagnostics."
...
* commit '8c368b5d1d43bf5d9fdf1f6e99190437da882f95':
Improve the dynamic linker diagnostics.
2012-08-29 14:09:36 -07:00
Nick Kralevich
29e526527c
am fe7d7d46: am 92133ca4: am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
...
* commit 'fe7d7d4693463945155b8548f9c33db5b3c90377':
disable _FORTIFY_SOURCE under clang
2012-08-29 14:09:32 -07:00
Elliott Hughes
8c368b5d1d
am dde94f4c: am 8b4e8a93: Merge "Improve the dynamic linker diagnostics."
...
* commit 'dde94f4c1664c6908d9a2944aff84e8667557d02':
Improve the dynamic linker diagnostics.
2012-08-29 14:06:58 -07:00
Nick Kralevich
fe7d7d4693
am 92133ca4: am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
...
* commit '92133ca427b9c697d5afb59b74cb2cff50840c8e':
disable _FORTIFY_SOURCE under clang
2012-08-29 14:06:57 -07:00
Elliott Hughes
b37328627b
am 8900e2de: am e5b85f45: am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit '8900e2de450726982de466bfc3639dd71630178c':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:22:18 -07:00
Elliott Hughes
8900e2de45
am e5b85f45: am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit 'e5b85f45f9b23b4adbea5a9bb0bc29099880ed69':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:19:58 -07:00
Ian Rogers
71258e0d20
am 15afed42: Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
...
* commit '15afed42ca0b9e5954b121d1a6ca1bdb6b5dc55c':
Revert "Revert "Restore posix_memalign""
2012-08-29 08:55:24 -07:00
Ian Rogers
1df8fe33d5
am f71fa083: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
...
* commit 'f71fa0830a1d1280174f25309b05612af4f20fb3':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
2012-08-29 08:55:23 -07:00
Ian Rogers
15afed42ca
Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
2012-08-29 08:53:41 -07:00
Ian Rogers
f71fa0830a
Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
2012-08-29 08:53:26 -07:00
The Android Automerger
b2d46d3632
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:33:16 -07:00
Iliyan Malchev
7e5851922c
am 66edcd9d: msm_ion: switch to using legacy_ion.h
...
* commit '66edcd9dad6a10622015f6350ea9bc11a358801a':
msm_ion: switch to using legacy_ion.h
2012-08-29 01:37:21 -07:00
Iliyan Malchev
ba13ae7672
am 5f1d206d: add legacy_ion.h
...
* commit '5f1d206de357684365a98c53b505491e18b6694a':
add legacy_ion.h
2012-08-29 01:37:20 -07:00
Iliyan Malchev
66edcd9dad
msm_ion: switch to using legacy_ion.h
...
Change-Id: I0fa64cb9684062f371bd21a1f94f6c7dad8d854d
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-29 01:31:34 -07:00
Iliyan Malchev
5f1d206de3
add legacy_ion.h
...
legacy_ion.h is a pre android-3.4 copy of the ion.h header, for backwards
compatibility
Change-Id: Iaf2f1659f19a3b55334df929d9500069bf8acbdd
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-29 01:24:49 -07:00
Ian Rogers
e0d680176f
Revert "Revert "Restore posix_memalign""
...
This reverts commit 78a3069f82
2012-08-28 16:36:08 -07:00
Ian Rogers
2c344d3631
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
...
This reverts commit f72ee26927
2012-08-28 15:53:10 -07:00
Nick Kralevich
2868bbabf3
am 4f90a093: am d3d09f7d: am 069c64cd: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit '4f90a0932c087e4bb13dab2d30a424c04c1f9f80':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:43:57 -07:00
Nick Kralevich
4f90a0932c
am d3d09f7d: am 069c64cd: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit 'd3d09f7d75726dbe7cd9dfae211427f8bebe1397':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:41:10 -07:00
Nick Kralevich
036fa6e669
am 54662dd4: am 1389db8b: am e026b1d8: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '54662dd4de8151383be4b518f4161f171359186f':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:06:48 -07:00
Nick Kralevich
773a783295
am d7440f37: am 7cab2188: am ad180738: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit 'd7440f3725b196f6624f74d2cee50dbdac647372':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:06:47 -07:00
Nick Kralevich
54662dd4de
am 1389db8b: am e026b1d8: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '1389db8b94ca0cff4744dc070d99f48c6cf53b07':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:04:47 -07:00
Nick Kralevich
d7440f3725
am 7cab2188: am ad180738: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit '7cab21885ac039375264a45b2c774106415be664':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:04:46 -07:00
The Android Automerger
6fa20f8296
Revert "Update ion header"
...
This reverts commit eb75db7d83
2012-08-28 11:49:35 -07:00
Nick Kralevich
8816088095
am 3ffdef19: am c7d9c400: am c410a961: Merge "libc: remove ctors/dtors sections"
...
* commit '3ffdef19b4e9c8bae4fb0591afc0074eab0e5ac6':
libc: remove ctors/dtors sections
2012-08-28 10:40:58 -07:00
Nick Kralevich
3ffdef19b4
am c7d9c400: am c410a961: Merge "libc: remove ctors/dtors sections"
...
* commit 'c7d9c400126f1d1159025d1005248ab556dbdb7e':
libc: remove ctors/dtors sections
2012-08-28 10:38:28 -07:00
The Android Automerger
4be256b50b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:33:16 -07:00
Nick Kralevich
5443561d5d
am 48c88804: am 775dabd4: am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"
...
* commit '48c88804293c8ebebe8c6035b0e077f4d55fe625':
Allow linker to compile with -DLINKER_DEBUG=1
2012-08-27 16:09:49 -07:00
Nick Kralevich
48c8880429
am 775dabd4: am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"
...
* commit '775dabd4d7f1c08d4229a3578d15990e86dd9c92':
Allow linker to compile with -DLINKER_DEBUG=1
2012-08-27 16:08:12 -07:00
Elliott Hughes
ea108d8a66
am 8c7f4777: am d2d8031d: am bc366292: Merge "Added missing cache failed notification"
...
* commit '8c7f4777ec2127a95f7f0aea3bf32fe9309a6ada':
Added missing cache failed notification
2012-08-27 15:25:02 -07:00
Elliott Hughes
8c7f4777ec
am d2d8031d: am bc366292: Merge "Added missing cache failed notification"
...
* commit 'd2d8031df16c78b4d5bdbe481ebe6856caa69fd1':
Added missing cache failed notification
2012-08-27 15:22:35 -07:00
Iliyan Malchev
c9008991f3
am 3ad36e52: bionic: update sanitized MSM, V4L2 kernel headers
...
* commit '3ad36e525f1e0c5c35c9e854e542acff48e515a8':
bionic: update sanitized MSM, V4L2 kernel headers
2012-08-27 15:13:48 -07:00
The Android Automerger
19c0b800a3
:Revert "Update ion header"
...
This reverts commit eb75db7d83
2012-08-27 12:46:37 -07:00
Iliyan Malchev
3ad36e525f
bionic: update sanitized MSM, V4L2 kernel headers
...
Change-Id: I4ca8835ff7a1d21f80a139b1d76ceacf82b48502
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-27 12:11:41 -07:00
The Android Automerger
eeddc30e7e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-27 06:33:20 -07:00
The Android Open Source Project
75f3d25cef
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I81e9084dd1f51185ecced85fecd1439a72f8c82c
2012-08-25 07:15:24 -07:00
Ian Rogers
1f84a4e426
am a190cbb8: am 05fddb41: am a37ce7fa: Merge "Add missing va_end() to prevent stack corruptions"
...
* commit 'a190cbb825c690e9e2423e022cabb844a0cd8a5a':
Add missing va_end() to prevent stack corruptions
2012-08-24 15:25:44 -07:00
Ian Rogers
a190cbb825
am 05fddb41: am a37ce7fa: Merge "Add missing va_end() to prevent stack corruptions"
...
* commit '05fddb41d00710a31181693cebed570d711acd37':
Add missing va_end() to prevent stack corruptions
2012-08-24 15:23:11 -07:00
Rebecca Schultz Zavin
fa5942cc08
am cbd76d15: Merge "Update ion header" into jb-mr1-dev
...
* commit 'cbd76d15aff86ed63747d2a3b41a999e0cf9302f':
Update ion header
2012-08-23 16:33:19 -07:00
Rebecca Schultz Zavin
cbd76d15af
Merge "Update ion header" into jb-mr1-dev
2012-08-23 16:31:45 -07:00
Rebecca Schultz Zavin
eb75db7d83
Update ion header
...
Change-Id: Ib06a2c63070c9f507c14a43a0a0ac4d362f68d22
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com >
2012-08-23 16:29:23 -07:00
Nick Kralevich
dd5d865d92
am 81af404b: am e8198b97: am 26facba2: Merge "hardening: remove pointless ARM __get_pc() function"
...
* commit '81af404b634dc75581ab2dedf0c3d68b8666aee4':
hardening: remove pointless ARM __get_pc() function
2012-08-23 12:35:53 -07:00
Nick Kralevich
81af404b63
am e8198b97: am 26facba2: Merge "hardening: remove pointless ARM __get_pc() function"
...
* commit 'e8198b97c369292a3ea97e5a2009bfba8229ddb5':
hardening: remove pointless ARM __get_pc() function
2012-08-23 12:34:21 -07:00
The Android Automerger
21120f6d7b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-23 06:33:25 -07:00
The Android Open Source Project
b1d4387222
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3a81059b919617b639d4b39c40235301db4dd86a
2012-08-22 15:34:31 -07:00
Brian Carlstrom
561bf16be5
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 999089181e
2012-08-22 14:56:19 -07:00
Brian Carlstrom
453294d1da
Revert "Restore posix_memalign"
...
This reverts commit bfc1d97531
2012-08-22 14:56:13 -07:00
Brian Carlstrom
4a56211b0b
am f72ee269: Revert "Upgrade to dlmalloc 2.8.5."
...
* commit 'f72ee269274170cd46af2844a2fe88767fb6e43c':
Revert "Upgrade to dlmalloc 2.8.5."
2012-08-22 13:55:11 -07:00
Brian Carlstrom
7163345437
am 78a3069f: Revert "Restore posix_memalign"
...
* commit '78a3069f827386df6166ccf9366a89be782f1dde':
Revert "Restore posix_memalign"
2012-08-22 13:55:10 -07:00
Brian Carlstrom
f72ee26927
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 999089181e
2012-08-22 12:07:33 -07:00
Brian Carlstrom
78a3069f82
Revert "Restore posix_memalign"
...
This reverts commit bfc1d97531
2012-08-22 12:07:26 -07:00
Jean-Baptiste Queru
2400c7a60e
am e49df020: am 170ad354: am c7de0225: Merge "Use unambiguous mnemonics"
...
* commit 'e49df0203c112bf44b166cde733554072b115ec5':
Use unambiguous mnemonics
2012-08-22 07:33:51 -07:00
Jean-Baptiste Queru
e49df0203c
am 170ad354: am c7de0225: Merge "Use unambiguous mnemonics"
...
* commit '170ad35419620b428c15a8945416ce8cedef3e81':
Use unambiguous mnemonics
2012-08-22 07:32:21 -07:00
The Android Automerger
6773054eb3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:33:14 -07:00
Erik Gilling
fed121126a
am 974e16cd: update linux/sync.h
...
* commit '974e16cd829b6f75a5861759e86c1c09768272f2':
update linux/sync.h
2012-08-21 19:11:07 -07:00
Erik Gilling
974e16cd82
update linux/sync.h
...
Change-Id: Ic2133976b675cdcd3ca88f4845180a7ff1c79e34
Signed-off-by: Erik Gilling <konkers@android.com >
2012-08-21 18:17:24 -07:00
The Android Open Source Project
a5b7d6dd00
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I559e0ba590f5beee87871ecfbdfc185566d40f9f
2012-08-21 16:04:39 -07:00
The Android Automerger
5d8cfb3e66
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:32 -07:00
Andrew Hsieh
5e2aa357d2
am f861705f: am 5cd1efb2: am 1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit 'f861705f8c64af968b542c23932994cd17bb5db9':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:33:02 -07:00
Andrew Hsieh
f861705f8c
am 5cd1efb2: am 1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '5cd1efb2ba68cdde13682ee37a3499b7bd974bdb':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:31:02 -07:00
Ian Rogers
7c6cc4dffd
am 4ac3b0a1: am 8af726b2: am 7b0d9b79: Merge "Restore posix_memalign"
...
* commit '4ac3b0a1487cc97e86bd98959e23bf2303942945':
Restore posix_memalign
2012-08-20 19:46:25 -07:00
Ian Rogers
4ac3b0a148
am 8af726b2: am 7b0d9b79: Merge "Restore posix_memalign"
...
* commit '8af726b24fbb9ab545719bd3980a4f0ad9bcb8a8':
Restore posix_memalign
2012-08-20 19:45:12 -07:00
Brian Carlstrom
638b0fd953
am cc1f4acb: Restore posix_memalign
...
* commit 'cc1f4acbda8f12c2020c2e5f1f8a03221c9ae4e9':
Restore posix_memalign
2012-08-20 18:36:44 -07:00
Brian Carlstrom
cc1f4acbda
Restore posix_memalign
...
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
2012-08-20 18:28:20 -07:00
Brian Carlstrom
94c82633c7
am 76f60e2e: am fe87596a: am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit '76f60e2ebd8750c4e4594158745e752b6a10ea0b':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:34:22 -07:00
Brian Carlstrom
76f60e2ebd
am fe87596a: am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit 'fe87596a5ba5a5b0773b2854f9fce85f49367611':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:31:29 -07:00
The Android Automerger
f706b3dfcf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:33:38 -07:00
Elliott Hughes
98f26893a6
am dd0e991c: am 2651d6c6: am 9417a80e: Merge "Always define the 64-bit int types."
...
* commit 'dd0e991c6a0d4d71f1698fd57608a7d42401b6da':
Always define the 64-bit int types.
2012-08-17 17:00:03 -07:00
Elliott Hughes
dd0e991c6a
am 2651d6c6: am 9417a80e: Merge "Always define the 64-bit int types."
...
* commit '2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
Always define the 64-bit int types.
2012-08-17 16:58:10 -07:00
Elliott Hughes
ea5dea8edb
am db2903fa: am cbeccc84: am 200de748: Merge "Fix race condition in pthread_create()"
...
* commit 'db2903fac3d4548de1fd0fda1d3b7460c723282e':
Fix race condition in pthread_create()
2012-08-17 16:28:00 -07:00
Elliott Hughes
db2903fac3
am cbeccc84: am 200de748: Merge "Fix race condition in pthread_create()"
...
* commit 'cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
2012-08-17 16:26:37 -07:00
Elliott Hughes
d060b824dd
am efd39834: am e5242bfd: am 1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'efd3983446c6574c9662b01f441776cf299c0c80':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:03:53 -07:00
Elliott Hughes
efd3983446
am e5242bfd: am 1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:01:53 -07:00
Joe Onorato
947f2e610a
am 28ae6f5d: am cefb93b6: am 6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit '28ae6f5dfd024dd3f860b134ebed56a0248a1097':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:14:21 -07:00
Joe Onorato
28ae6f5dfd
am cefb93b6: am 6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit 'cefb93b632fc5a65bf7620095155cc1c314e29f2':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:11:56 -07:00
The Android Open Source Project
89a4090eca
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I56a0568d05e01d6ca908c97af3036ffe5a057df0
2012-08-16 19:09:40 -07:00
Elliott Hughes
1291162410
am a7d8f3d5: am c80ca54f: am 60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'a7d8f3d50e6b0858b3b6494d772167286cdeb986':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:07:18 -07:00
Elliott Hughes
a7d8f3d50e
am c80ca54f: am 60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:05:40 -07:00
Elliott Hughes
ca82e1f3d1
am 820ad428: am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '820ad4283d71c4f2303f80d8ccbe6c90a6ec5407':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:27:28 -07:00
Elliott Hughes
820ad4283d
am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:23:56 -07:00
Scott Anderson
cc8165aea5
am 09d9dd3a: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit '09d9dd3acdf74630eb7eb6896007e803085f45c6':
Add clean kernel header for uhid.
2012-08-16 12:05:44 -07:00
Scott Anderson
09d9dd3acd
Merge "Add clean kernel header for uhid." into jb-mr1-dev
2012-08-16 12:03:25 -07:00
Scott Anderson
52bf2d5659
Add clean kernel header for uhid.
...
The original kernel header was submitted in this change:
commit 45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com >
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com >
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com >
2012-08-16 11:56:11 -07:00
The Android Automerger
e20afb140c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:16 -07:00
Elliott Hughes
949d6faa96
am a626bbdb: am 4af9141c: am ae728099: Merge "enable clone system call for x86"
...
* commit 'a626bbdb361539d6667932027ea9ffa26ef1faf4':
enable clone system call for x86
2012-08-15 17:25:35 -07:00
Elliott Hughes
a626bbdb36
am 4af9141c: am ae728099: Merge "enable clone system call for x86"
...
* commit '4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
2012-08-15 17:24:21 -07:00
Elliott Hughes
31041a0138
am 29af938c: am ab8850f7: am 07cd1125: Merge "Fix comment typos."
...
* commit '29af938cbd9b898c92f44c022dc7f5d3ab9782a7':
Fix comment typos.
2012-08-15 17:09:39 -07:00
Elliott Hughes
cdbd3406f5
am 4d63f33c: am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '4d63f33cdc74c340c13b96143833f669835764f2':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:09:38 -07:00
Elliott Hughes
29af938cbd
am ab8850f7: am 07cd1125: Merge "Fix comment typos."
...
* commit 'ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
Fix comment typos.
2012-08-15 17:08:01 -07:00
Elliott Hughes
4d63f33cdc
am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit '76aad1d2746f62aaaacdf717b4f51fa45560521d':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:07:59 -07:00
Elliott Hughes
f53c75e513
am 2e3756b4: am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."
...
* commit '2e3756b4d36c9b7f6a892b87757d41b3201b9773':
Switch to the current NetBSD regex implementation.
2012-08-15 16:01:22 -07:00
Elliott Hughes
2e3756b4d3
am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."
...
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
The Android Open Source Project
e24cde4406
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2f6d32a6bc10f17d85930b21c2ac55c91d5e252e
2012-08-15 08:26:11 -07:00
The Android Automerger
46bb2a222e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:33:26 -07:00
Elliott Hughes
ff45d5cdbf
am 82259117: am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
...
* commit '82259117753adffdab3ce74efb12d30a5289ad2b':
Sort NOTICE entries.
2012-08-14 15:46:26 -07:00
Elliott Hughes
8225911775
am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
...
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
2012-08-14 15:43:57 -07:00
Iliyan Malchev
912dd71259
am df88d88f: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit 'df88d88f56f37cdf75ab03c6b68a42010d9ac6c7':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:41:38 -07:00
Iliyan Malchev
df88d88f56
Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* changes:
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:40:21 -07:00
Elliott Hughes
0a3f66e9a0
am fdbecf3b: am 63696738: am b6a97196: Merge "More cleanup."
...
* commit 'fdbecf3b5a16f8e35e1ad67ec9c807eb66e2ac3b':
More cleanup.
2012-08-14 15:13:10 -07:00
Elliott Hughes
fdbecf3b5a
am 63696738: am b6a97196: Merge "More cleanup."
...
* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
More cleanup.
2012-08-14 15:10:51 -07:00
Naseer Ahmed
056b4bc499
update msm_mdp.h header to support vsync
...
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
2012-08-14 12:51:42 -07:00
Ajay Dudani
77b25702ba
update processed msm_camera.h and msm_isp.h
...
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
2012-08-14 12:51:42 -07:00
Elliott Hughes
7bb37492cc
am 89a35435: am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '89a3543568ffedb54473f961f36f17d211d9c7e1':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:31:15 -07:00
Elliott Hughes
89a3543568
am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:29:01 -07:00
Elliott Hughes
028ed539dd
am dc320d99: am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit 'dc320d99f1e09c0e42fc86f3cb28c15b77d7701b':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:17:27 -07:00
Elliott Hughes
bfcd552500
am b6d6ec53: am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'b6d6ec5326a016e60d2bd82edf857aaec6d5ce95':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:17:26 -07:00
Elliott Hughes
dc320d99f1
am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit '82b69fcbb3cc94bcde82c72d5c66fb3b504cdb6e':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:14:13 -07:00
Elliott Hughes
b6d6ec5326
am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -07:00
Jeff Sharkey
21f7ef9eb2
am d8450043: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit 'd8450043b060358e1235a1f052d63aa4527b2400':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:06:36 -07:00
Jeff Sharkey
d8450043b0
Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
2012-08-14 12:05:46 -07:00
Jeff Sharkey
82393decdf
Update MS_ mount flags, define unshare() syscall.
...
Bug: 6925012
Change-Id: I4ad79b4bccb7737d4dc704476cdb5795d124f53e
2012-08-14 11:45:12 -07:00
The Android Automerger
59b222ac75
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:06:10 -07:00
Elliott Hughes
2bc1cadeff
am 93a9d534: am d544bdfa: am 54655eaf: Merge "Fix nice..."
...
* commit '93a9d53485677fb5b897a127b27e6bdbc40911c7':
Fix nice...
2012-08-13 17:15:40 -07:00
Elliott Hughes
93a9d53485
am d544bdfa: am 54655eaf: Merge "Fix nice..."
...
* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
Fix nice...
2012-08-13 17:14:40 -07:00
Elliott Hughes
aa29740ce2
am 69fc1522: am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."
...
* commit '69fc1522a30df39fcf115f09f7665b590677ba27':
Clean up warnings in stubs.cpp.
2012-08-13 16:27:05 -07:00
Elliott Hughes
69fc1522a3
am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
Clean up warnings in stubs.cpp.
2012-08-13 16:24:38 -07:00
Elliott Hughes
c37b31d848
am eab7bddd: am ca09412a: am 222eec2e: Merge "Handle naming for system uids running as secondary users"
...
* commit 'eab7bddd9eb585ce3992314c9e411b909c05e87b':
Handle naming for system uids running as secondary users
2012-08-13 16:07:46 -07:00
Elliott Hughes
c64c1b49fd
am ad8ff472: am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."
...
* commit 'ad8ff472b6d80561629db4826452fddf3007bdce':
Add dependencies on all the makefiles.
2012-08-13 16:07:45 -07:00
Elliott Hughes
141a3b109c
am cfd0345f: am 35dcf19b: am 66fba009: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit 'cfd0345fe056cf945f5b6f61d4316536781697b4':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:07:44 -07:00
Elliott Hughes
eab7bddd9e
am ca09412a: am 222eec2e: Merge "Handle naming for system uids running as secondary users"
...
* commit 'ca09412a1f13c6e2df72c1efccdad1d9960ba99b':
Handle naming for system uids running as secondary users
2012-08-13 16:03:27 -07:00
Elliott Hughes
ad8ff472b6
am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."
...
* commit 'c1eb76198ec81802f69b52a8c6fbf97765d46f53':
Add dependencies on all the makefiles.
2012-08-13 16:03:26 -07:00
Elliott Hughes
cfd0345fe0
am 35dcf19b: am 66fba009: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '35dcf19b2bcf388cda7f4c9baacb159c15c9b03f':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:03:16 -07:00
Amith Yamasani
c6c26a08c8
am ca7ee8a9: Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
...
* commit 'ca7ee8a9e50d99f3d014a523460191b1e67e9c9f':
Handle naming for system uids running as secondary users
2012-08-13 13:52:07 -07:00
Amith Yamasani
ca7ee8a9e5
Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
2012-08-13 13:49:51 -07:00
Amith Yamasani
c60a0027b1
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
Change-Id: Iebe6e5702fc1ed83aa67769a12f693c1be7968ed
2012-08-13 13:35:31 -07:00
Elliott Hughes
94d7f701d1
am 71c0366f: am e135d7f3: am a61ac525: Merge "Fix module constructor order."
...
* commit '71c0366fc7f5436c6cffc2f43637f487dd734444':
Fix module constructor order.
2012-08-13 11:13:18 -07:00
Elliott Hughes
71c0366fc7
am e135d7f3: am a61ac525: Merge "Fix module constructor order."
...
* commit 'e135d7f305c00272ce1544b8243f999bb99979ec':
Fix module constructor order.
2012-08-13 11:11:58 -07:00
Nick Kralevich
34e5212961
am 19b10419: am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '19b104193067a42806dd291a20af29ebbd1c37f0':
linker: don't perform unnecessary mprotects
2012-08-13 09:50:30 -07:00
Nick Kralevich
19b1041930
am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '89fd9eccdca0eb5aed296bd7a2003424defe970c':
linker: don't perform unnecessary mprotects
2012-08-13 09:48:17 -07:00
The Android Automerger
df0cf64781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:09:08 -07:00
Elliott Hughes
7261264c3a
am 2a22a69e: am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"
...
* commit '2a22a69e942cde007a1253e82be44548cfc018f8':
MIPS support to the libc Makefile
2012-08-11 15:18:04 -07:00
Ben Cheng
daedcfc595
am 9eeaa4bd: am 7e3918eb: am 0bf5cf87: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit '9eeaa4bd17b7131e20ad2e36f1372605e80a1332':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:18:03 -07:00
Elliott Hughes
2a22a69e94
am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"
...
* commit '877dc946090749ba7a71f7ae07f51aa32f966083':
MIPS support to the libc Makefile
2012-08-11 15:16:34 -07:00
Ben Cheng
9eeaa4bd17
am 7e3918eb: am 0bf5cf87: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit '7e3918eb62d31224fc5d1cff44d591fecd31e9d0':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:16:33 -07:00
Elliott Hughes
516b26f2bf
am 0837c69a: am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit '0837c69a63439b0c1bf3fbf1b93f3003fc5c9a2d':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:18:59 -07:00
Elliott Hughes
0837c69a63
am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:17:05 -07:00
Nick Kralevich
17f65bf468
am 73d99958: am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"
...
* commit '73d99958bb8bb4cd8f8a7632aeb7e6afaa1e38f1':
crtend*: Add GNU_STACK note
2012-08-10 14:48:44 -07:00
Nick Kralevich
73d99958bb
am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"
...
* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00
Elliott Hughes
623ed02e35
am d71ada63: am 535477ca: am 3ede900b: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit 'd71ada630d5390b7fb6838cb48cb79a1581df1b1':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:14:29 -07:00
Elliott Hughes
d71ada630d
am 535477ca: am 3ede900b: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '535477ca5e29f3c14dff11ac362423156b5971ec':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:12:08 -07:00
Elliott Hughes
be01adce36
am 5adc7fdc: am b54e5f2a: am a1822dce: Merge "Add unshare() syscall."
...
* commit '5adc7fdc2bc8e6e513c3dd9cd0c5cb7617d08d14':
Add unshare() syscall.
2012-08-10 13:08:05 -07:00
Elliott Hughes
5adc7fdc2b
am b54e5f2a: am a1822dce: Merge "Add unshare() syscall."
...
* commit 'b54e5f2a2fd014a5cbf105daea7b2eb8b59dec29':
Add unshare() syscall.
2012-08-10 13:06:35 -07:00
Elliott Hughes
4fc5f6c366
am 5140b785: am f6922be2: am f91e2f72: Merge "Fix typo in SIGTTOU description."
...
* commit '5140b785a04827d34225241f99f17e49aadbf3bb':
Fix typo in SIGTTOU description.
2012-08-10 12:52:23 -07:00
Elliott Hughes
7186a13284
am 55206504: am a618ea30: am 4ec9e343: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '552065048334cc893dadbc926701d08dc6c66fcc':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:52:22 -07:00
Elliott Hughes
731ecf0a31
am 29b8fb3d: am 3e83da43: am 9ad1d6f5: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '29b8fb3d5ea06d05fcd36e298b464dce7dc06803':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:52:20 -07:00
Elliott Hughes
5140b785a0
am f6922be2: am f91e2f72: Merge "Fix typo in SIGTTOU description."
...
* commit 'f6922be2a5e30fc594f48ec435d92b5386648061':
Fix typo in SIGTTOU description.
2012-08-10 12:49:12 -07:00
Elliott Hughes
5520650483
am a618ea30: am 4ec9e343: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit 'a618ea30e1c9d4f06031fb4ecdae31666db92993':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:49:10 -07:00
Elliott Hughes
29b8fb3d5e
am 3e83da43: am 9ad1d6f5: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '3e83da435b3ad7bee739972fca53dbfb692e6438':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:49:08 -07:00
Elliott Hughes
d18b181a25
am b6c1e34d: am dc6d5327: am 0836a7ff: Merge "Auto-generate a complete NOTICE file."
...
* commit 'b6c1e34dca58734c949b6c80d68c74104e1190e0':
Auto-generate a complete NOTICE file.
2012-08-10 12:38:37 -07:00
Elliott Hughes
b6c1e34dca
am dc6d5327: am 0836a7ff: Merge "Auto-generate a complete NOTICE file."
...
* commit 'dc6d5327bb6b030d154675f753d3e4f96dfa5e14':
Auto-generate a complete NOTICE file.
2012-08-10 12:36:22 -07:00
Jeff Sharkey
9a477de2f5
am 6ccc2c8f: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '6ccc2c8f435e42db3d844698f82ab6884798624a':
Add unshare() syscall.
2012-08-10 11:31:20 -07:00
Jeff Sharkey
6ccc2c8f43
Merge "Add unshare() syscall." into jb-mr1-dev
2012-08-10 11:29:53 -07:00
Jeff Sharkey
5467f25f82
Add unshare() syscall.
...
Bug: 6925012
Change-Id: I2530a8f6cea49eb32b60f8f9c4d86963773456ca
2012-08-10 11:17:59 -07:00
The Android Open Source Project
1551f18af0
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0
2012-08-10 08:51:39 -07:00
Elliott Hughes
8e1e66da21
am 31ab6ac0: am 8cc8f7e0: am 709bb0f7: Merge "Remove ThirdPartyProject.prop."
...
* commit '31ab6ac05ebbf29f767a15525f6f7fa2054cc8e3':
Remove ThirdPartyProject.prop.
2012-08-09 14:49:14 -07:00
Elliott Hughes
31ab6ac05e
am 8cc8f7e0: am 709bb0f7: Merge "Remove ThirdPartyProject.prop."
...
* commit '8cc8f7e0d566aaa4c4fbf9d9c8da72b268250617':
Remove ThirdPartyProject.prop.
2012-08-09 14:47:24 -07:00
Elliott Hughes
9550a7c57c
am 3fc21198: am 531d348d: am a17b85d9: Merge "Remove the last .jam file."
...
* commit '3fc211983eb447dd4309c2f8d0e8c33ae685f02f':
Remove the last .jam file.
2012-08-09 12:13:27 -07:00
Elliott Hughes
3fc211983e
am 531d348d: am a17b85d9: Merge "Remove the last .jam file."
...
* commit '531d348d6e37deb751efbefc0613934c5a80de1d':
Remove the last .jam file.
2012-08-09 12:11:08 -07:00
The Android Automerger
536b1daf00
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:41 -07:00
Elliott Hughes
0ac6d23515
am b13ad93f: am 3820229b: am d504eee9: Merge "MIPS support to sys/ headers"
...
* commit 'b13ad93f4a452b1ec7a37e1426f664787b83836f':
MIPS support to sys/ headers
2012-08-08 17:47:30 -07:00
Elliott Hughes
1afca3f698
am 73ac7d94: am d2040cb2: am f655ce7e: Merge "Fix x86 build."
...
* commit '73ac7d94b7cf627524be97da7704206b5ffd4fcf':
Fix x86 build.
2012-08-08 17:47:29 -07:00
Elliott Hughes
b13ad93f4a
am 3820229b: am d504eee9: Merge "MIPS support to sys/ headers"
...
* commit '3820229b46ed3012f19a32cea70b6007ad54b746':
MIPS support to sys/ headers
2012-08-08 17:44:20 -07:00
Elliott Hughes
73ac7d94b7
am d2040cb2: am f655ce7e: Merge "Fix x86 build."
...
* commit 'd2040cb2244bbd253951b5ff808efe67246e5154':
Fix x86 build.
2012-08-08 17:44:14 -07:00
Elliott Hughes
b02f100fa4
am 366c0199: am f3ffb8fa: am 78129204: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit '366c01992a73c40c1b6722bf9d51755c4a7ea83e':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:32:19 -07:00
Elliott Hughes
366c01992a
am f3ffb8fa: am 78129204: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:30:39 -07:00
Elliott Hughes
96fd66018c
am 10e2d222: am d463f6e9: am 34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit '10e2d222ce3db0c310c00cd1a5cffdd2223b5dfe':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:43:55 -07:00
Elliott Hughes
10e2d222ce
am d463f6e9: am 34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit 'd463f6e98011fe3b5a23cef2502705dedd702173':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:43:00 -07:00
Jean-Baptiste Queru
d0a7bc2fd6
am affd1b42: am 9f3a8aaf: am 7e248be7: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit 'affd1b4243f37d32881e190302bd418000465c10':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:10:45 -07:00
Jean-Baptiste Queru
affd1b4243
am 9f3a8aaf: am 7e248be7: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit '9f3a8aaf926bb0439b7e6b7b62efab62f1900d02':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:08:29 -07:00
The Android Open Source Project
d9c2de10d9
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I753a2c0b3bfb42c526b954e58d8874daf31420ed
2012-08-07 11:02:30 -07:00
The Android Automerger
eeb321c54e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:33:32 -07:00
The Android Open Source Project
45193df53a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If9b215d19d88c3f1793013adc8cb81c8c890faa0
2012-08-06 13:34:18 -07:00
The Android Open Source Project
1466b1aad2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I801dd8874ff1b1b61858cac3bf716906825b214d
2012-08-06 13:17:46 -07:00
Shih-wei Liao
f4497e15b7
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 13:17:05 -07:00
Shih-wei Liao
a72246d67e
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 13:16:56 -07:00
Shih-wei Liao
5fec211f60
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
2012-08-06 13:16:48 -07:00
Shih-wei Liao
25ef2bbf01
am 3b4c9db2: am df523880: am e2731d98: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit '3b4c9db2561233fb81ac0c42b3976deb2e648df0':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:10:41 -07:00
Shih-wei Liao
3b4c9db256
am df523880: am e2731d98: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'df523880b59604ef36e212cb7ba30d663eeea179':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:09:35 -07:00
Shih-wei Liao
42bfbd1e61
am 6ff66601: am ce4a5cd5: am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '6ff66601a47d7b74544310e4a5535d572e23d68e':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:20:48 -07:00
Shih-wei Liao
ed33635da7
am cddedade: am 924fd920: am 601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit 'cddedade5b1138d5ddafe5b084923f21bba75526':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:20:47 -07:00
Shih-wei Liao
6ff66601a4
am ce4a5cd5: am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit 'ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:18:21 -07:00
Shih-wei Liao
cddedade5b
am 924fd920: am 601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit '924fd920137135729483d0beacea20d5a0552c15':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:18:20 -07:00
Elliott Hughes
a870ded21a
am eaac1e5a: am 94ce1356: am 7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'eaac1e5a1c62a9dc9edd3a858a367bbb16194272':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:08:05 -07:00
Elliott Hughes
eaac1e5a1c
am 94ce1356: am 7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '94ce135693a73ac09116dabc0f2440604bba5c87':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:06:27 -07:00
The Android Automerger
7bf1c31cac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:27:31 -07:00
Elliott Hughes
8ccbc90a3b
am 4bac8f68: am 7e81ee04: am 1c861728: Merge "Remove yet more SH4 cruft."
...
* commit '4bac8f689efd8f10850e60c52c206b20e4a90fd7':
Remove yet more SH4 cruft.
2012-08-03 15:14:16 -07:00
Elliott Hughes
4bac8f689e
am 7e81ee04: am 1c861728: Merge "Remove yet more SH4 cruft."
...
* commit '7e81ee04532e9c26f90d73061d9a53f09e2c3fa1':
Remove yet more SH4 cruft.
2012-08-03 15:12:39 -07:00
Ajay Dudani
5f0701c9fa
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-08-03 15:02:07 -07:00
Elliott Hughes
9f8c7daf40
am c9dbebe3: am f5385754: am aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'c9dbebe344d2f6a4623a67d1c005bcb6137642c4':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:33:20 -07:00
Elliott Hughes
c9dbebe344
am f5385754: am aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'f5385754e29dcb093cb9445c40b69e45bd71d685':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:29:45 -07:00
Elliott Hughes
58234e788b
am 48955d24: am c6f15ecf: am 1510795f: Merge "Upgrade to tzdata2012e."
...
* commit '48955d24b9f3e8c15028a6dbb54e2e96fd41780a':
Upgrade to tzdata2012e.
2012-08-03 13:39:38 -07:00
Elliott Hughes
48955d24b9
am c6f15ecf: am 1510795f: Merge "Upgrade to tzdata2012e."
...
* commit 'c6f15ecf76842801db653d58a262c7d342be2a93':
Upgrade to tzdata2012e.
2012-08-03 13:33:15 -07:00
David Turner
c7813c0857
am d7552a31: am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit 'd7552a3101affbc531f3c33deca10c28417a864c':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:02:00 -07:00
David Turner
d7552a3101
am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit '2f2b72120489d9e7e67a97a059a731aa72a34f72':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:00:03 -07:00
Elliott Hughes
df7aa95031
am 9b6a4538: am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
...
* commit '9b6a45386555a11aa1c7f473b21c480b4a158ea7':
[MIPS] Support for TLS register
2012-08-02 18:49:12 -07:00
Elliott Hughes
9b6a453865
am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
...
* commit '0ce92b9625c5d0cc4e72047e6c8759c4cc079dcb':
[MIPS] Support for TLS register
2012-08-02 18:48:04 -07:00
Elliott Hughes
e5bd6efa08
am f94effda: am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
...
* commit 'f94effdab27f2bbe3f079d454e71ca9e60166318':
MIPS support for libc.
2012-08-02 16:37:07 -07:00
Elliott Hughes
f94effdab2
am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
...
* commit 'fd4685be87fa2c957d4f95deb75a6ba763fd7339':
MIPS support for libc.
2012-08-02 16:34:57 -07:00
Elliott Hughes
79d834b5ab
am 82dcfee5: am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '82dcfee5fcd5243ff9df2aa7497e83dd567b6f95':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:10:34 -07:00
Elliott Hughes
422067eb3c
am c0719660: am 670766c5: am 994935f6: Merge "Error numbers are target specific."
...
* commit 'c07196605cc9bb55af2173832536e342e902d2c5':
Error numbers are target specific.
2012-08-02 16:10:32 -07:00
Elliott Hughes
82dcfee5fc
am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '19e30fc41030ab0524134b097dfef88baea14f4a':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:07:41 -07:00
Elliott Hughes
c07196605c
am 670766c5: am 994935f6: Merge "Error numbers are target specific."
...
* commit '670766c5649086ad5ffe26c0deadeb460139202f':
Error numbers are target specific.
2012-08-02 16:07:40 -07:00
Elliott Hughes
0b8dda0e42
am 673c092e: am 54830578: am f34ecbff: Merge "MIPS support to the linker"
...
* commit '673c092e0fc40afa291086d06ab39a6d22e7f894':
MIPS support to the linker
2012-08-02 15:43:44 -07:00
Elliott Hughes
673c092e0f
am 54830578: am f34ecbff: Merge "MIPS support to the linker"
...
* commit '5483057817d071140d94299452b31881c4a6e748':
MIPS support to the linker
2012-08-02 15:39:45 -07:00
Brian Muramatsu
fa22fd9f81
am 402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
...
* commit '402ec70899909f0b32c1ac304e3f26434424a3b3':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:22:34 -07:00
Brian Muramatsu
402ec70899
Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
2012-08-02 15:20:58 -07:00
The Android Open Source Project
d7b3cc0c69
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7
2012-08-02 11:26:02 -07:00
The Android Automerger
248321bb6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 07:41:45 -07:00
The Android Open Source Project
8f2f246618
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2295284f2cccfc72a25c2675762cc613faa337a4
2012-08-01 13:11:49 -07:00
The Android Automerger
617a5ee417
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-01 07:10:06 -07:00
Ajay Dudani
cbbe9528ca
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-07-31 21:32:50 -07:00
Shih-wei Liao
cfc8b93c4e
am 4f13bdd4: am 7565d5b1: am 0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '4f13bdd45c73194a49d3a5844746248c7dcd9432':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:05:09 -07:00
Shih-wei Liao
4f13bdd45c
am 7565d5b1: am 0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '7565d5b118420cc0dff2d59cf3542e99f415601a':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:02:52 -07:00
Elliott Hughes
029cf34cfd
am 81f1617a: am 8d2c5b24: am b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '81f1617a689931388c0b223ec729297b3a2bc792':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:33:45 -07:00
Elliott Hughes
81f1617a68
am 8d2c5b24: am b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '8d2c5b247e701f51ce3d750e9ee3ff37009630c3':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:32:45 -07:00
The Android Open Source Project
6ac557918a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Icba591905e72d5567b361d7e994cafc65e6f932a
2012-07-31 15:02:24 -07:00
Elliott Hughes
494e534b00
am f1997971: am 7645355e: am a513f70b: Merge "bionic: Stack pointer/signal race condition."
...
* commit 'f19979710a2f34e5a6ef5cc6f900c40690d65db4':
bionic: Stack pointer/signal race condition.
2012-07-31 10:41:41 -07:00
Elliott Hughes
ad2e065de1
am b78aa539: am bf397b60: am 21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'b78aa5390492cfe288d0128b749b18d2c740635e':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:41:40 -07:00
Elliott Hughes
f19979710a
am 7645355e: am a513f70b: Merge "bionic: Stack pointer/signal race condition."
...
* commit '7645355ecdf29301bdc65f9ea8e00c20e51da3f5':
bionic: Stack pointer/signal race condition.
2012-07-31 10:40:06 -07:00
Elliott Hughes
b78aa53904
am bf397b60: am 21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'bf397b601189f8a63c8a842e16af5ed004ef75f5':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:40:05 -07:00
The Android Automerger
15e0ca8186
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-31 07:35:13 -07:00
The Android Open Source Project
0531d199dc
Reconcile with jb-mr1-release
...
Change-Id: Ib68b14addd9f82526c451c988ae2e307cd7add19
2012-07-30 15:03:20 -07:00
Shih-wei Liao
0c2d318837
am 18421669: am 1ee6e3b7: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '184216696a9945a5bf6cb186b4d3a42ffe582818':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:13:26 -07:00
Ed Heyl
e5b635c885
am 681ccffb: Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
* commit '681ccffb4593875a3bcc2c17da9713a1215232d9':
bionic: Update MDP and rotator headers
Adding msm_dsps.h header
Update msm headers for audio, camera, ion, charm, rmnet
bionic: Update msm_mdp.h from the kernel
update linux/fb.h to support fb ioctl in kernel 3.4
Use sanitized video decode/encode header files
bionic: Update MDP and KGSL headers
add processed sound/tlv.h header
add processed genlock.h for qualcomm
2012-07-29 22:40:26 -07:00
Ed Heyl
681ccffb45
Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09
2012-07-29 08:22:16 -07:00
Elliott Hughes
b7dd54f0c7
am d6c3369c: am 7a450b4d: am 643e5722: Merge "Report errors to the log, not just stderr."
...
* commit 'd6c3369cec68de60dec0d9ab7469457d817539e1':
Report errors to the log, not just stderr.
2012-07-27 18:32:56 -07:00
Elliott Hughes
d6c3369cec
am 7a450b4d: am 643e5722: Merge "Report errors to the log, not just stderr."
...
* commit '7a450b4d9efc5457a987f5b5665ca7c6e7f57e34':
Report errors to the log, not just stderr.
2012-07-27 18:30:04 -07:00
Elliott Hughes
65b48f892e
am c823b2c7: am 616f3680: am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit 'c823b2c74137230fc1a166527b5141e3a6bacd65':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 16:25:03 -07:00
Elliott Hughes
2eb46df63a
am d7dfcb0c: am 514ace95: am 9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit 'd7dfcb0cb07bc1bb2b716075697f86de1b4d8e54':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 16:24:50 -07:00
The Android Open Source Project
a1d1abbc26
am 22bd479e: am e35ae86e: Reconcile with jb-release
...
* commit '22bd479e2e8454ed726f8c650e52b78702262d34':
2012-07-27 16:24:00 -07:00
Elliott Hughes
c823b2c741
am 616f3680: am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit '616f368076c9d7f0fc4459b79ba26c1d1ec0a247':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 16:00:36 -07:00
Elliott Hughes
d7dfcb0cb0
am 514ace95: am 9061c6e7: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit '514ace9534233aa7ef5ff3f9d9c614c94eeefc1f':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 15:51:24 -07:00
The Android Open Source Project
22bd479e2e
am e35ae86e: Reconcile with jb-release
...
* commit 'e35ae86e70b1e728c220867d5a2aa66955c87c34':
2012-07-27 15:45:49 -07:00
Elliott Hughes
cb9ea8873a
am 408e3e50: am 45038ae4: am 12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '408e3e5046ed030c464cdae6c95bc6a9d6de39cc':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:21:45 -07:00
Elliott Hughes
408e3e5046
am 45038ae4: am 12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '45038ae483313a5cc445a90fb0499d4c6ad69b1d':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:16:50 -07:00
Elliott Hughes
6320848df6
am c636ff19: am 9a9ca7c1: am 7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit 'c636ff1944ca9c67953e3162ba7a8c39e44fff42':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 22:56:12 -07:00
Elliott Hughes
c636ff1944
am 9a9ca7c1: am 7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit '9a9ca7c1e8079aaae6b1833bd06719e98ca0783e':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 22:34:57 -07:00
Ying Wang
186b36b65b
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
Bug: 6857263
Change-Id: Ib639f1c4d572fec088298f95f6d5a2951d56cd12
2012-07-26 15:55:34 -07:00
Nick Kralevich
68c1f682ff
am b4fc64c9: am cc5edd83: Merge "vfprintf: fix spelling."
...
* commit 'b4fc64c96cad1be63b5c52af835c4a93b0e60204':
vfprintf: fix spelling.
2012-07-25 22:26:13 -07:00
Elliott Hughes
edc5fe530f
am 9dbd4c06: am c27103d8: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
...
* commit '9dbd4c06fe143a4187d2d8d418c1a3b7c1ed39ba':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
2012-07-24 18:05:28 -07:00
Elliott Hughes
7c3323516b
am 860dc7e2: am c98e2365: Merge "Fix implementation of generic atomic operations"
...
* commit '860dc7e25d4ba64b5bd49fe123bae6e6105dd2e7':
Fix implementation of generic atomic operations
2012-07-24 18:05:27 -07:00
Elliott Hughes
0b82e1bd77
am d33ce20e: am 344aca8c: Merge "[MIPS] Add atomic routines"
...
* commit 'd33ce20e6dfbe5be081867c9ace538022991bb10':
[MIPS] Add atomic routines
2012-07-24 13:53:37 -07:00
Elliott Hughes
7cfe2c5c07
am 5e2a2705: am b109e437: Merge "Upgrade to tzdata2012d."
...
* commit '5e2a2705f237130bc516b62ff1372e94ad508f12':
Upgrade to tzdata2012d.
2012-07-23 19:04:50 -07:00
Elliott Hughes
acda32c8f2
am a94c708a: am 654b1501: Merge "Update time.h for CLOCK_BOOTTIME."
...
* commit 'a94c708a15713535c0ece63ffc43d016eccfebe1':
Update time.h for CLOCK_BOOTTIME.
2012-07-20 10:00:47 -07:00
Naseer Ahmed
2730674ca9
bionic: Update MDP and rotator headers
...
Change-Id: I585e07b004dfa6b5113050211ca67e4c057f5531
2012-07-20 08:54:32 -07:00
Nick Pelly
8958a38329
Update time.h for CLOCK_BOOTTIME.
...
Change-Id: Iafbc6a2f57587feb68526e4eab67452aa0db5311
2012-07-19 16:33:58 -07:00
Ajay Dudani
3e210abf7d
Adding msm_dsps.h header
...
Change-Id: I7736a3a895b9c81d5184f7c97ac0ed5aeb138d25
2012-07-19 07:26:26 -07:00
Andrew Hsieh
b9462d5f88
am 40e7ed58: Unhide rtld_db_dlactivity()
...
* commit '40e7ed58d73eae59d0cf2fed61284d16692e307b':
Unhide rtld_db_dlactivity()
2012-07-09 11:05:49 -07:00
Ajay Dudani
3fc3b7fd94
Update msm headers for audio, camera, ion, charm, rmnet
...
Change-Id: I226a1c57b94ea542fa5f3ea081582d49b3b9a3d1
2012-07-08 23:53:32 -07:00
Naseer Ahmed
05ad617b5b
bionic: Update msm_mdp.h from the kernel
...
Adds more color formats that were missing
Change-Id: I4e247ab630d9afa3ba75444bde7cd2dcd39f2ab2
2012-07-06 12:03:26 -07:00
choongryeol.lee
402b93c16d
update linux/fb.h to support fb ioctl in kernel 3.4
...
Change-Id: I959e4f445360263a34f20b0ae1a8b42123710c13
2012-06-28 21:11:08 -07:00
Haynes Mathew George
3fad2b17b9
Use sanitized video decode/encode header files
...
Change-Id: Id4897181da94af51992c71cd49aff1f40970e6c7
2012-06-21 15:45:28 -07:00
Naseer Ahmed
240b3349fc
bionic: Update MDP and KGSL headers
...
Update headers for MSM MDP, MSM KGSL and MSM
rotator to match the version in the Linux
3.4 kernel baseline
Change-Id: I37052486be8c8862e65cac1f6934368ecc055a76
2012-06-21 11:50:01 -07:00
Andy McFadden
5e94df8a4f
am 4d0128f1: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev
...
* commit '4d0128f13a3ca9f7a0c81b6e69f7e20d28e9e6e3':
Minor tweak to get memory around corrupted heap chunks dumped.
2012-06-19 11:31:06 -07:00
Iliyan Malchev
29d03a8f39
add processed sound/tlv.h header
...
Change-Id: Ia57dd1293a5bd58c1b1950f1d243b394a0dd1eb8
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-06-11 14:54:44 -07:00
Iliyan Malchev
3cb8cdea3c
add processed genlock.h for qualcomm
...
Change-Id: Id1ea77cf84e4924077b30c661d1c4bea427ad87e
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-06-11 14:16:21 -07:00
Henrik Smiding
3ebd31c0a1
Add optimized version of memcmp for Cortex A9
...
Adds new code to function memcmp, optimized for Cortex A9.
Copyright (C) ST-Ericsson SA 2010
Added neon optimization
Change-Id: I8864d277042db40778b33232feddd90a02a27fb0
Author: Henrik Smiding henrik.smiding@stericsson.com for ST-Ericsson.
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com >
2012-05-19 14:04:59 +02:00
