OSDN Git Service
Elliott Hughes [Wed, 16 Jan 2013 21:31:35 +0000 (13:31 -0800)]
am
b989c9ce: (-s ours) Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
* commit '
b989c9ceda71f6f75112645b5c45af341275cbab':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
Elliott Hughes [Wed, 16 Jan 2013 18:34:33 +0000 (10:34 -0800)]
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
This reverts commit
f4b34b6c3942be273ad7298a40be0d312b183aab.
Elliott Hughes [Wed, 16 Jan 2013 17:50:42 +0000 (09:50 -0800)]
am
e05709b1: am
e611fad0: am
14e1975e: Merge "Fix signalfd for MIPS."
* commit '
e05709b1df7dba98c37e83f84dcbd2ad8429bcfc':
Fix signalfd for MIPS.
Elliott Hughes [Wed, 16 Jan 2013 17:48:04 +0000 (09:48 -0800)]
am
e611fad0: am
14e1975e: Merge "Fix signalfd for MIPS."
* commit '
e611fad0d055f2d869981136e5e51b7a01d525fc':
Fix signalfd for MIPS.
Elliott Hughes [Wed, 16 Jan 2013 17:45:57 +0000 (09:45 -0800)]
am
14e1975e: Merge "Fix signalfd for MIPS."
* commit '
14e1975e13c197180ed0481f305f83a362b16a24':
Fix signalfd for MIPS.
Elliott Hughes [Wed, 16 Jan 2013 17:42:51 +0000 (09:42 -0800)]
Merge "Fix signalfd for MIPS."
Elliott Hughes [Wed, 16 Jan 2013 17:34:16 +0000 (09:34 -0800)]
Fix signalfd for MIPS.
Also mark signalfd's sigset_t* argument as non-nullable.
Change-Id: I466e09cdf3fb92480744c496da92274a97f99dd1
Elliott Hughes [Tue, 15 Jan 2013 21:40:39 +0000 (13:40 -0800)]
am
04aa0fdd: (-s ours) 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 '
04aa0fdda60b6a492e572c2a79f21c732e8c33c8':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
Elliott Hughes [Tue, 15 Jan 2013 21:37:56 +0000 (13:37 -0800)]
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.""
Elliott Hughes [Tue, 15 Jan 2013 21:35:58 +0000 (13:35 -0800)]
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.""
Elliott Hughes [Tue, 15 Jan 2013 21:21:51 +0000 (13:21 -0800)]
Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
Nick Kralevich [Tue, 15 Jan 2013 19:20:23 +0000 (11:20 -0800)]
am
d29c9fc1: am
b59e358b: Merge "fix strerror_r test"
* commit '
d29c9fc18860a41f59d390b4aab937b61dd63ea1':
fix strerror_r test
Nick Kralevich [Tue, 15 Jan 2013 19:15:21 +0000 (11:15 -0800)]
am
b59e358b: Merge "fix strerror_r test"
* commit '
b59e358bb902124cc7d648266a97f96beefc8142':
fix strerror_r test
Elliott Hughes [Tue, 15 Jan 2013 19:12:18 +0000 (11:12 -0800)]
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
This reverts commit
f4b34b6c3942be273ad7298a40be0d312b183aab.
The revert was only meant to apply to the jb-mr1 branch, but accidentally
leaked out into AOSP. This revert-revert gets AOSP master and internal
master back in sync.
Nick Kralevich [Tue, 15 Jan 2013 18:56:06 +0000 (10:56 -0800)]
Merge "fix strerror_r test"
Nick Kralevich [Tue, 15 Jan 2013 18:35:09 +0000 (10:35 -0800)]
fix strerror_r test
e6e60065ff093ff8c859ab146cf543531cb1967c modified strerror_r to
treat errno as signed. However, the change to the test code
modified the "strerror" test, not the "strerror_r" test.
Make the same change for the strerror_r code.
Change-Id: Ia236a53df5745935e229a4446a74da8bed0cfd7b
Ben Cheng [Tue, 15 Jan 2013 02:01:35 +0000 (18:01 -0800)]
am
4130af46: am
b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
* commit '
4130af46bf120ac82ed61453215c7a692d84c1dd':
Add __aeabi_idiv to the dummy reference list.
Ben Cheng [Mon, 14 Jan 2013 23:44:01 +0000 (15:44 -0800)]
am
b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
* commit '
b09d7d86004ab75b774358454d8ee261987af96b':
Add __aeabi_idiv to the dummy reference list.
Ben Cheng [Mon, 14 Jan 2013 23:35:03 +0000 (15:35 -0800)]
Merge "Add __aeabi_idiv to the dummy reference list."
Ben Cheng [Mon, 14 Jan 2013 19:26:51 +0000 (11:26 -0800)]
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
Nick Kralevich [Mon, 14 Jan 2013 22:38:36 +0000 (14:38 -0800)]
am
1519690c: am
29fe857e: Merge "headers: update auxvec.h from Linux kernel"
* commit '
1519690cfb27af79627a8d39bf158a1feca953e3':
headers: update auxvec.h from Linux kernel
Nick Kralevich [Mon, 14 Jan 2013 22:31:28 +0000 (14:31 -0800)]
am
29fe857e: Merge "headers: update auxvec.h from Linux kernel"
* commit '
29fe857ec80e59347e28458a5396eb68d1cba0e4':
headers: update auxvec.h from Linux kernel
Nick Kralevich [Mon, 14 Jan 2013 22:14:49 +0000 (14:14 -0800)]
Merge "headers: update auxvec.h from Linux kernel"
Ben Cheng [Mon, 14 Jan 2013 21:36:33 +0000 (13:36 -0800)]
Merge "Add __aeabi_idiv to the dummy reference list."
Nick Kralevich [Mon, 14 Jan 2013 19:28:26 +0000 (11:28 -0800)]
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
Ben Cheng [Mon, 14 Jan 2013 19:26:51 +0000 (11:26 -0800)]
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
Change-Id: I0a05ce9c44e44d39b8ce1f0e319e2d37a010f3c7
Ian Rogers [Mon, 14 Jan 2013 19:22:56 +0000 (11:22 -0800)]
am
763d4bb3: am
68fa57f0: Merge "Name anonymous mmap mallocs."
* commit '
763d4bb345b2e8882dd39d0656ee9f23ca1d0512':
Name anonymous mmap mallocs.
Ian Rogers [Mon, 14 Jan 2013 19:19:00 +0000 (11:19 -0800)]
am
68fa57f0: Merge "Name anonymous mmap mallocs."
* commit '
68fa57f000285af20100c00db3d2bc143ad32294':
Name anonymous mmap mallocs.
Ian Rogers [Mon, 14 Jan 2013 18:54:44 +0000 (10:54 -0800)]
Merge "Name anonymous mmap mallocs."
Nick Kralevich [Mon, 14 Jan 2013 18:34:45 +0000 (10:34 -0800)]
am
13bd3716: am
bb897fa9: Merge "libc_init_static: apply relro earlier."
* commit '
13bd37160ee340ddcf7e1fb57251b124e0ec69c1':
libc_init_static: apply relro earlier.
Elliott Hughes [Mon, 14 Jan 2013 18:34:44 +0000 (10:34 -0800)]
am
375db86a: am
09d13c39: Merge "Fix my git mistake."
* commit '
375db86aeaedfe716b69a62f81a2484ee446d5e5':
Fix my git mistake.
Nick Kralevich [Mon, 14 Jan 2013 18:25:16 +0000 (10:25 -0800)]
am
bb897fa9: Merge "libc_init_static: apply relro earlier."
* commit '
bb897fa9f79d25e4445fe3ab46b86657d6660c10':
libc_init_static: apply relro earlier.
Nick Kralevich [Mon, 14 Jan 2013 18:21:23 +0000 (10:21 -0800)]
Merge "libc_init_static: apply relro earlier."
Elliott Hughes [Mon, 14 Jan 2013 18:08:56 +0000 (10:08 -0800)]
am
09d13c39: Merge "Fix my git mistake."
* commit '
09d13c393e7b6a77cc33e5ef87e5c92ccd13fe63':
Fix my git mistake.
Elliott Hughes [Mon, 14 Jan 2013 17:57:45 +0000 (09:57 -0800)]
Merge "Fix my git mistake."
Elliott Hughes [Mon, 14 Jan 2013 17:56:21 +0000 (09:56 -0800)]
Fix my git mistake.
This was the formatting change that was supposed to be in
cf23905a4bcc7bfdd109be5b6d69ad06877aa217.
Change-Id: Ib79fa031b68f6f541f532507eb589afeaedb831f
Elliott Hughes [Mon, 14 Jan 2013 17:50:50 +0000 (09:50 -0800)]
am
bc3c7183: am
48c632a3: Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
* commit '
bc3c718346d81c04451c35c2d8fb00c68b0a815d':
[MIPS] Set DT_DEBUG dyntab entry if it is writable
Elliott Hughes [Mon, 14 Jan 2013 17:46:19 +0000 (09:46 -0800)]
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
Elliott Hughes [Mon, 14 Jan 2013 17:31:04 +0000 (09:31 -0800)]
Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
Chris Dearman [Fri, 11 Jan 2013 23:32:20 +0000 (15:32 -0800)]
[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>
Nick Kralevich [Sat, 12 Jan 2013 02:38:26 +0000 (18:38 -0800)]
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
Ian Rogers [Fri, 11 Jan 2013 23:25:44 +0000 (15:25 -0800)]
Name anonymous mmap mallocs.
Change-Id: Icc53ba1eecb8445210623826d8e99a611d686f7f
Nick Kralevich [Sat, 12 Jan 2013 01:04:04 +0000 (17:04 -0800)]
am
fdd6dfa8: am
2c5153b0: libc: add getauxval()
* commit '
fdd6dfa863ea73251b5d59990e239854c31ecee3':
libc: add getauxval()
Nick Kralevich [Sat, 12 Jan 2013 00:59:57 +0000 (16:59 -0800)]
am
2c5153b0: libc: add getauxval()
* commit '
2c5153b043b44e9935a334ae9b2d5a4bc5258b40':
libc: add getauxval()
Nick Kralevich [Fri, 11 Jan 2013 22:43:05 +0000 (14:43 -0800)]
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
Nick Kralevich [Fri, 11 Jan 2013 19:31:07 +0000 (11:31 -0800)]
am
d0f81466: am
69c89942: Merge "Add stack canaries / strcpy tests."
* commit '
d0f81466e4e8e4179054a484cf6145efedfd7cb5':
Add stack canaries / strcpy tests.
Nick Kralevich [Fri, 11 Jan 2013 19:26:54 +0000 (11:26 -0800)]
am
69c89942: Merge "Add stack canaries / strcpy tests."
* commit '
69c89942db2ed472c71aa84903d0259cc84aa074':
Add stack canaries / strcpy tests.
Nick Kralevich [Fri, 11 Jan 2013 19:03:40 +0000 (11:03 -0800)]
Merge "Add stack canaries / strcpy tests."
Wink Saville [Fri, 11 Jan 2013 18:54:50 +0000 (10:54 -0800)]
am
801aeefe: am
a12c5445: Fix unused warnings in pthread.c
* commit '
801aeefe2d77a957172c3994f1c20cd0ac8d9bd8':
Fix unused warnings in pthread.c
Elliott Hughes [Fri, 11 Jan 2013 18:54:43 +0000 (10:54 -0800)]
am
0f9be1ea: am
bfde0b6f: Merge "glibc 2.15 treats errno as signed in strerror(3)."
* commit '
0f9be1eaee5a9367fb2f8c6ed86ed2fc1faa70b9':
glibc 2.15 treats errno as signed in strerror(3).
Elliott Hughes [Fri, 11 Jan 2013 18:54:25 +0000 (10:54 -0800)]
am
34c7a3c2: am
0d3700d9: Merge "Only have one copy of the kernel_sigset_t hack, and add more tests."
* commit '
34c7a3c2b0ec50a749e25bd786e670025a6f1c5b':
Only have one copy of the kernel_sigset_t hack, and add more tests.
Elliott Hughes [Fri, 11 Jan 2013 18:54:02 +0000 (10:54 -0800)]
am
4ff6fa97: am
2bbb8fac: Merge "Add signalfd call to bionic"
* commit '
4ff6fa97e7cf247e17600cf0d64911c1579df841':
Add signalfd call to bionic
Nick Kralevich [Fri, 11 Jan 2013 01:12:29 +0000 (17:12 -0800)]
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
Wink Saville [Fri, 11 Jan 2013 18:12:12 +0000 (10:12 -0800)]
am
a12c5445: Fix unused warnings in pthread.c
* commit '
a12c54454f3a6132988b68873903f6e9eed7f384':
Fix unused warnings in pthread.c
Wink Saville [Tue, 8 Jan 2013 23:15:45 +0000 (15:15 -0800)]
Fix unused warnings in pthread.c
Change-Id: I0287aadb825fd8cda29dc976bce55d75a1279fc5
Elliott Hughes [Fri, 11 Jan 2013 00:27:26 +0000 (16:27 -0800)]
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).
Elliott Hughes [Fri, 11 Jan 2013 00:24:36 +0000 (16:24 -0800)]
Merge "glibc 2.15 treats errno as signed in strerror(3)."
Elliott Hughes [Fri, 11 Jan 2013 00:01:59 +0000 (16:01 -0800)]
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
Elliott Hughes [Thu, 10 Jan 2013 23:28:46 +0000 (15:28 -0800)]
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.
Elliott Hughes [Thu, 10 Jan 2013 23:12:46 +0000 (15:12 -0800)]
Merge "Only have one copy of the kernel_sigset_t hack, and add more tests."
Elliott Hughes [Thu, 10 Jan 2013 22:42:14 +0000 (14:42 -0800)]
Only have one copy of the kernel_sigset_t hack, and add more tests.
Change-Id: I377522fcba6fb4b5fd2754ab15b091014bd7c16f
Robert Greenwalt [Thu, 10 Jan 2013 22:30:36 +0000 (14:30 -0800)]
Merge "Cache negative DNS results."
Elliott Hughes [Thu, 10 Jan 2013 21:30:16 +0000 (13:30 -0800)]
am
2bbb8fac: Merge "Add signalfd call to bionic"
* commit '
2bbb8fac61e482dd96386620cc6f7f193e9c6840':
Add signalfd call to bionic
Elliott Hughes [Thu, 10 Jan 2013 21:17:26 +0000 (13:17 -0800)]
Merge "Add signalfd call to bionic"
Rom Lemarchand [Wed, 9 Jan 2013 23:46:06 +0000 (15:46 -0800)]
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
0c11611c11f4dc1b6d43587b72c3ccbe8c51a51c, modified to
work with older versions of GCC still in use on some branches.)
Change-Id: I4c6c3f12199559af8be63f93a5336851b7e63355
Elliott Hughes [Thu, 10 Jan 2013 18:47:58 +0000 (10:47 -0800)]
Revert "Add signalfd call to bionic"
This reverts commit
0c11611c11f4dc1b6d43587b72c3ccbe8c51a51c
Change-Id: I1a2beae7ed66ec995fdf6c96c53c35598ac6cde0
Rom Lemarchand [Wed, 9 Jan 2013 23:46:06 +0000 (15:46 -0800)]
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
Change-Id: I7ee1d3e60d5d3e1c73d9820e07d23b9ce6e1a5ab
Robert Greenwalt [Mon, 7 Jan 2013 20:10:06 +0000 (12:10 -0800)]
Cache negative DNS results.
Find the TTL for the negative results using the minimum of
the SOA records TTL or the MINIMUM-TTL field (RFC-2308).
bug:
5926539
Change-Id: I6d39c9fb558afcb7a4a5bc014d97dab4a85c0d4f
Elliott Hughes [Tue, 8 Jan 2013 18:27:20 +0000 (10:27 -0800)]
am
5c5fe07e: am
364d9ee6: Merge "Don\'t test GNU-style ELF hashes on MIPS."
* commit '
5c5fe07e43a20cd28c20bbf7a4a0443062ef144f':
Don't test GNU-style ELF hashes on MIPS.
Elliott Hughes [Tue, 8 Jan 2013 18:27:15 +0000 (10:27 -0800)]
am
79cecbd4: am
7e22db03: Merge "Fix an off-by-one error in the sigset_t function error handling."
* commit '
79cecbd42187c13cfdb5462c93de42168e56f49b':
Fix an off-by-one error in the sigset_t function error handling.
Elliott Hughes [Tue, 8 Jan 2013 18:27:14 +0000 (10:27 -0800)]
am
2458d06f: am
26c5b2d4: Merge "[MIPS] Rewrite fenv.h for Android"
* commit '
2458d06fc17ade76a8e2ae980a1e38f36350c6ee':
[MIPS] Rewrite fenv.h for Android
Elliott Hughes [Mon, 7 Jan 2013 23:00:28 +0000 (15:00 -0800)]
am
364d9ee6: Merge "Don\'t test GNU-style ELF hashes on MIPS."
* commit '
364d9ee62f583bca795a2b40f71a04e272c80389':
Don't test GNU-style ELF hashes on MIPS.
Elliott Hughes [Mon, 7 Jan 2013 22:46:13 +0000 (14:46 -0800)]
Merge "Don't test GNU-style ELF hashes on MIPS."
Elliott Hughes [Mon, 7 Jan 2013 22:18:22 +0000 (14:18 -0800)]
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
Elliott Hughes [Mon, 7 Jan 2013 22:21:26 +0000 (14:21 -0800)]
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.
Elliott Hughes [Mon, 7 Jan 2013 22:11:43 +0000 (14:11 -0800)]
Merge "Fix an off-by-one error in the sigset_t function error handling."
Elliott Hughes [Mon, 7 Jan 2013 21:58:49 +0000 (13:58 -0800)]
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
Elliott Hughes [Mon, 7 Jan 2013 21:48:55 +0000 (13:48 -0800)]
am
26c5b2d4: Merge "[MIPS] Rewrite fenv.h for Android"
* commit '
26c5b2d460e3b2595eb7f0605edcd02753a13594':
[MIPS] Rewrite fenv.h for Android
Elliott Hughes [Mon, 7 Jan 2013 21:30:58 +0000 (13:30 -0800)]
Merge "[MIPS] Rewrite fenv.h for Android"
Raghu Gandham [Sat, 5 Jan 2013 00:29:14 +0000 (16:29 -0800)]
[MIPS] Rewrite fenv.h for Android
Change-Id: I4d1e2f0b37b587426ccc9f26c525ec0d36637c7d
Elliott Hughes [Fri, 4 Jan 2013 01:05:12 +0000 (17:05 -0800)]
am
ec137019: am
63dc5927: Merge "Add AF_CAN and PF_CAN (and other missing families)."
* commit '
ec1370191e3f0a8aedb8d77d1cec9a8aa58ebdd3':
Add AF_CAN and PF_CAN (and other missing families).
Elliott Hughes [Fri, 4 Jan 2013 00:59:39 +0000 (16:59 -0800)]
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).
Elliott Hughes [Fri, 4 Jan 2013 00:55:30 +0000 (16:55 -0800)]
Merge "Add AF_CAN and PF_CAN (and other missing families)."
Elliott Hughes [Fri, 4 Jan 2013 00:47:22 +0000 (16:47 -0800)]
am
81508de3: am
f0036944: Merge "Fix debug malloc."
* commit '
81508de3d277db2ef3c8aa55b57ce3ce0a142e48':
Fix debug malloc.
Elliott Hughes [Fri, 4 Jan 2013 00:42:42 +0000 (16:42 -0800)]
am
f0036944: Merge "Fix debug malloc."
* commit '
f0036944a13a76dddda70347032128d4a27081d6':
Fix debug malloc.
Elliott Hughes [Fri, 4 Jan 2013 00:25:47 +0000 (16:25 -0800)]
Add AF_CAN and PF_CAN (and other missing families).
Change-Id: I2c183a6f5f7a7e81e87dad85d8c9aff9c43ed33a
Elliott Hughes [Fri, 4 Jan 2013 00:20:01 +0000 (16:20 -0800)]
Merge "Fix debug malloc."
Elliott Hughes [Thu, 3 Jan 2013 23:44:03 +0000 (15:44 -0800)]
Fix debug malloc.
...which has been broken since the linker data structures went read-only.
Bug:
7941716
Change-Id: If28f6bac0fcb13e371e4d85b064544f561c8d692
Elliott Hughes [Thu, 3 Jan 2013 20:10:17 +0000 (12:10 -0800)]
am
c654f4fd: am
b1b53177: Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."
* commit '
c654f4fda8f1b38109669cf0f5cb8a7d43860974':
sysconf.c was renamed to sysconf.cpp (and modified)...
Elliott Hughes [Thu, 3 Jan 2013 20:04:48 +0000 (12:04 -0800)]
am
b1b53177: Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."
* commit '
b1b5317799a34ac9e93f568af82952e52a9e9a13':
sysconf.c was renamed to sysconf.cpp (and modified)...
Elliott Hughes [Thu, 3 Jan 2013 19:54:56 +0000 (11:54 -0800)]
Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."
Elliott Hughes [Thu, 3 Jan 2013 19:53:35 +0000 (11:53 -0800)]
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
Elliott Hughes [Thu, 3 Jan 2013 00:35:08 +0000 (16:35 -0800)]
am
1287d106: am
fb62558b: Merge "Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK)."
* commit '
1287d106ed235e7366912bc7ab09df532848dd7a':
Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK).
Elliott Hughes [Wed, 2 Jan 2013 23:55:42 +0000 (15:55 -0800)]
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).
Elliott Hughes [Wed, 2 Jan 2013 23:51:15 +0000 (15:51 -0800)]
Merge "Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK)."
Elliott Hughes [Wed, 2 Jan 2013 22:23:43 +0000 (14:23 -0800)]
Define _POSIX_MONOTONIC_CLOCK and implement sysconf(_SC_MONOTONIC_CLOCK).
Bug: http://code.google.com/p/android/issues/detail?id=39680
Change-Id: I11cf10a66f9d305868a725f04f581099fb88bbfc
Elliott Hughes [Fri, 28 Dec 2012 17:48:19 +0000 (09:48 -0800)]
am
c0c05ff8: am
918d776f: Merge "Support System.loadLibrary for libraries with transitive dependencies."
* commit '
c0c05ff8ecfe5f27aedcd6315e191245aa7b4824':
Support System.loadLibrary for libraries with transitive dependencies.
Elliott Hughes [Fri, 28 Dec 2012 17:46:53 +0000 (09:46 -0800)]
am
df5c77c9: am
f6524f8b: Merge "Fix format_number."
* commit '
df5c77c91a276a79d05f58241df3695b56422d54':
Fix format_number.
Elliott Hughes [Sat, 22 Dec 2012 01:54:07 +0000 (17:54 -0800)]
am
918d776f: Merge "Support System.loadLibrary for libraries with transitive dependencies."
* commit '
918d776f7edf1a9c4209ada4c2401ef0ea0bf660':
Support System.loadLibrary for libraries with transitive dependencies.
Elliott Hughes [Sat, 22 Dec 2012 01:46:22 +0000 (17:46 -0800)]
Merge "Support System.loadLibrary for libraries with transitive dependencies."