OSDN Git Service
Elliott Hughes [Thu, 13 Jun 2013 23:21:55 +0000 (16:21 -0700)]
am
560e9f7e: Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
* commit '
560e9f7e7a39e02aca96709043ca06f562f75d58':
Ensure that <stdint.h> defines SIZE_MAX and friends.
Elliott Hughes [Thu, 13 Jun 2013 23:19:09 +0000 (23:19 +0000)]
Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
Elliott Hughes [Thu, 13 Jun 2013 23:02:53 +0000 (16:02 -0700)]
Ensure that <stdint.h> defines SIZE_MAX and friends.
We were missing SIG_ATOMIC_MAX, SIG_ATOMIC_MIN, SIZE_MAX,
WCHAR_MAX, WCHAR_MIN, WINT_MAX, and WINT_MIN.
Change-Id: I2535f36bc220fbaea009b483599b7af811c4cb5c
Elliott Hughes [Thu, 13 Jun 2013 00:46:57 +0000 (17:46 -0700)]
am
c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
* commit '
c843a3e7b215bca5e896e1d56c2fa6332770ea83':
Fix the qsort copyright notice (fixed upstream this afternoon).
Elliott Hughes [Thu, 13 Jun 2013 00:44:05 +0000 (00:44 +0000)]
Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
Elliott Hughes [Thu, 13 Jun 2013 00:42:43 +0000 (17:42 -0700)]
Fix the qsort copyright notice (fixed upstream this afternoon).
Change-Id: I786feb42719bceaa7da91565e350c1333b0d301f
Elliott Hughes [Thu, 13 Jun 2013 00:34:17 +0000 (17:34 -0700)]
am
c843d766: Merge "Handles spurious wake-ups in pthread_join()"
* commit '
c843d7667ada205ecbaf773531067076ed4ad271':
Handles spurious wake-ups in pthread_join()
Elliott Hughes [Thu, 13 Jun 2013 00:31:49 +0000 (00:31 +0000)]
Merge "Handles spurious wake-ups in pthread_join()"
Elliott Hughes [Thu, 13 Jun 2013 00:30:59 +0000 (17:30 -0700)]
am
92e841d0: Merge "Take upstream libm changes."
* commit '
92e841d0aa8d118882a74e3c3fc4b6a6062dcc09':
Take upstream libm changes.
msg555 [Thu, 6 Jun 2013 18:59:28 +0000 (14:59 -0400)]
Handles spurious wake-ups in pthread_join()
Removed 'join_count' from pthread_internal_t and switched to using the flag
PTHREAD_ATTR_FLAG_JOINED to indicate if a thread is being joined. Combined with
a switch to a while loop in pthread_join, this fixes spurious wake-ups but
prevents a thread from being joined multiple times. This is fine for
two reasons:
1) The pthread_join specification allows for undefined behavior when multiple
threads try to join a single thread.
2) There is no thread safe way to allow multiple threads to join a single
thread with the pthread interface. The second thread calling pthread_join
could be pre-empted until the thread is destroyed and its handle reused for
a different thread. Therefore multi-join is always an error.
Bug: https://code.google.com/p/android/issues/detail?id=52255
Change-Id: I8b6784d47620ffdcdbfb14524e7402e21d46c5f7
Elliott Hughes [Thu, 13 Jun 2013 00:29:21 +0000 (00:29 +0000)]
Merge "Take upstream libm changes."
Elliott Hughes [Wed, 12 Jun 2013 23:37:58 +0000 (16:37 -0700)]
Take upstream libm changes.
Mostly workarounds for GCC and Clang bugs.
Change-Id: I4ef428a42d4ac6d622659053711a8cc416925727
Elliott Hughes [Wed, 12 Jun 2013 23:16:09 +0000 (16:16 -0700)]
am
6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
* commit '
6a44d2271f372d0c65b05a5d3377bd00ce92824e':
Take some fixed upstream copyright headers and regenerate NOTICE.
Elliott Hughes [Wed, 12 Jun 2013 23:13:34 +0000 (23:13 +0000)]
Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
Elliott Hughes [Wed, 12 Jun 2013 23:00:41 +0000 (16:00 -0700)]
Take some fixed upstream copyright headers and regenerate NOTICE.
Change-Id: Ifff41d69c13322dbc6f928ce7d4c65f76fe36772
Elliott Hughes [Wed, 12 Jun 2013 22:58:41 +0000 (15:58 -0700)]
am
55189a0f: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
* commit '
55189a0fbd26cfd84939d9d3a42a1800a63bd2c5':
Switch to current upstream stdio makebuf.c and setvbuf.c.
Elliott Hughes [Wed, 12 Jun 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
Elliott Hughes [Wed, 12 Jun 2013 22:24:15 +0000 (15:24 -0700)]
Switch to current upstream stdio makebuf.c and setvbuf.c.
Change-Id: I4761b5e94459815520f01062eef39abf62af621f
Elliott Hughes [Wed, 12 Jun 2013 22:22:04 +0000 (15:22 -0700)]
am
f1867d47: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
* commit '
f1867d47cbce4225d712a2684da67031f7350909':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
Elliott Hughes [Wed, 12 Jun 2013 22:19:03 +0000 (22:19 +0000)]
Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
Elliott Hughes [Wed, 12 Jun 2013 22:18:47 +0000 (22:18 +0000)]
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
This reverts commit
d8627af159c6b1bc40296fb29297c61b30a5a8e2 which caused build breakage:
In file included from bionic/libc/include/limits.h:86:0,
from bionic/libc/include/stdint.h:33,
from bionic/libc/arch-arm/bionic/crtbegin.c:31:
bionic/libc/include/sys/limits.h:30:26: fatal error: linux/limits.h: No such file or directory
compilation terminated.
make: *** [out/target/product/generic/obj/lib/crtbegin_dynamic1.o] Error 1
Change-Id: I128095ecb99df92626e1f57e34c61e08c98a4078
Elliott Hughes [Wed, 12 Jun 2013 22:06:51 +0000 (15:06 -0700)]
am
55c5ec64: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
* commit '
55c5ec64bd26d92bd1882a9a4c91445de73ebfa2':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
Elliott Hughes [Wed, 12 Jun 2013 22:05:09 +0000 (22:05 +0000)]
Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
Elliott Hughes [Wed, 12 Jun 2013 21:58:32 +0000 (14:58 -0700)]
am
944ea1a3: Merge "Clean up abort."
* commit '
944ea1a32018c44d6cb55c9454e670b0e152da6d':
Clean up abort.
Elliott Hughes [Wed, 12 Jun 2013 21:54:16 +0000 (14:54 -0700)]
Add SIZE_MAX to <stdint.h> in a way that might actually work.
Take two.
Change-Id: I7d08b6d14c82a171312a7f5898270b4441d5cfa2
Elliott Hughes [Wed, 12 Jun 2013 21:53:57 +0000 (21:53 +0000)]
Merge "Clean up abort."
Elliott Hughes [Wed, 12 Jun 2013 21:05:46 +0000 (14:05 -0700)]
Clean up abort.
* A dlmalloc usage error shouldn't call abort(3) because we want to
cause a SIGSEGV by writing the address dlmalloc didn't like to an
address the kernel won't like, so that debuggerd will dump the
memory around the address that upset dlmalloc.
* Switch to the simpler FreeBSD/NetBSD style of registering stdio
cleanup. Hopefully this will let us simplify more of the stdio
implementation.
* Clear the stdio cleanup handler before we abort because of a dlmalloc
corruption error. This fixes the reported bug, where we'd hang inside
dlmalloc because the stdio cleanup reentered dlmalloc.
Bug:
9301265
Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
Elliott Hughes [Wed, 12 Jun 2013 17:58:23 +0000 (10:58 -0700)]
am
5cde15eb: Merge "<stdint.h> should expose SIZE_MAX."
* commit '
5cde15eb17f4ddc0949c0cbd38a46e6c0bad7019':
<stdint.h> should expose SIZE_MAX.
Elliott Hughes [Wed, 12 Jun 2013 17:56:23 +0000 (17:56 +0000)]
Merge "<stdint.h> should expose SIZE_MAX."
Elliott Hughes [Wed, 12 Jun 2013 17:28:26 +0000 (10:28 -0700)]
<stdint.h> should expose SIZE_MAX.
Change-Id: Id27222c24955c83f29ad953933cbdc48b6f1e900
Nick Kralevich [Tue, 11 Jun 2013 22:56:42 +0000 (15:56 -0700)]
am
b6e88020: Merge "fix unittests."
* commit '
b6e880200d1690c00cb843e59c6849a275dbfbb7':
fix unittests.
Nick Kralevich [Tue, 11 Jun 2013 22:52:54 +0000 (22:52 +0000)]
Merge "fix unittests."
Nick Kralevich [Tue, 11 Jun 2013 22:45:23 +0000 (15:45 -0700)]
fix unittests.
7e6ce1a3c52d8533fed92c143419fedb0c93988a fixed abort() to raise
SIGABRT rather than causing SIGSEGV. However, the unittests were
not updated.
Fix unittests.
Change-Id: I73db194127b9b9e9440358aa94273863765a736b
Ben Cheng [Tue, 11 Jun 2013 00:25:31 +0000 (17:25 -0700)]
am
fc104f89: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
* commit '
fc104f899d47916f76c91127caf9aeaf7b69d4ef':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
Ben Cheng [Tue, 11 Jun 2013 00:22:14 +0000 (00:22 +0000)]
Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
Ben Cheng [Tue, 11 Jun 2013 00:01:41 +0000 (17:01 -0700)]
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
tgkill() needs the .save stack unwinding directive to get the complete
stack trace.
BUG: https://code.google.com/p/android/issues/detail?id=16672
Change-Id: Ifb447dca2147a592c48baf32769dfc175d8aea72
Brian Carlstrom [Mon, 10 Jun 2013 22:41:19 +0000 (15:41 -0700)]
am
8252b8e4: Merge "Honor p_vaddr if set"
* commit '
8252b8e4b730b13623f31dc66396e000586d1c58':
Honor p_vaddr if set
Brian Carlstrom [Mon, 10 Jun 2013 22:39:06 +0000 (22:39 +0000)]
Merge "Honor p_vaddr if set"
Elliott Hughes [Sat, 8 Jun 2013 00:47:33 +0000 (17:47 -0700)]
am
2fbc9dda: Merge "bionic/x86: Optimization for string routines"
* commit '
2fbc9dda345486005569be4ec586c6aae9d51650':
bionic/x86: Optimization for string routines
Elliott Hughes [Sat, 8 Jun 2013 00:45:07 +0000 (00:45 +0000)]
Merge "bionic/x86: Optimization for string routines"
Elliott Hughes [Sat, 8 Jun 2013 00:44:20 +0000 (17:44 -0700)]
am
157c4299: Merge "Revert "libc x86: Remove strcat.S""
* commit '
157c42997b7aa31b36cca63ad03dbb5a601ce347':
Revert "libc x86: Remove strcat.S"
Elliott Hughes [Sat, 8 Jun 2013 00:42:44 +0000 (00:42 +0000)]
Merge "Revert "libc x86: Remove strcat.S""
Elliott Hughes [Sat, 8 Jun 2013 00:42:35 +0000 (00:42 +0000)]
Revert "libc x86: Remove strcat.S"
This reverts commit
4fe461b3a67148a2f557605e10a34deff9c8773a
Change-Id: Ibeb76e24f054abd7c96ad6899366c2f9bfc2a5ad
Christopher Ferris [Fri, 7 Jun 2013 22:16:30 +0000 (15:16 -0700)]
am
9647f797: Merge "Implement malloc_usable_size for debug impls."
* commit '
9647f797d59222cd91507d4554bf62166ba88e0a':
Implement malloc_usable_size for debug impls.
Christopher Ferris [Fri, 7 Jun 2013 22:15:33 +0000 (22:15 +0000)]
Merge "Implement malloc_usable_size for debug impls."
Christopher Ferris [Wed, 22 May 2013 00:48:01 +0000 (17:48 -0700)]
Implement malloc_usable_size for debug impls.
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug:
6143477
Merge change from internal master.
(cherry-picked from commit
3d594c258045783fc9e1956ce7a4d91e302f011e)
Change-Id: I4ae00fffba82315a8c283f35893fd554460722fb
Brian Carlstrom [Fri, 11 Jan 2013 00:39:58 +0000 (16:39 -0800)]
Honor p_vaddr if set
(cherry picked from commit
88ff15c2c279d2bbe3569101b36cd2aa0931a0a9)
Change-Id: I4aabbe911d30aea8ace69e29bb6e980a4e89de90
Elliott Hughes [Thu, 6 Jun 2013 01:09:17 +0000 (18:09 -0700)]
am
b7b4f5b8: Merge "update signal.h to be C90 compatable"
* commit '
b7b4f5b838cd41407c734af74e8211f5c7da0036':
update signal.h to be C90 compatable
Elliott Hughes [Thu, 6 Jun 2013 01:06:40 +0000 (01:06 +0000)]
Merge "update signal.h to be C90 compatable"
Elliott Hughes [Thu, 6 Jun 2013 01:06:04 +0000 (18:06 -0700)]
am
18af4503: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
* commit '
18af450393b005b4ead896d82cda750e6876fd33':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
Erik Gilling [Wed, 29 May 2013 23:26:23 +0000 (16:26 -0700)]
update signal.h to be C90 compatable
sigismember, sigaddset, and sigdelset had mixed code and declarations
which are not allowed in C90 and before.
Change-Id: I662af944fc1489e34bed228ce592e41f50d00e17
Signed-off-by: Erik Gilling <konkers@android.com>
Elliott Hughes [Thu, 6 Jun 2013 01:04:13 +0000 (01:04 +0000)]
Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
Elliott Hughes [Thu, 6 Jun 2013 00:51:20 +0000 (17:51 -0700)]
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
We keep fixing these one-by-one; let's fix them all at once.
Found thus:
find . -name *.h | xargs grep -L sys/cdefs.h | xargs grep -l BEGIN_DECL | xargs grep -L sys/types
Change-Id: I188842aa2484dc6176e96556d57c38a0f785b59b
Elliott Hughes [Thu, 6 Jun 2013 00:29:01 +0000 (17:29 -0700)]
am
c5bfb624: Merge "sys/personality.h: include <sys/cdefs.h>"
* commit '
c5bfb62433751579e86d5fd24cddf3ae28a49b43':
sys/personality.h: include <sys/cdefs.h>
Elliott Hughes [Thu, 6 Jun 2013 00:28:07 +0000 (00:28 +0000)]
Merge "sys/personality.h: include <sys/cdefs.h>"
Elliott Hughes [Thu, 6 Jun 2013 00:02:29 +0000 (17:02 -0700)]
am
8d36050a: Merge "Clean up useless declaration in thread_private.h"
* commit '
8d36050ac2bb1c4a6a04462e64c5440e3c23c9f0':
Clean up useless declaration in thread_private.h
Elliott Hughes [Thu, 6 Jun 2013 00:00:40 +0000 (00:00 +0000)]
Merge "Clean up useless declaration in thread_private.h"
Kito Cheng [Wed, 5 Jun 2013 03:30:17 +0000 (11:30 +0800)]
sys/personality.h: include <sys/cdefs.h>
Change-Id: Ia3fa558a38e0cffe5287bc454e85d5d3bdaa6ba1
Kito Cheng [Fri, 3 May 2013 02:31:17 +0000 (10:31 +0800)]
Clean up useless declaration in thread_private.h
Change-Id: Ie7bcdc7195a3fcbcd09a95f73b0c49e8897ad50b
Elliott Hughes [Wed, 5 Jun 2013 02:00:03 +0000 (19:00 -0700)]
am
4c001859: Merge "Fix declaration of malloc_usable_size()"
* commit '
4c001859feeda27727917c5bd00338e90b801742':
Fix declaration of malloc_usable_size()
Elliott Hughes [Wed, 5 Jun 2013 01:58:26 +0000 (01:58 +0000)]
Merge "Fix declaration of malloc_usable_size()"
Nick Kralevich [Tue, 4 Jun 2013 19:07:16 +0000 (12:07 -0700)]
am
a24e81ef: Merge "Add tests for __strcpy_chk()"
* commit '
a24e81efd30d106cdfa6a019acf7c77cd88b40cc':
Add tests for __strcpy_chk()
Nick Kralevich [Tue, 4 Jun 2013 19:05:33 +0000 (19:05 +0000)]
Merge "Add tests for __strcpy_chk()"
Nick Kralevich [Mon, 3 Jun 2013 17:58:06 +0000 (10:58 -0700)]
Add tests for __strcpy_chk()
Change-Id: I5675d04fcd471732c1b87b83879a54fbcd27762e
Brian Carlstrom [Tue, 4 Jun 2013 03:21:04 +0000 (20:21 -0700)]
am
06713930: Merge "Small cleanup of soinfo_elf_lookup."
* commit '
0671393072a78e75a726c58aa3ca718e55eeac3e':
Small cleanup of soinfo_elf_lookup.
Brian Carlstrom [Tue, 4 Jun 2013 03:18:23 +0000 (03:18 +0000)]
Merge "Small cleanup of soinfo_elf_lookup."
Christopher Ferris [Tue, 4 Jun 2013 00:27:49 +0000 (17:27 -0700)]
Small cleanup of soinfo_elf_lookup.
- Remove unnecessary line.
- Move declarations to first use.
Change-Id: I1d8398d6c13f7cb86bffe0b68af849e35a4b234d
Ben Cheng [Sat, 1 Jun 2013 15:19:07 +0000 (08:19 -0700)]
am
404d491e: Merge "Use bl instead of blx to support interworking properly."
* commit '
404d491eb655839bf4260cc168bb79864473e129':
Use bl instead of blx to support interworking properly.
Ben Cheng [Fri, 31 May 2013 21:40:37 +0000 (21:40 +0000)]
Merge "Use bl instead of blx to support interworking properly."
Ben Cheng [Fri, 31 May 2013 21:25:48 +0000 (14:25 -0700)]
Use bl instead of blx to support interworking properly.
(cherry picked from commit
9e1905794b4ecd8f7b87d8e4e2f954c8cfc6beda in
master)
Change-Id: I9b8c35ea9e201e00f84315f9f105013c23c94d85
Nick Kralevich [Fri, 31 May 2013 18:14:56 +0000 (11:14 -0700)]
am
8539961f: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
* commit '
8539961ff299b05d8feac9be8b119698be22da03':
FORTIFY_SOURCE: strcat / strncat optimize
Nick Kralevich [Fri, 31 May 2013 18:13:23 +0000 (18:13 +0000)]
Merge "FORTIFY_SOURCE: strcat / strncat optimize"
Nick Kralevich [Thu, 30 May 2013 23:48:53 +0000 (16:48 -0700)]
FORTIFY_SOURCE: strcat / strncat optimize
__strcat_chk and __strncat_chk are slightly inefficient,
because they end up traversing over the same memory region
two times.
This change optimizes __strcat_chk / __strncat_chk so they
only access the memory once. Although I haven't benchmarked these
changes, it should improve the performance of these functions.
__strlen_chk - expose this function, even if -D_FORTIFY_SOURCE
isn't defined. This is needed to compile libc itself without
-D_FORTIFY_SOURCE.
Change-Id: Id2c70dff55a276b47c59db27a03734d659f84b74
Liubov Dmitrieva [Tue, 17 Jan 2012 08:55:46 +0000 (12:55 +0400)]
bionic/x86: Optimization for string routines
Optimized strcpy, strcat,
strncpy, strncat, strlcpy, strlcat,
memchr, memrchr, strchr, strrchr, index,
strnlen, strlen, wcslen, wmemcmp, wcscmp,
wcschr, wcsrchr, wcscpy, wcscat
Change-Id: I82b29132edf9a2e144e0bb3ee4ff5217df8d2a6d
Signed-off-by: Liubov Dmitrieva <liubov.dmitrieva@intel.com>
Nick Kralevich [Thu, 30 May 2013 23:54:24 +0000 (16:54 -0700)]
am
72f59c84: Merge "Add strncpy FORTIFY_SOURCE tests."
* commit '
72f59c84fd73a0a701ce6448d103e9021c1cb060':
Add strncpy FORTIFY_SOURCE tests.
Nick Kralevich [Thu, 30 May 2013 23:54:18 +0000 (16:54 -0700)]
am
d515f468: Merge "libc x86: Remove strcat.S"
* commit '
d515f46888cf381c1fbbc99a62be727174b30a23':
libc x86: Remove strcat.S
Nick Kralevich [Thu, 30 May 2013 20:33:02 +0000 (20:33 +0000)]
Merge "Add strncpy FORTIFY_SOURCE tests."
Nick Kralevich [Thu, 30 May 2013 20:21:14 +0000 (13:21 -0700)]
Add strncpy FORTIFY_SOURCE tests.
Change-Id: Id108b1d72b44d7e5fb911268e80bbdf896808f60
Nick Kralevich [Thu, 30 May 2013 19:59:38 +0000 (19:59 +0000)]
Merge "libc x86: Remove strcat.S"
Nick Kralevich [Thu, 30 May 2013 18:15:40 +0000 (11:15 -0700)]
libc x86: Remove strcat.S
This file is never used.
Change-Id: Iae4bba4a5a12a86a775af05e7477fb7b6511480b
Nick Kralevich [Fri, 24 May 2013 18:37:30 +0000 (11:37 -0700)]
am
8d79fd1c: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
* commit '
8d79fd1c94cb021b6852e6f44e27183ec83fe04c':
libc x86: Remove index.S, strcpy.S, strchr.S
Nick Kralevich [Fri, 24 May 2013 18:34:57 +0000 (18:34 +0000)]
Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
Nick Kralevich [Fri, 24 May 2013 17:48:12 +0000 (10:48 -0700)]
libc x86: Remove index.S, strcpy.S, strchr.S
These files are never used.
Change-Id: Iab8474bdff3bd4d225597c62b3c0f0849f808818
Nick Kralevich [Fri, 24 May 2013 17:43:58 +0000 (10:43 -0700)]
am
2317275f: Merge "libc: delete x86 memchr.S"
* commit '
2317275f859a685386889139855f2f3314337d53':
libc: delete x86 memchr.S
Nick Kralevich [Fri, 24 May 2013 17:27:47 +0000 (17:27 +0000)]
Merge "libc: delete x86 memchr.S"
Nick Kralevich [Fri, 24 May 2013 15:52:04 +0000 (08:52 -0700)]
libc: delete x86 memchr.S
This file is never used.
Change-Id: Ief08ad176713b5194048852609613801969e1364
David 'Digit' Turner [Thu, 23 May 2013 08:02:02 +0000 (10:02 +0200)]
Fix declaration of malloc_usable_size()
The function should take a 'const void*' parameter, instead of 'void*'.
Note that the implementation in upstream-dlmalloc/malloc.c already does
this.
For context, see http://b.android.com/55725
Change-Id: Iefd55cdb8996699189e0545f9195972490306227
Brian Carlstrom [Wed, 22 May 2013 00:23:09 +0000 (17:23 -0700)]
am
f5f29de6: Merge "Fix bionic linker to support segments with zero p_filesz"
* commit '
f5f29de6ae5a0b74234f111b5691a1e5588671cb':
Fix bionic linker to support segments with zero p_filesz
Brian Carlstrom [Tue, 21 May 2013 23:59:52 +0000 (23:59 +0000)]
Merge "Fix bionic linker to support segments with zero p_filesz"
Brian Carlstrom [Tue, 21 May 2013 23:49:24 +0000 (16:49 -0700)]
Fix bionic linker to support segments with zero p_filesz
(cherry picked from commit
96362fb9d11beef6233aa03db396f25688e70860)
Change-Id: Ib075a6dfc45d5d0746d8b278f317dd9b8d772f2a
Erik Gilling [Thu, 16 May 2013 20:19:07 +0000 (13:19 -0700)]
am
2e317075: Merge "libc/arm: add cortex-a8 cpu variant"
* commit '
2e317075b044e94fc75e36d08bec8a7eb5fc31ae':
libc/arm: add cortex-a8 cpu variant
Erik Gilling [Thu, 16 May 2013 19:57:28 +0000 (19:57 +0000)]
Merge "libc/arm: add cortex-a8 cpu variant"
The Android Open Source Project [Thu, 16 May 2013 12:42:53 +0000 (05:42 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc
Rom Lemarchand [Fri, 3 May 2013 12:53:38 +0000 (05:53 -0700)]
libc/arm: add cortex-a8 cpu variant
Change-Id: I30e8dd6d4b2e7889aea8f5ed21182a5941bfb489
Elliott Hughes [Wed, 15 May 2013 01:10:45 +0000 (18:10 -0700)]
am
5217fb52: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
* commit '
5217fb528ca40ece0dbb459dedf7d6fae81dde68':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
Elliott Hughes [Wed, 15 May 2013 00:56:06 +0000 (00:56 +0000)]
Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
Elliott Hughes [Wed, 15 May 2013 00:20:34 +0000 (17:20 -0700)]
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
Change-Id: Ie16cb21c1a5a2bdce8502b5974e2c4dbb1d679ce
Elliott Hughes [Tue, 14 May 2013 23:56:49 +0000 (16:56 -0700)]
am
6f502bc7: Merge "Add more __restricts, clean up __format__ attributes."
* commit '
6f502bc74374804766639e6b1515644875810bda':
Add more __restricts, clean up __format__ attributes.
Elliott Hughes [Tue, 14 May 2013 23:45:48 +0000 (23:45 +0000)]
Merge "Add more __restricts, clean up __format__ attributes."
Elliott Hughes [Tue, 14 May 2013 23:25:49 +0000 (16:25 -0700)]
am
349ef893: Merge "Pull upstream FreeBSD revision 249810."
* commit '
349ef893e82f37632a705f39efc47c0d440f63c7':
Pull upstream FreeBSD revision 249810.