Christopher Ferris
b39599286d
Merge "Do not clear tids on detached threads."
2013-12-07 16:38:09 +00:00
Christopher Ferris
101fb7d963
Do not clear tids on detached threads.
...
Make sure that the kernel isn't going to try and clear the tid of
freed memory.
Bug: 11963327
Change-Id: I95d02340bfbe92f56036d2cc58dbf0e3079eb7c3
2013-12-06 23:00:44 -08:00
The Android Open Source Project
3377165387
Merge commit '04b4339ad5396690329877df10fbe568bd4dd600' into HEAD
2013-12-05 12:37:57 -08:00
Christopher Ferris
6afe8ab753
Merge "Add strcmp/memcmp testing."
2013-12-04 19:08:16 +00:00
Christopher Ferris
e5bbb6b6ab
Add strcmp/memcmp testing.
...
Bug: 9797008
Change-Id: I11b1da060d29f7dacbb53f20a3e2082395b5bd8a
2013-12-03 18:42:41 -08:00
Christopher Ferris
0b4246b561
Merge "Add cfi directives to all arm assembly."
2013-12-03 20:28:09 +00:00
Christopher Ferris
ed45970ac5
Add cfi directives to all arm assembly.
...
Since the ENTRY/END macros now have .cfi_startproc/.cfi_endproc, most of the
custom arm assembly has no unwind information. Adding the proper cfi directives
for these and removing the arm directives.
Update the gensyscalls.py script to add these cfi directives for the generated
assembly. Also fix the references to non-uapi headers to the proper uapi
header.
In addition, remove the kill.S, tkill.S, tgkill.S for arm since they are not
needed at all. The unwinder (libunwind) is able to properly unwind using the
normal abort.
After this change, I can unwind through the system calls again.
Bug: 11559337
Bug: 11825869
Bug: 11321283
Change-Id: I18b48089ef2d000a67913ce6febc6544bbe934a3
2013-12-02 19:13:12 -08:00
Elliott Hughes
ab0b0cdf1b
Merge "Finish <sys/user.h>."
2013-11-27 04:51:35 +00:00
Elliott Hughes
ab797cb4fd
Finish <sys/user.h>.
...
Change-Id: I1d97d7fa3d5be2ff4728571ed5376705a27091ec
2013-11-26 17:57:31 -08:00
Elliott Hughes
98c910fb21
Merge "Fix the order of arguments to sys_clone for x86."
2013-11-27 00:34:44 +00:00
Elliott Hughes
99c393dff3
Fix the order of arguments to sys_clone for x86.
...
Unlike x86-64, x86's arguments are just like every other
architecture's.
Change-Id: Ic6da23f2a70599683b68e7e12ab9ba061e0b349c
2013-11-26 16:20:50 -08:00
Elliott Hughes
6ae2f22dc0
Merge "Work around CLONE_SETTLS being weird on x86."
2013-11-26 22:36:38 +00:00
Elliott Hughes
80906141f7
Work around CLONE_SETTLS being weird on x86.
...
Unlike other architectures, on x86 (but not x86-64), CLONE_SETTLS
takes a pointer to a struct user_desc instead of a pointer to the
TLS itself. Rather than have to deal with this here, let's just use
the old __set_tls mechanism we used to use (and still use for the
main thread on all architectures, so it's not going away any time
soon).
Bug: 11826724
Change-Id: I02a27939a73ae6cea1134a3f4c1dd7eafea479da
2013-11-26 13:57:21 -08:00
Elliott Hughes
1c057607d8
Merge "Fix _exit_with_stack_teardown for x86."
2013-11-26 21:51:48 +00:00
Elliott Hughes
9dec707bd6
Fix _exit_with_stack_teardown for x86.
...
Change-Id: Ife8f9c538c86f7c0017143015d5ee849a99b625b
2013-11-26 13:48:24 -08:00
Elliott Hughes
a98fff25c3
Merge "Make <sys/timerfd.h> standalone."
2013-11-25 22:00:10 +00:00
Elliott Hughes
e96d4bffe5
Make <sys/timerfd.h> standalone.
...
There's no uapi timerfd.h.
Bug: 11559337
Change-Id: I77a4b1365fdcf2c9f18673b11341a165e54b4bbd
2013-11-25 13:58:38 -08:00
Elliott Hughes
5a52bd34f1
Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
2013-11-25 21:56:10 +00:00
Elliott Hughes
c43d16a458
Regenerate the bionic kernel headers to match external/kernel-headers.
...
Bug: 11859767
Change-Id: I3d746188a1c4bdf8db1358521438435d3e63dbac
2013-11-25 13:50:55 -08:00
Christopher Ferris
cda0c61dc7
am 14d6be45: Merge "Delete non-uapi headers."
...
* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
Delete non-uapi headers.
2013-11-24 00:20:23 -08:00
Christopher Ferris
14d6be45b9
Merge "Delete non-uapi headers."
2013-11-24 08:16:25 +00:00
Christopher Ferris
dd1d4f1cfd
am 985c3fbb: Merge "Move arm user.h definitions to sys/user.h."
...
* commit '985c3fbb3b1dabfa799e2a8c102867349bcb5a76':
Move arm user.h definitions to sys/user.h.
2013-11-23 08:02:04 -08:00
Christopher Ferris
e5a9200534
Delete non-uapi headers.
...
Update headers and delete non-uapi headers that have been removed from
external/kernel-headers project.
Change-Id: I9ed9632a941095fe1bf3b207bafe1151f00de033
2013-11-23 08:01:25 -08:00
Christopher Ferris
985c3fbb3b
Merge "Move arm user.h definitions to sys/user.h."
2013-11-23 15:59:57 +00:00
Christopher Ferris
363390eaff
Move arm user.h definitions to sys/user.h.
...
There is no uapi user.h file for arm, it was included by accident.
Move the user struct definition into the file to follow the pattern
used by the other architectures.
Change-Id: Ib9cea0deca551c9268382ddd6de9202fd32ef941
2013-11-22 18:00:09 -08:00
Christopher Ferris
038919d37c
am 507f95e2: Merge "Update script to copy in extra generated files."
...
* commit '507f95e22b39fb58b9ffbba38ab593475b926af5':
Update script to copy in extra generated files.
2013-11-22 17:22:10 -08:00
Christopher Ferris
507f95e22b
Merge "Update script to copy in extra generated files."
2013-11-23 01:17:16 +00:00
Christopher Ferris
b4091e69f1
Update script to copy in extra generated files.
...
There are files in generated/asm that simply include asm-generic files. The
script now copies any file in generated/asm that also exists in asm-generic.
Change-Id: I075161c68624e9e9e81797224831988ce02220eb
2013-11-22 17:04:34 -08:00
The Android Open Source Project
f00c938c7f
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
...
Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
2013-11-22 13:38:33 -08:00
Christopher Ferris
a626e4d8bc
am 26f0e54a: Merge "Script to grab uapi headers from android kernel."
...
* commit '26f0e54ae083727ee66ee35531ed00338570d792':
Script to grab uapi headers from android kernel.
2013-11-21 14:22:49 -08:00
Christopher Ferris
26f0e54ae0
Merge "Script to grab uapi headers from android kernel."
2013-11-21 22:20:14 +00:00
Elliott Hughes
50f6b8363e
am fa7b48bf: Merge "Regenerate uapi header files."
...
* commit 'fa7b48bf8753690bd15706a1fe3d23cf5c42782f':
Regenerate uapi header files.
2013-11-21 14:11:39 -08:00
Christopher Ferris
e994d41578
Script to grab uapi headers from android kernel.
...
Change-Id: Ia140e3ab27fbfee6b02f04c085f3e0e351bbe68d
2013-11-21 14:09:54 -08:00
Elliott Hughes
fa7b48bf87
Merge "Regenerate uapi header files."
2013-11-21 22:06:14 +00:00
Elliott Hughes
8cb52b056c
Regenerate uapi header files.
...
Change-Id: Idc934ed8ae17aba3300e4022e9b42177b0907e9d
2013-11-21 13:43:23 -08:00
Elliott Hughes
5e818b3314
am 880d0e6c: Merge "Remove hidden __reboot from header"
...
* commit '880d0e6c64eb49736125648d1539726629308316':
Remove hidden __reboot from header
2013-11-21 12:41:56 -08:00
Elliott Hughes
880d0e6c64
Merge "Remove hidden __reboot from header"
2013-11-21 20:37:26 +00:00
Pavel Chupin
811cba00af
Remove hidden __reboot from header
...
This change is required:
https://android-review.googlesource.com/#/c/70570
Change-Id: Idb991f96a424aa5b0f9e06d9fb787fe8c8530750
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-11-22 00:19:34 +04:00
Elliott Hughes
843367953f
am eec57b37: Merge "Add support for the ternary operator to the header scrubber."
...
* commit 'eec57b370642f1b83285883104f2e778f32eef73':
Add support for the ternary operator to the header scrubber.
2013-11-21 11:34:47 -08:00
Elliott Hughes
eec57b3706
Merge "Add support for the ternary operator to the header scrubber."
2013-11-21 19:30:22 +00:00
Elliott Hughes
1198fd3864
Add support for the ternary operator to the header scrubber.
...
Used in various uapi headers.
Change-Id: Id0f862d2adc7ddc9727e8a29160d5435f8d547c3
2013-11-21 11:12:34 -08:00
Elliott Hughes
cb478f23cc
am d4143c8e: Merge "Fix useconds_t for LP64."
...
* commit 'd4143c8e4cd8b006d8f422883b53684881e0991a':
Fix useconds_t for LP64.
2013-11-21 09:07:15 -08:00
Elliott Hughes
a18a01f553
am 15a64948: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit '15a64948567e6e885f639070fa1cc56900dcbae0':
Remove obsolete kernel/arch-mips headers.
2013-11-21 09:07:14 -08:00
Elliott Hughes
8637bb5345
am b135f6e5: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit 'b135f6e58cc81a6de64c55017d25496003ebe547':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 09:07:13 -08:00
Elliott Hughes
d4143c8e4c
Merge "Fix useconds_t for LP64."
2013-11-21 17:05:04 +00:00
Elliott Hughes
15a6494856
Merge "Remove obsolete kernel/arch-mips headers."
2013-11-21 17:04:44 +00:00
Elliott Hughes
b135f6e58c
Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
2013-11-21 17:04:24 +00:00
Elliott Hughes
9c67d4307c
Fix useconds_t for LP64.
...
Change-Id: I869e60484999c1feda3dcdb86bee5b5373e6b3df
2013-11-21 08:55:46 -08:00
Elliott Hughes
b867fd6825
Remove obsolete kernel/arch-mips headers.
...
Bug: 11559337
Change-Id: I70e205ff1f5acd07fddd7d82367e818b13847acd
2013-11-20 18:09:34 -08:00
Elliott Hughes
70d37e343a
am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."
...
* commit 'ca045a19234a9323ea0e7eccbe3aefd74f9c1bab':
Switch to upstream sleep(3) and usleep(3).
2013-11-20 16:44:59 -08:00
Elliott Hughes
ca045a1923
Merge "Switch to upstream sleep(3) and usleep(3)."
2013-11-21 00:41:30 +00:00
Elliott Hughes
ab61eb366a
Switch to upstream sleep(3) and usleep(3).
...
Also fix the signature of usleep, and the definition of useconds_t which
should be unsigned, as the 'u' in its name implies.
This patch also cleans up the existing FreeBSD hacks by moving the libm
stuff from <sys/cdefs.h> to a libm-private header, and adding comments
about the hacks we use to build FreeBSD source.
Change-Id: Ibe5067a380502df94a0a3a7901969b35411085b6
2013-11-20 16:24:16 -08:00
Elliott Hughes
556c740298
am 39bc7ecd: Merge "Fix <signal.h> for mips uapi."
...
* commit '39bc7ecd45700e9edac0b29d33cc211383ebb107':
Fix <signal.h> for mips uapi.
2013-11-20 12:57:19 -08:00
Elliott Hughes
39bc7ecd45
Merge "Fix <signal.h> for mips uapi."
2013-11-20 20:54:03 +00:00
Elliott Hughes
d8482b6c7e
Fix <signal.h> for mips uapi.
...
Bug: 11559337
Change-Id: I4c6080f162d74ee78c81d698c7b50470b0e09586
2013-11-20 12:51:52 -08:00
Elliott Hughes
004ecb39e1
am db1dec1e: Merge "Clean up pthread_internal_t."
...
* commit 'db1dec1ed4fac8bdb312a53e63ba8afeb3c9dea3':
Clean up pthread_internal_t.
2013-11-19 17:25:54 -08:00
Elliott Hughes
db1dec1ed4
Merge "Clean up pthread_internal_t."
2013-11-20 01:23:33 +00:00
Elliott Hughes
cef3faec0e
Clean up pthread_internal_t.
...
Bug: 11755300
Change-Id: Ib509e8c5ec6b23513aa78b5ac5141d7c34ce2dc8
2013-11-19 17:22:22 -08:00
Elliott Hughes
5cb66cfdc2
Remove the unused arch-x86 and arch-x86-64 kernel headers.
...
x86-64 already used uapi headers, and x86 can too now.
Bug: 11559337
Change-Id: I1196d2500f06ad40f2488b96fc8ccc7e02c7d5c0
2013-11-19 16:57:42 -08:00
Christopher Ferris
3c6d1b8876
am 2a34009f: Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."
...
* commit '2a34009f109a504d3623abf75d7087a0d6474e59':
Add .cfi_startproc/.cfi_endproc to ENTRY/END.
2013-11-19 16:48:20 -08:00
Christopher Ferris
2a34009f10
Merge "Add .cfi_startproc/.cfi_endproc to ENTRY/END."
2013-11-20 00:45:24 +00:00
Christopher Ferris
507cfe2e10
Add .cfi_startproc/.cfi_endproc to ENTRY/END.
...
Bug: 10414953
Change-Id: I711718098b9f3cc0ba8277778df64557e9c7b2a0
2013-11-19 16:31:24 -08:00
Elliott Hughes
f4e03b0365
am bf652a5f: Merge "Provide <sys/user.h>."
...
* commit 'bf652a5f5c1249471cb6a60b5bda5ddf1e94a635':
Provide <sys/user.h>.
2013-11-19 16:25:22 -08:00
Elliott Hughes
bf652a5f5c
Merge "Provide <sys/user.h>."
2013-11-20 00:21:29 +00:00
Elliott Hughes
e888de81df
Provide <sys/user.h>.
...
strace wants this, for example.
Change-Id: Icb4d64bde392abbc091fa3375a4fa19b2707b12c
2013-11-19 15:32:31 -08:00
Elliott Hughes
d5a59aa767
am 1b2d214b: Merge "Clean up forking and cloning."
...
* commit '1b2d214b62ad7bf46f37c79442a69d930aa29027':
Clean up forking and cloning.
2013-11-19 14:12:38 -08:00
Elliott Hughes
1b2d214b62
Merge "Clean up forking and cloning."
2013-11-19 22:09:54 +00:00
Elliott Hughes
36d6188f8c
Clean up forking and cloning.
...
The kernel now maintains the pthread_internal_t::tid field for us,
and __clone was only used in one place so let's inline it so we don't
have to leave such a dangerous function lying around. Also rename
files to match their content and remove some useless #includes.
Change-Id: I24299fb4a940e394de75f864ee36fdabbd9438f9
2013-11-19 14:08:54 -08:00
Narayan Kamath
22b8c53ef6
am 9d70ddc4: Merge "Add test case for 1^NaN"
...
* commit '9d70ddc466ed0bdb36908d69b1fe849904150eb7':
Add test case for 1^NaN
2013-11-19 01:59:28 -08:00
Narayan Kamath
9d70ddc466
Merge "Add test case for 1^NaN"
2013-11-19 09:56:53 +00:00
Elliott Hughes
8154f010a1
am 318e86ed: Merge "bionic: call stdio cleanup on exit"
...
* commit '318e86ed887e04e593f3db9b84b402d5501ced9b':
bionic: call stdio cleanup on exit
2013-11-18 20:05:09 -08:00
Elliott Hughes
318e86ed88
Merge "bionic: call stdio cleanup on exit"
2013-11-19 04:01:55 +00:00
Elliott Hughes
044d4655b7
am 303fe0cb: Merge "Fix pthread_join."
...
* commit '303fe0cb38def66aa438b9caac32e5af298f840a':
Fix pthread_join.
2013-11-18 19:51:34 -08:00
Elliott Hughes
303fe0cb38
Merge "Fix pthread_join."
2013-11-19 03:49:00 +00:00
Elliott Hughes
877ec6d904
Fix pthread_join.
...
Let the kernel keep pthread_internal_t::tid updated, including
across forks and for the main thread. This then lets us fix
pthread_join to only return after the thread has really exited.
Also fix the thread attributes of the main thread so we don't
unmap the main thread's stack (which is really owned by the
dynamic linker and contains things like environment variables),
which fixes crashes when joining with an exited main thread
and also fixes problems reported publicly with accessing environment
variables after the main thread exits (for which I've added a new
unit test).
In passing I also fixed a bug where if the clone(2) inside
pthread_create(3) fails, we'd unmap the child's stack and TLS (which
contains the mutex) and then try to unlock the mutex. Boom! It wasn't
until after I'd uploaded the fix for this that I came across a new
public bug reporting this exact failure.
Bug: 8206355
Bug: 11693195
Bug: https://code.google.com/p/android/issues/detail?id=57421
Bug: https://code.google.com/p/android/issues/detail?id=62392
Change-Id: I2af9cf6e8ae510a67256ad93cad891794ed0580b
2013-11-18 19:48:11 -08:00
Pawit Pornkitprasan
652289942d
bionic: call stdio cleanup on exit
...
As of 61e699a133 , stdio clean up
functions are no longer registered in atexit and must be called
manually via __cleanup.
The issue this fixes is some static binaries linked against bionic
cannot output properly when piped or redirected because the buffer
is not flushed before closing.
This is done by pulling in exit.c (and other dependencies) from
netbsd.
Change-Id: I193e54a6d08900f291550029fe75ce76394d9e22
2013-11-19 09:49:17 +07:00
Christopher Ferris
750668f5ab
am 862faa12: Merge "Pull in cleaned version.h header."
...
* commit '862faa12928038759e1bbdbc394a7d58b560f128':
Pull in cleaned version.h header.
2013-11-18 15:29:38 -08:00
Christopher Ferris
862faa1292
Merge "Pull in cleaned version.h header."
2013-11-18 23:26:59 +00:00
Christopher Ferris
da12e64f17
am be8344bb: Merge "Modify tests for another glibc difference."
...
* commit 'be8344bb068183715f808768341bce7fb69d5a70':
Modify tests for another glibc difference.
2013-11-18 13:38:12 -08:00
Christopher Ferris
be8344bb06
Merge "Modify tests for another glibc difference."
2013-11-18 21:35:21 +00:00
Narayan Kamath
af64dad479
Add test case for 1^NaN
...
Should be 1.
Change-Id: I6cf723a419f51d3bda58286a538774b71276c7b5
2013-11-18 19:00:59 +00:00
Christopher Ferris
e372ec8cf9
Pull in cleaned version.h header.
...
Change-Id: Ia917af9336b63ed5a10147770a8110134cb274cb
2013-11-15 16:29:28 -08:00
Christopher Ferris
cbd85b9cc1
Modify tests for another glibc difference.
...
It turns out that when passing a closed file to getdelim or getline, the
functions in glibc will properly return a failure, but errno might not be
set. Skip the errno check except on bionic.
Change-Id: I8d625f15303d4c2d42e8d28491ea8a368aea4d32
2013-11-15 16:09:44 -08:00
Elliott Hughes
18368fc8e6
am f246c589: Merge "Clean up the pthread_create trampoline."
...
* commit 'f246c589d66e5dc0e3cddc3c37261fb0e3fc67e9':
Clean up the pthread_create trampoline.
2013-11-15 15:31:28 -08:00
Elliott Hughes
f246c589d6
Merge "Clean up the pthread_create trampoline."
2013-11-15 23:27:36 +00:00
Elliott Hughes
e48b68570d
Clean up the pthread_create trampoline.
...
Bug: 8206355
Bug: 11693195
Change-Id: I35cc024d5b6ebd19d1d2e45610db185addaf45df
2013-11-15 14:57:45 -08:00
Christopher Ferris
862c32b4bd
am e39e3a77: Merge "Add new tests for memory/string routines."
...
* commit 'e39e3a77d6e8cf681718a572bc754fd64dfc87ff':
Add new tests for memory/string routines.
2013-11-15 14:51:02 -08:00
Elliott Hughes
5b5248526b
am 645d4269: Merge "Switch pthread_create over to __bionic_clone."
...
* commit '645d4269d323acdcb20d1c31c15dbb4afbb9f46a':
Switch pthread_create over to __bionic_clone.
2013-11-15 14:47:32 -08:00
Christopher Ferris
e39e3a77d6
Merge "Add new tests for memory/string routines."
2013-11-15 22:47:07 +00:00
Elliott Hughes
645d4269d3
Merge "Switch pthread_create over to __bionic_clone."
2013-11-15 22:42:57 +00:00
Elliott Hughes
70b24b1cc2
Switch pthread_create over to __bionic_clone.
...
Bug: 8206355
Bug: 11693195
Change-Id: I04aadbc36c87e1b7e33324b9a930a1e441fbfed6
2013-11-15 14:41:19 -08:00
Christopher Ferris
b687ad3c34
Add new tests for memory/string routines.
...
Create a few generic testing functions to allow any memory/string tests
to be created.
Add alignment tests for memcpy/memset/strcat/strcpy/strlen.
Add an overread test for memcpy/strcat/strcpy/strlen. This test attempts
to verify that the functions do not read past the end of their buffers
(src buffer in the case of src/dst functions).
Bug: 9797008
Change-Id: Ib3223ca1b99e729ae8229adc2d03f4dc3103d97c
2013-11-15 10:36:21 -08:00
Elliott Hughes
04b4339ad5
am 60a67a0c: am 05ec00bf: Merge "[MIPS] Reimplement syscall to invoke the system call directly"
...
* commit '60a67a0c7e44dfc47b9b4271ea4ae2dbf336849a':
[MIPS] Reimplement syscall to invoke the system call directly
2013-11-14 17:07:13 -08:00
Elliott Hughes
60a67a0c7e
am 05ec00bf: Merge "[MIPS] Reimplement syscall to invoke the system call directly"
...
* commit '05ec00bf62ac168c9787a3d0640879ab3e502fe5':
[MIPS] Reimplement syscall to invoke the system call directly
2013-11-14 17:05:10 -08:00
Elliott Hughes
05ec00bf62
Merge "[MIPS] Reimplement syscall to invoke the system call directly"
2013-11-15 01:01:06 +00:00
Chris Dearman
effaa7824d
[MIPS] Reimplement syscall to invoke the system call directly
...
Some MIPS kernels do not correctly restart interrupted system calls that
have been invoked using the indirect syscall (NR_syscall).
The simplest workaround is to handle the indirection in userland and then
call the required system call directly.
Change-Id: I8385399621529db9a52b463c96925f6decaaca30
2013-11-14 16:53:15 -08:00
Elliott Hughes
1b782289f4
am 5a70acd1: am ae5c3dd7: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
...
* commit '5a70acd176a792868a61c94169d5e6c0679202f2':
Remove the mips regdef.h and fpregdef.h old kernel headers.
2013-11-13 16:28:37 -08:00
Elliott Hughes
5a70acd176
am ae5c3dd7: Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
...
* commit 'ae5c3dd73844e6a9e1a14dbf893eab5142902f18':
Remove the mips regdef.h and fpregdef.h old kernel headers.
2013-11-13 16:24:33 -08:00
Elliott Hughes
ae5c3dd738
Merge "Remove the mips regdef.h and fpregdef.h old kernel headers."
2013-11-14 00:18:58 +00:00
Elliott Hughes
007eced93b
Remove the mips regdef.h and fpregdef.h old kernel headers.
...
Bug: 11559337
Change-Id: I6352cac9c4ef425cb21e34d0299223711ec079af
2013-11-13 16:13:01 -08:00
Elliott Hughes
ab894977da
am 3cc7da48: am c4250430: Merge "Add unit tests for pow\'s behavior with NaNs."
...
* commit '3cc7da4838ea5896ff142f447ecb03f62d3e70e6':
Add unit tests for pow's behavior with NaNs.
2013-11-13 15:05:43 -08:00
Elliott Hughes
3cc7da4838
am c4250430: Merge "Add unit tests for pow\'s behavior with NaNs."
...
* commit 'c425043063eae2fa3e8622bf77ef1ab3a805f156':
Add unit tests for pow's behavior with NaNs.
2013-11-13 15:01:31 -08:00
Elliott Hughes
c425043063
Merge "Add unit tests for pow's behavior with NaNs."
2013-11-13 22:57:36 +00:00
Elliott Hughes
6010196355
am e77538d5: am 44cbe94b: Merge "Add a unit test for syscall(2)."
...
* commit 'e77538d570e8a811b09bdcd3c746471d8f74b3de':
Add a unit test for syscall(2).
2013-11-13 13:37:18 -08:00
Elliott Hughes
e77538d570
am 44cbe94b: Merge "Add a unit test for syscall(2)."
...
* commit '44cbe94bba2e7e4b1369c86b11d66d6b60f0e333':
Add a unit test for syscall(2).
2013-11-13 13:33:12 -08:00
Elliott Hughes
6a8f00d49c
Add unit tests for pow's behavior with NaNs.
...
Bug: 11669804
Change-Id: Idfa6527640c8d0c2cf3e5343bf7afe013e237545
2013-11-13 13:29:23 -08:00
Elliott Hughes
44cbe94bba
Merge "Add a unit test for syscall(2)."
2013-11-13 21:29:07 +00:00
Elliott Hughes
e61dc71efc
Add a unit test for syscall(2).
...
Change-Id: Ic7d9735d46711af93c3a1747de7b2eb8cebea094
2013-11-13 13:14:31 -08:00
Elliott Hughes
3cf6d9983c
am 6a7e539c: am 22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."
...
* commit '6a7e539cf1d8ee49fc2b6a11d043ce7962aa2de4':
Add extra regression tests for an already-fixed dynamic linker bug.
2013-11-11 17:06:27 -08:00
Elliott Hughes
6a7e539cf1
am 22ba86ee: Merge "Add extra regression tests for an already-fixed dynamic linker bug."
...
* commit '22ba86ee44867c2d16973fc2f8da3b0f5b58cc5e':
Add extra regression tests for an already-fixed dynamic linker bug.
2013-11-11 17:04:28 -08:00
Elliott Hughes
22ba86ee44
Merge "Add extra regression tests for an already-fixed dynamic linker bug."
2013-11-12 01:01:24 +00:00
Elliott Hughes
2ed710976c
Add extra regression tests for an already-fixed dynamic linker bug.
...
Bug: https://code.google.com/p/android/issues/detail?id=61799
Change-Id: I84af68f8430a06e999297c2e57e06ecb45adf81e
2013-11-11 15:48:06 -08:00
Elliott Hughes
5c56512eeb
am cdd6fdec: am 6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
...
* commit 'cdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869':
Add a temporary uapi/linux/compiler.h until upstream has one.
2013-11-08 15:25:38 -08:00
Elliott Hughes
cdd6fdec6c
am 6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
...
* commit '6768c1ee510a8e93175b54e93cb583f009766eed':
Add a temporary uapi/linux/compiler.h until upstream has one.
2013-11-08 15:22:43 -08:00
Elliott Hughes
6768c1ee51
Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
2013-11-08 23:20:18 +00:00
Elliott Hughes
e9664fea54
am 5b6290bc: am ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
...
* commit '5b6290bcfb47ffb27a66450c9cc3258021e259fa':
Remove the dependency on the non-uapi __kernel_nlink_t.
2013-11-08 15:17:19 -08:00
Elliott Hughes
5b6290bcfb
am ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
...
* commit 'ff5b0fc8f3406c98561e17bd2a6c5433e192f5be':
Remove the dependency on the non-uapi __kernel_nlink_t.
2013-11-08 15:15:18 -08:00
Elliott Hughes
740531354e
Add a temporary uapi/linux/compiler.h until upstream has one.
...
Bug: 11559337
Change-Id: I205974b1a26e4f85d0e11503afa80669195d211c
2013-11-08 15:13:54 -08:00
Elliott Hughes
ff5b0fc8f3
Merge "Remove the dependency on the non-uapi __kernel_nlink_t."
2013-11-08 23:12:36 +00:00
Elliott Hughes
2ecc164ae9
Remove the dependency on the non-uapi __kernel_nlink_t.
...
The kernel doesn't have an nlink_t; it just uses the equivalent of
uint32_t. We already had a usable __nlink_t in the C library, so
let's just define our nlink_t in terms of __nlink_t, which is what
__nlink_t was meant for anyway.
Note that our struct stat just follows the kernel, and doesn't refer
to nlink_t anyway.
Change-Id: I2a56e418e42404b1741b08c50554b03c11caebae
2013-11-08 14:38:12 -08:00
Elliott Hughes
26d8853ab5
am cac7eec5: am 68723453: Merge "Generate the uapi headers for mips and x86/x86_64."
...
* commit 'cac7eec55a4853abfcd5b8d7bce35d79ab330132':
Generate the uapi headers for mips and x86/x86_64.
2013-11-08 14:23:38 -08:00
Elliott Hughes
cac7eec55a
am 68723453: Merge "Generate the uapi headers for mips and x86/x86_64."
...
* commit '68723453ac920004fcba2a820c2d56919a5b7081':
Generate the uapi headers for mips and x86/x86_64.
2013-11-08 14:20:59 -08:00
Elliott Hughes
68723453ac
Merge "Generate the uapi headers for mips and x86/x86_64."
2013-11-08 22:18:46 +00:00
Elliott Hughes
abd626117c
Generate the uapi headers for mips and x86/x86_64.
...
Bug: 11559337
Change-Id: I23b1a43e7bfa8fa6f9df7e59d2e731a0ec52dafc
2013-11-08 11:46:03 -08:00
Elliott Hughes
b92de38170
am 99a38fcf: am 486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."
...
* commit '99a38fcf33d220524e41979a3f9d842399fd638d':
Prepare to switch to the uapi <linux/signal.h>.
2013-11-07 12:45:33 -08:00
Elliott Hughes
99a38fcf33
am 486c8616: Merge "Prepare to switch to the uapi <linux/signal.h>."
...
* commit '486c8616ac030b14d37d364a0ed541c4c6c90716':
Prepare to switch to the uapi <linux/signal.h>.
2013-11-07 12:43:22 -08:00
Elliott Hughes
486c8616ac
Merge "Prepare to switch to the uapi <linux/signal.h>."
2013-11-07 20:41:19 +00:00
Elliott Hughes
61fb3fc770
Prepare to switch to the uapi <linux/signal.h>.
...
<time.h> didn't need to copy the cruft from <signal.h>, and
<signal.h> only needs the uid_t hack when it's not using
uapi headers.
pthread_exit.cpp should include what it uses.
Change-Id: I836c36abe0f0a781d41fc425b249d1c7686bb124
2013-11-07 12:29:07 -08:00
Elliott Hughes
81c24a1a49
am c9c84992: am 266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."
...
* commit 'c9c84992fb9ccbf32580c93967356383f58d9687':
Stop using the non-uapi <linux/err.h> header file.
2013-11-07 10:48:29 -08:00
Elliott Hughes
c9c84992fb
am 266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."
...
* commit '266eb4a44c4cdd9502980511ff2846fde5c66454':
Stop using the non-uapi <linux/err.h> header file.
2013-11-07 10:46:37 -08:00
Elliott Hughes
266eb4a44c
Merge "Stop using the non-uapi <linux/err.h> header file."
2013-11-07 18:44:49 +00:00
Elliott Hughes
ed74484dcb
Stop using the non-uapi <linux/err.h> header file.
...
We only need it for MAX_ERRNO, and it's time we had somewhere to put
the little assembler utility macros we've been putting off writing.
Change-Id: I9354d2e0dc47c689296a34b5b229fc9ba75f1a83
2013-11-07 10:31:05 -08:00
Elliott Hughes
2a6e13064f
am 6fc4a1cd: am a034e1d3: Merge "Remove pathconf\'s dependencies on non-uapi header files."
...
* commit '6fc4a1cd3aecca409766e82d333f9cb127a85593':
Remove pathconf's dependencies on non-uapi header files.
2013-11-06 17:38:12 -08:00
Elliott Hughes
6fc4a1cd3a
am a034e1d3: Merge "Remove pathconf\'s dependencies on non-uapi header files."
...
* commit 'a034e1d3e06207f079e814101bb3bce1924264e0':
Remove pathconf's dependencies on non-uapi header files.
2013-11-06 17:35:36 -08:00
Elliott Hughes
a034e1d3e0
Merge "Remove pathconf's dependencies on non-uapi header files."
2013-11-07 01:32:27 +00:00
Elliott Hughes
07ddeb0901
am dc9b54c1: am f945732e: Merge "Fix a TODO; we\'ve had SOCK_CLOEXEC for a while now."
...
* commit 'dc9b54c11c3b20fe5d1dc5c591ff058788e7b376':
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
2013-11-06 17:21:35 -08:00
Elliott Hughes
7250d2e5b4
Remove pathconf's dependencies on non-uapi header files.
...
Change-Id: I597996e4b141b009916f7ad2866dd100e08aa4d3
2013-11-06 17:21:09 -08:00
Elliott Hughes
dc9b54c11c
am f945732e: Merge "Fix a TODO; we\'ve had SOCK_CLOEXEC for a while now."
...
* commit 'f945732e21e3c1291943d21fa5fee0c43792bbec':
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
2013-11-06 17:19:30 -08:00
Elliott Hughes
f945732e21
Merge "Fix a TODO; we've had SOCK_CLOEXEC for a while now."
2013-11-07 01:16:48 +00:00
Elliott Hughes
a4e281a549
am 76833a7c: am 9e63e03d: Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
...
* commit '76833a7c575ca372b41cb6e2a964918d69fc0dbe':
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
2013-11-06 17:07:35 -08:00
Elliott Hughes
76833a7c57
am 9e63e03d: Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
...
* commit '9e63e03d34fc0b4d87cff047a4bc55f8ebc5e12a':
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
2013-11-06 17:05:46 -08:00
Elliott Hughes
9be07fa527
Fix a TODO; we've had SOCK_CLOEXEC for a while now.
...
Change-Id: I4bc39b57f3c33441ead74127f576bf5a4e311566
2013-11-06 17:04:56 -08:00
Elliott Hughes
9e63e03d34
Merge "Clean up the 32-bit kernel support, fix LP64 fcntl declaration."
2013-11-07 01:02:55 +00:00
Elliott Hughes
062092543f
Clean up the 32-bit kernel support, fix LP64 fcntl declaration.
...
In practice, thanks to all the registers the stubs don't actually change,
but it's confusing to have an incorrect declaration.
I suspect that fcntl remains broken for aarch64; it happens to work for
x86_64 because the first vararg argument gets placed in the right register
anyway, but I have no reason to believe that's true for aarch64.
This patch adds a unit test, though, so we'll be able to tell when we get
as far as running the unit tests.
Change-Id: I58dd0054fe99d7d51d04c22781d8965dff1afbf3
2013-11-06 16:33:39 -08:00
Ben Cheng
64aca718ee
am 99205dc9: am af10f9e9: Merge "Add processed uapi kernel headers for ARM."
...
* commit '99205dc987735e1d57f2e1b8446448f655808ab5':
Add processed uapi kernel headers for ARM.
2013-11-06 16:10:15 -08:00
Elliott Hughes
c606294b93
am 3721a7e7: am 7115c802: Merge "Fix pread/pwrite for LP64."
...
* commit '3721a7e71fc831f6d58b7253627043d0658ad977':
Fix pread/pwrite for LP64.
2013-11-06 16:10:14 -08:00
Elliott Hughes
a047e0ab51
am afc51b92: am c4dbc16e: Merge "Make cpp.py less braindead."
...
* commit 'afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
Make cpp.py less braindead.
2013-11-06 16:10:12 -08:00
Ben Cheng
99205dc987
am af10f9e9: Merge "Add processed uapi kernel headers for ARM."
...
* commit 'af10f9e927ed22c8bccc80919e10df4d5f4aecdd':
Add processed uapi kernel headers for ARM.
2013-11-06 15:58:39 -08:00
Ben Cheng
af10f9e927
Merge "Add processed uapi kernel headers for ARM."
2013-11-06 23:55:25 +00:00
Ben Cheng
a6b53f03c7
Add processed uapi kernel headers for ARM.
...
Change-Id: Id34de841b7b4b5a1bf7d22eb793860f92f24a6e5
2013-11-06 15:51:05 -08:00
Elliott Hughes
3721a7e71f
am 7115c802: Merge "Fix pread/pwrite for LP64."
...
* commit '7115c80231aa88272294076c8775c09727ece85a':
Fix pread/pwrite for LP64.
2013-11-06 14:26:58 -08:00
Elliott Hughes
7115c80231
Merge "Fix pread/pwrite for LP64."
2013-11-06 22:25:17 +00:00
Elliott Hughes
8fbf8deb34
Fix pread/pwrite for LP64.
...
Unlike on 32-bit systems where off_t is 32-bit, we don't want to
throw away the top 32 bits of an LP64 system's 64-bit off_t.
Change-Id: Ib2e0daeb4fc0b8ab3d1b983d0b371d8f81033b50
2013-11-06 13:10:37 -08:00
Elliott Hughes
afc51b92a0
am c4dbc16e: Merge "Make cpp.py less braindead."
...
* commit 'c4dbc16eb03bcc0a3ea04cd32ce7551ad94b2bfc':
Make cpp.py less braindead.
2013-11-06 12:34:22 -08:00
Elliott Hughes
c4dbc16eb0
Merge "Make cpp.py less braindead."
2013-11-06 20:31:10 +00:00
Elliott Hughes
40596aa005
Make cpp.py less braindead.
...
The old code ignored operator precedence (!), despite having two tables
of operator precedence. The code's still pretty awful, but I've cleaned
it up enough to fix this, the most important bug.
This patch lets us correctly clean the uapi unistd.h, stat.h, and swab.h files,
and also fixes the mess we were already making of various old kernel
header files. I've added a bunch more tests, fixed the existing tests that
the existing script was already failing (!), and changed the script so that
the tests are run every time the script is run.
We can probably remove some of the old kernel header files that we were
parsing incorrectly, but we can worry about that later.
Bug: 11253477
Change-Id: Ie66c65b3a7ae13b4e98ed8038a6a534f06eae0e5
2013-11-06 12:04:48 -08:00
Elliott Hughes
c76ba85e16
am ffe06880: am f1258672: Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
...
* commit 'ffe068808909c9825807dbaf8679b9f9efc2c690':
Fix <sys/select.h> for LP64, clean up <time.h>.
2013-11-05 14:01:49 -08:00
Elliott Hughes
ffe0688089
am f1258672: Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
...
* commit 'f1258672d1eed41da30612a70690c19ff1966b73':
Fix <sys/select.h> for LP64, clean up <time.h>.
2013-11-05 13:58:18 -08:00
Elliott Hughes
f1258672d1
Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
2013-11-05 21:54:38 +00:00
Elliott Hughes
3503ce2177
Fix <sys/select.h> for LP64, clean up <time.h>.
...
The 64-bit uapi headers don't define FD_CLR and friends, so this
patch updates libc/kernel/common/linux/time.h after the change
b934bbec145e9e084bf48149a3a94ae3dd132157 in external/kernel-headers,
then fixes <sys/select.h> to work in this new world, and removes
some now-unnecessary duplication from <time.h> (with other cruft
cleaned up while I'm here).
Change-Id: Ifd26f901b4d200c65065b3e6ef1b74055127e052
2013-11-05 13:28:36 -08:00
Elliott Hughes
a0352c60ec
am 3c5d651c: am 9b9f0d0c: Merge "Remove unnecessary #include."
...
* commit '3c5d651c051e56e7fb48214e334600cd3f361460':
Remove unnecessary #include.
2013-11-05 12:06:58 -08:00
Elliott Hughes
3c5d651c05
am 9b9f0d0c: Merge "Remove unnecessary #include."
...
* commit '9b9f0d0cd05b5249e4b8119a8bd12ec17712b9da':
Remove unnecessary #include.
2013-11-05 12:04:34 -08:00
Elliott Hughes
9b9f0d0cd0
Merge "Remove unnecessary #include."
2013-11-05 20:00:30 +00:00
Elliott Hughes
6fa79c5cf5
Remove unnecessary #include.
...
Change-Id: I99dade0b3803272ee29eba2ad36b0311f8a24c31
2013-11-05 11:59:06 -08:00
Elliott Hughes
748ad3d3f5
am 00889af0: am 943cc1b5: Merge "Refresh libc/kernel/common/linux/uinput.h"
...
* commit '00889af038359e0a7e97384bad25a809e8887857':
Refresh libc/kernel/common/linux/uinput.h
2013-10-31 16:07:39 -07:00
Elliott Hughes
00889af038
am 943cc1b5: Merge "Refresh libc/kernel/common/linux/uinput.h"
...
* commit '943cc1b58892c627f65f44b7f0fcf365048b7364':
Refresh libc/kernel/common/linux/uinput.h
2013-10-31 16:05:50 -07:00
Elliott Hughes
943cc1b588
Merge "Refresh libc/kernel/common/linux/uinput.h"
2013-10-31 23:03:16 +00:00
Scott Anderson
126f66a601
Refresh libc/kernel/common/linux/uinput.h
...
Change-Id: Icd830af5aee63276554ebf7bfe8192965209cc59
Signed-off-by: Scott Anderson <saa@google.com >
2013-10-31 15:45:32 -07:00
Elliott Hughes
2a60b264eb
am 6b69b753: am 4d2ab4c7: Merge "Fix linker crashes during unknown symbol lookup"
...
* commit '6b69b753d7c9820fb4fd7f88a047931c645834c8':
Fix linker crashes during unknown symbol lookup
2013-10-31 15:13:39 -07:00
Elliott Hughes
6b69b753d7
am 4d2ab4c7: Merge "Fix linker crashes during unknown symbol lookup"
...
* commit '4d2ab4c758a8c76193452b139778e90531721930':
Fix linker crashes during unknown symbol lookup
2013-10-31 15:10:25 -07:00
Elliott Hughes
4d2ab4c758
Merge "Fix linker crashes during unknown symbol lookup"
2013-10-31 22:07:00 +00:00
Sergey Melnikov
ebd506c69e
Fix linker crashes during unknown symbol lookup
...
Integration of kernel VDSO into internal bionic data structures using
common functions.
Fix for dl_iterate_phdr function: the function provides incorrect
address of object in case of nonzero virtual and base addresses.
Location in address space of a particular program header should be
calculated using the formula: addr = base_addr + virtual_addr.
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
Change-Id: Ie2ab4257fd456242aab8afed0bd5bd6b29e81d6d
2013-10-31 15:06:20 -07:00
Elliott Hughes
8441e0312c
am 61ec6a62: am cc9b7456: Merge "Move the pthread debugging flags to the right place."
...
* commit '61ec6a621c699d68246a3dfe724fa13f0555ecf4':
Move the pthread debugging flags to the right place.
2013-10-31 14:26:46 -07:00
Elliott Hughes
61ec6a621c
am cc9b7456: Merge "Move the pthread debugging flags to the right place."
...
* commit 'cc9b7456b66b7c7c218a9d1f00d7aef1f5ecf409':
Move the pthread debugging flags to the right place.
2013-10-31 14:25:03 -07:00
Elliott Hughes
cc9b7456b6
Merge "Move the pthread debugging flags to the right place."
2013-10-31 21:23:29 +00:00
Elliott Hughes
66759d6041
Move the pthread debugging flags to the right place.
...
Change-Id: Ie805bd837d1f72cdf1818e056c0baeb0857e4e84
2013-10-31 14:09:39 -07:00
Elliott Hughes
ff9b41de62
am 5ab8d33a: Upgrade to tzdata2013h.
...
* commit '5ab8d33aa64a4ca12172dba92df172f70629874d':
Upgrade to tzdata2013h.
2013-10-31 13:50:33 -07:00
Elliott Hughes
26e9e3c76a
am 1658691e: am 0360e3ab: Merge "<pthread.h> fixes and pthread cleanup."
...
* commit '1658691e0cfe2eb221bee837649de1907a579a0b':
<pthread.h> fixes and pthread cleanup.
2013-10-31 13:43:18 -07:00
Elliott Hughes
5ab8d33aa6
Upgrade to tzdata2013h.
...
From the release notes:
Changes affecting current and future time stamps:
Libya has switched its time zone back to UTC+2 without DST,
instead of UTC+1 with DST. (Thanks to Even Scharning.)
Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
(Thanks to Gwillim Law.)
Changes affecting future time stamps:
Acre and (we guess) western Amazonas will switch from UTC-4 to UTC-5
on 2013-11-10. This affects America/Rio_Branco and America/Eirunepe.
(Thanks to Steffen Thorsen.)
Add entries for DST transitions in Morocco in the year 2038.
This avoids some year-2038 glitches introduced in 2013g.
(Thanks to Yoshito Umaoka for reporting the problem.)
(cherry picked from commit 3df3879bd6 )
Change-Id: Ibdac6cc1db0fe24c62fe68e99d057dface6b6745
2013-10-31 13:41:31 -07:00
Elliott Hughes
1658691e0c
am 0360e3ab: Merge "<pthread.h> fixes and pthread cleanup."
...
* commit '0360e3ab2d21d4b4b3d5590765857bef595c0046':
<pthread.h> fixes and pthread cleanup.
2013-10-31 13:41:00 -07:00
Elliott Hughes
0360e3ab2d
Merge "<pthread.h> fixes and pthread cleanup."
2013-10-31 20:36:48 +00:00
Elliott Hughes
c3f114037d
<pthread.h> fixes and pthread cleanup.
...
<pthread.h> was missing nonnull attributes, noreturn on pthread_exit,
and had incorrect cv qualifiers for several standard functions.
I've also marked the non-standard stuff (where I count glibc rather
than POSIX as "standard") so we can revisit this cruft for LP64 and
try to ensure we're compatible with glibc.
I've also broken out the pthread_cond* functions into a new file.
I've made the remaining pthread files (plus ptrace) part of the bionic code
and fixed all the warnings.
I've added a few more smoke tests for chunks of untested pthread functionality.
We no longer need the libc_static_common_src_files hack for any of the
pthread implementation because we long since stripped out the rest of
the armv5 support, and this hack was just to ensure that __get_tls in libc.a
went via the kernel if necessary.
This patch also finishes the job of breaking up the pthread.c monolith, and
adds a handful of new tests.
Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-31 12:31:16 -07:00
Elliott Hughes
b0b2e29d4e
am 9be24f71: am d0d0b52d: Merge "Remove an obsolete ARM gdb hack."
...
* commit '9be24f71604d4e667bf23d77bb953a29737b3f2d':
Remove an obsolete ARM gdb hack.
2013-10-30 14:42:59 -07:00
Elliott Hughes
9be24f7160
am d0d0b52d: Merge "Remove an obsolete ARM gdb hack."
...
* commit 'd0d0b52da375bfa85947a4257198791f615f18a8':
Remove an obsolete ARM gdb hack.
2013-10-30 14:40:17 -07:00
Elliott Hughes
d0d0b52da3
Merge "Remove an obsolete ARM gdb hack."
2013-10-30 21:37:56 +00:00
Elliott Hughes
b5b97f20a8
Remove an obsolete ARM gdb hack.
...
Experiment shows that the claim in the makefile was false: gdb works fine
setting breakpoints in these functions when compiled without special treatment.
Change-Id: Ibdf4dd5a14d171c954b8c2089daaf28e1c310be9
2013-10-30 14:32:42 -07:00
Elliott Hughes
0f3973bdb5
am 6cf34775: am 47a73363: Merge "Factor out some of the makefile cruft."
...
* commit '6cf34775513859dd48b986162e761aff57df82fb':
Factor out some of the makefile cruft.
2013-10-29 19:18:56 -07:00
Elliott Hughes
6cf3477551
am 47a73363: Merge "Factor out some of the makefile cruft."
...
* commit '47a73363fcdb88811eedbe484720fb08dc30a995':
Factor out some of the makefile cruft.
2013-10-29 19:15:37 -07:00
Elliott Hughes
47a73363fc
Merge "Factor out some of the makefile cruft."
2013-10-30 02:13:34 +00:00
Elliott Hughes
8695949391
am ee99ebbc: am 7a8e20c9: Merge "Explain the sigprocmask in pthread_exit."
...
* commit 'ee99ebbc8f0447880f316a10b2249f813f964172':
Explain the sigprocmask in pthread_exit.
2013-10-29 18:31:06 -07:00
Christopher Ferris
fa088df49e
am 4fbd0277: am f084f7dc: Merge "Fix up failing glibc tests."
...
* commit '4fbd0277aedd9cf1e81648e9a849c52211a65adf':
Fix up failing glibc tests.
2013-10-29 18:31:05 -07:00
Elliott Hughes
2f287bc728
Factor out some of the makefile cruft.
...
I really don't want to add yet another copy for aarch64.
Also sort arm, mips, and x86.
Also silence the "TARGET_ARCH_VARIANT" warning for non-ARM; Intel and MIPS
have both complained about it.
Change-Id: I32c592a90c0cf0cdae250d84035b3e4655543781
2013-10-29 16:59:54 -07:00
Elliott Hughes
ee99ebbc8f
am 7a8e20c9: Merge "Explain the sigprocmask in pthread_exit."
...
* commit '7a8e20c9c7c11b0ef11b718f18be5e2df22edc1a':
Explain the sigprocmask in pthread_exit.
2013-10-29 16:31:23 -07:00
Elliott Hughes
7a8e20c9c7
Merge "Explain the sigprocmask in pthread_exit."
2013-10-29 23:29:07 +00:00
Elliott Hughes
2b6e43e00e
Explain the sigprocmask in pthread_exit.
...
Also remove the SIGSEGV special case, which was probably because
hand-written __exit_with_stack_teardown stubs used to try to cause
SIGSEGV if the exit system call returned (which it never does, so
that dead code disappeared).
Also move the sigprocmask into the only case where it's necessary ---
the one where we unmap the stack that would be used by a signal
handler.
Change-Id: Ie40d20c1ae2f5e7125131b6b492cba7a2c6d08e9
2013-10-29 16:11:06 -07:00
Christopher Ferris
4fbd0277ae
am f084f7dc: Merge "Fix up failing glibc tests."
...
* commit 'f084f7dc1e4601f96c44eeb422615d7ac742b2d0':
Fix up failing glibc tests.
2013-10-29 15:35:34 -07:00
Christopher Ferris
f084f7dc1e
Merge "Fix up failing glibc tests."
2013-10-29 22:32:33 +00:00
Christopher Ferris
13613137bc
Fix up failing glibc tests.
...
There is a known bug running clone with the CLONE_VM flag, so for host
create an empty test.
Change the expected output of the stdio test for a glibc difference.
Change the pause test to use ScopedSignalHandler to setup/restore the SIGALRM
handler.
After this, running bionic-unit-tests-glibc passes for all tests.
Bug: 11389824
Change-Id: Ib304eae4164115835a54991dfdca5821ecc3db5e
2013-10-29 14:55:11 -07:00
Elliott Hughes
5abb9b15d1
am 3030157f: am 8e6e7cda: Merge "Update <sys/exec_elf.h> to include EM_AARCH64."
...
* commit '3030157f82e012612ef4c6d999878be2f65116dd':
Update <sys/exec_elf.h> to include EM_AARCH64.
2013-10-29 08:57:41 -07:00
Elliott Hughes
3030157f82
am 8e6e7cda: Merge "Update <sys/exec_elf.h> to include EM_AARCH64."
...
* commit '8e6e7cdadbb4efdeefaa73fe94f7a9a1722745a7':
Update <sys/exec_elf.h> to include EM_AARCH64.
2013-10-29 08:53:53 -07:00
Elliott Hughes
8e6e7cdadb
Merge "Update <sys/exec_elf.h> to include EM_AARCH64."
2013-10-29 15:50:33 +00:00
Elliott Hughes
126405039e
Update <sys/exec_elf.h> to include EM_AARCH64.
...
Upstream added the constant for us.
Change-Id: I197e32d2e5b3fd499d069546ccfcc1d35d65e0a0
2013-10-28 21:28:40 -07:00
Elliott Hughes
bb9a819857
am e89d16d2: am 6e504fda: Merge "AArch64: Add support for AArch64 to stdlib/strtod.c"
...
* commit 'e89d16d24bb9d07856c7cc95464bfae970f4e847':
AArch64: Add support for AArch64 to stdlib/strtod.c
2013-10-28 16:36:46 -07:00
Elliott Hughes
e89d16d24b
am 6e504fda: Merge "AArch64: Add support for AArch64 to stdlib/strtod.c"
...
* commit '6e504fdaff6cb85edca312db56ce79f3477e4db1':
AArch64: Add support for AArch64 to stdlib/strtod.c
2013-10-28 16:27:37 -07:00
Elliott Hughes
8d7297538c
am d4e28c23: am 830de5cb: Merge "AArch64: Autogenerated syscalls for AArch64"
...
* commit 'd4e28c236b592a4968bff354ad7ad192d5a3f36d':
AArch64: Autogenerated syscalls for AArch64
2013-10-28 16:25:47 -07:00
Elliott Hughes
6e504fdaff
Merge "AArch64: Add support for AArch64 to stdlib/strtod.c"
2013-10-28 23:25:27 +00:00
Serban Constantinescu
65ca282ecd
AArch64: Add support for AArch64 to stdlib/strtod.c
...
This patch adds support for AArch64 to strtod.c definitions.
Change-Id: I9491c4371d921c00e73ae169877a9a71225731fb
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com >
2013-10-28 16:24:51 -07:00
Elliott Hughes
d4e28c236b
am 830de5cb: Merge "AArch64: Autogenerated syscalls for AArch64"
...
* commit '830de5cb30ba163f9c34fc87f624d6604adc3232':
AArch64: Autogenerated syscalls for AArch64
2013-10-28 16:23:14 -07:00
Elliott Hughes
61f8f7b510
am 48e0ee8a: am 93b7b819: Merge "AArch64: Add support for AArch64 to the syscall interface"
...
* commit '48e0ee8a0900e820b2fb1bae6347e0d39da62096':
AArch64: Add support for AArch64 to the syscall interface
2013-10-28 16:22:26 -07:00
Elliott Hughes
48e0ee8a09
am 93b7b819: Merge "AArch64: Add support for AArch64 to the syscall interface"
...
* commit '93b7b8191238a8735141ed0f0b1222d8a30be3cc':
AArch64: Add support for AArch64 to the syscall interface
2013-10-28 16:19:59 -07:00
Elliott Hughes
830de5cb30
Merge "AArch64: Autogenerated syscalls for AArch64"
2013-10-28 23:19:46 +00:00
Elliott Hughes
87de1a0154
am 5911e25b: am 07d3c6ce: Merge "Fix the *rand48 functions on LP64."
...
* commit '5911e25bfc8ef3815d0e1ab4f5829ff74a523088':
Fix the *rand48 functions on LP64.
2013-10-28 16:19:02 -07:00
Serban Constantinescu
7f8863dc07
AArch64: Autogenerated syscalls for AArch64
...
This patch adds AArch64 syscalls, autogenerated using:
./libc/tools/gensyscalls.py
Change-Id: I1cc60430423ecb52a35448bf2c358b82136b2f16
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com >
2013-10-28 16:18:42 -07:00
Elliott Hughes
93b7b81912
Merge "AArch64: Add support for AArch64 to the syscall interface"
2013-10-28 23:17:23 +00:00
Elliott Hughes
5911e25bfc
am 07d3c6ce: Merge "Fix the *rand48 functions on LP64."
...
* commit '07d3c6cecc8016577c9dbd827e85154c077604da':
Fix the *rand48 functions on LP64.
2013-10-28 16:16:41 -07:00
Serban Constantinescu
feaa89a1bc
AArch64: Add support for AArch64 to the syscall interface
...
This patch adds support for AArch64 to the syscall interface. The kernel
implementation exports a set of canonical syscalls, therefore some of
the userspace exported syscalls are implemented as stubs based on the
canonical set.
Change-Id: Ia965d71e97769b8be9d7655193fc40303964c4df
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com >
2013-10-28 16:16:34 -07:00
Elliott Hughes
07d3c6cecc
Merge "Fix the *rand48 functions on LP64."
2013-10-28 23:09:49 +00:00
Elliott Hughes
60fd3450bf
Fix the *rand48 functions on LP64.
...
I reported the mrand48 bug upstream, and 'matt' fixed the whole family
of functions!
Change-Id: I07fbc034e86499ce89599c3026a741738fd0cfc0
2013-10-28 15:24:26 -07:00
Elliott Hughes
85d8536f34
am 6ec070a0: am 020bcdae: Merge "Update <sys/exec_elf.h> to get the DF_* flags."
...
* commit '6ec070a01509c3477be6d36cd46b81c9b3876733':
Update <sys/exec_elf.h> to get the DF_* flags.
2013-10-28 15:06:58 -07:00
Elliott Hughes
6ec070a015
am 020bcdae: Merge "Update <sys/exec_elf.h> to get the DF_* flags."
...
* commit '020bcdaef349b6bd82302a0656fdf9aaff30bdb3':
Update <sys/exec_elf.h> to get the DF_* flags.
2013-10-28 15:05:49 -07:00
Elliott Hughes
020bcdaef3
Merge "Update <sys/exec_elf.h> to get the DF_* flags."
2013-10-28 22:03:55 +00:00
Elliott Hughes
74ce45972d
Update <sys/exec_elf.h> to get the DF_* flags.
...
Change-Id: Ia9e785f6b95122f94ee3b01a312db1d5bb91a72e
2013-10-28 14:59:41 -07:00
Elliott Hughes
92c6e988cd
am 224aee2f: am 486d99f0: Merge "Don\'t allow text relocations on 64-bit."
...
* commit '224aee2f5cebcccf832c8a204163192bc752c5a1':
Don't allow text relocations on 64-bit.
2013-10-28 14:41:45 -07:00
Elliott Hughes
224aee2f5c
am 486d99f0: Merge "Don\'t allow text relocations on 64-bit."
...
* commit '486d99f050a609c16641614edc72d71746ce859a':
Don't allow text relocations on 64-bit.
2013-10-28 14:39:05 -07:00
Elliott Hughes
486d99f050
Merge "Don't allow text relocations on 64-bit."
2013-10-28 21:36:23 +00:00
Elliott Hughes
e4d792adb8
Don't allow text relocations on 64-bit.
...
I've also updated our <sys/exec_elf.h> to match upstream.
Change-Id: I52f9fce3167541811208d273ff23ceaa112f7135
2013-10-28 14:34:56 -07:00
Elliott Hughes
d1c7766aea
am e9f6c480: am 3ec5d895: Merge "Fix utime/utimes when passed a NULL pointer."
...
* commit 'e9f6c4800816df3acec0d5683667b5aac290f049':
Fix utime/utimes when passed a NULL pointer.
2013-10-28 13:34:32 -07:00
Elliott Hughes
e9f6c48008
am 3ec5d895: Merge "Fix utime/utimes when passed a NULL pointer."
...
* commit '3ec5d8954b41f2e51d6ff7851533f1db1eba9a09':
Fix utime/utimes when passed a NULL pointer.
2013-10-28 13:32:44 -07:00
Elliott Hughes
3ec5d8954b
Merge "Fix utime/utimes when passed a NULL pointer."
2013-10-28 20:29:24 +00:00
Elliott Hughes
27586ebe1a
Fix utime/utimes when passed a NULL pointer.
...
Bug: 11383777
Change-Id: If944a42f3adfa8a6ce91c167c249e009ed63300a
2013-10-28 13:21:06 -07:00
Elliott Hughes
8129a36dc6
am c98827e7: am d4e9f076: Merge "Clean up linker architecture macros."
...
* commit 'c98827e70ab2a3798f2369a4b5a23e3afc18552c':
Clean up linker architecture macros.
2013-10-28 11:08:40 -07:00
Elliott Hughes
c98827e70a
am d4e9f076: Merge "Clean up linker architecture macros."
...
* commit 'd4e9f076d621dcf6450acba178e65d63c076ae6e':
Clean up linker architecture macros.
2013-10-28 11:06:47 -07:00
Elliott Hughes
d4e9f076d6
Merge "Clean up linker architecture macros."
2013-10-28 18:04:22 +00:00
Elliott Hughes
4eeb1f12a8
Clean up linker architecture macros.
...
We don't need our own architecture macros; the standard ones will do.
This patch also fixes some __x86_64__ tests to be USE_RELA tests instead,
because they're not actually x86_64-specific.
I've cleaned up architecture-specific code slightly so where possible
all the code corresponding to a particular architecture is together.
This patch also fixes a bug in LP64 DT_PLTGOT handling, which should be
an error rather than falling through into DT_DEBUG! There was another #ifdef
bug where we'd only report unexpected DT_ entries on MIPS.
Change-Id: Id1d04e372611f641c1aa278a18e379f28af9eaf5
2013-10-28 11:02:49 -07:00
Elliott Hughes
7ef84c7d3d
am d9916301: am f7f6b268: Merge "Upgrade to tzdata2013h."
...
* commit 'd9916301a926c925439efa3cd1bba53e49f10dfc':
Upgrade to tzdata2013h.
2013-10-28 10:03:20 -07:00
Elliott Hughes
d9916301a9
am f7f6b268: Merge "Upgrade to tzdata2013h."
...
* commit 'f7f6b2686d466d695d813593a8b268abdf7ca29d':
Upgrade to tzdata2013h.
2013-10-28 10:01:51 -07:00
Elliott Hughes
f7f6b2686d
Merge "Upgrade to tzdata2013h."
2013-10-28 17:00:16 +00:00
Elliott Hughes
3df3879bd6
Upgrade to tzdata2013h.
...
From the release notes:
Changes affecting current and future time stamps:
Libya has switched its time zone back to UTC+2 without DST,
instead of UTC+1 with DST. (Thanks to Even Scharning.)
Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
(Thanks to Gwillim Law.)
Changes affecting future time stamps:
Acre and (we guess) western Amazonas will switch from UTC-4 to UTC-5
on 2013-11-10. This affects America/Rio_Branco and America/Eirunepe.
(Thanks to Steffen Thorsen.)
Add entries for DST transitions in Morocco in the year 2038.
This avoids some year-2038 glitches introduced in 2013g.
(Thanks to Yoshito Umaoka for reporting the problem.)
Change-Id: Ic855df19773e3fbf13b941b5bfa91dcee9e181e1
2013-10-28 09:38:00 -07:00
Christopher Ferris
a9b95baace
am 763fe341: am 93fcfeee: Merge "Update running bionic unit tests on host."
...
* commit '763fe3419c677e28d209ec319f743d65ff0e69c4':
Update running bionic unit tests on host.
2013-10-25 10:40:26 -07:00
Christopher Ferris
763fe3419c
am 93fcfeee: Merge "Update running bionic unit tests on host."
...
* commit '93fcfeee2b4de4c65fc766bf10601397592341d7':
Update running bionic unit tests on host.
2013-10-25 10:38:41 -07:00
Christopher Ferris
93fcfeee2b
Merge "Update running bionic unit tests on host."
2013-10-25 17:37:02 +00:00
Christopher Ferris
b38e4d536f
Update running bionic unit tests on host.
...
Add a bionic-unit-tests-glibc-run target to run the glibc bionic unit tests.
Modify the bionic-unit-tests-run-on-host to make sure that the /system/bin
directory is created properly.
Also remove the EXTERNAL_STORAGE variable which isn't used any more.
Bug: 11234772
Change-Id: I9aea501d05700b29e938f672474d550b1872a78b
2013-10-25 10:23:12 -07:00
Elliott Hughes
5332746383
am 155f5c5f: am ad8fb26a: Merge "Fix the exit syscall stub\'s name."
...
* commit '155f5c5ff9a86ed5319570ae13cc9a061930b0cb':
Fix the exit syscall stub's name.
2013-10-25 09:29:38 -07:00
Elliott Hughes
155f5c5ff9
am ad8fb26a: Merge "Fix the exit syscall stub\'s name."
...
* commit 'ad8fb26aff16b239fd79fd7223435bdae2462f72':
Fix the exit syscall stub's name.
2013-10-25 09:28:15 -07:00
Elliott Hughes
ad8fb26aff
Merge "Fix the exit syscall stub's name."
2013-10-25 16:25:22 +00:00
Elliott Hughes
fbd6776355
am 6b7fc098: am 421e911a: Merge "Simplify defining the linker architecture macro."
...
* commit '6b7fc098c4f2f9e9683fac119f344e9c890bae1a':
Simplify defining the linker architecture macro.
2013-10-25 09:06:55 -07:00
Elliott Hughes
6b7fc098c4
am 421e911a: Merge "Simplify defining the linker architecture macro."
...
* commit '421e911a0bebd24bf197b092d17a3000cfec2c15':
Simplify defining the linker architecture macro.
2013-10-25 09:04:31 -07:00
Elliott Hughes
421e911a0b
Merge "Simplify defining the linker architecture macro."
2013-10-25 16:01:20 +00:00
Elliott Hughes
60d5b06ece
Simplify defining the linker architecture macro.
...
Like the new TODO says, though, do we need this at all? Wouldn't we be better
off just using the regular architecture-specific macros? This is a dynamic
linker, so there's never a possibility of cross-linking.
Change-Id: I7be6b8663f5e585c4024a49aae383430c86a3c1b
2013-10-24 23:18:13 -07:00
Elliott Hughes
6b53c2349a
Fix the exit syscall stub's name.
...
I've left the exit_group syscall as _exit because otherwise we'd have to
convince the compiler that our _exit (which just calls __exit_group) is
actually "noreturn", and it seems like that would be less clean than just
cutting out the middleman.
We'll just have to trust ourselves not to add anything to SYSCALLS.TXT
that ought to be private but that only has a single leading underscore.
Hopefully we can manage that.
Change-Id: Iac47faea9f516186e1774381846c54cafabc4354
2013-10-24 22:41:50 -07:00
Elliott Hughes
de2df5421d
am fa262c13: am bbefbf1a: Merge "Use hidden visibility for generated stubs whose names begin with underscores."
...
* commit 'fa262c13d9115cd84545ad4a0898d18770702e15':
Use hidden visibility for generated stubs whose names begin with underscores.
2013-10-24 17:26:22 -07:00
Elliott Hughes
fa262c13d9
am bbefbf1a: Merge "Use hidden visibility for generated stubs whose names begin with underscores."
...
* commit 'bbefbf1a75052e4c887309299fb4532705aa843d':
Use hidden visibility for generated stubs whose names begin with underscores.
2013-10-24 17:23:16 -07:00
Elliott Hughes
0a9d0db6b3
am c2404f6c: am d60a625d: Merge "Start moving 32-bit cruft somewhere it won\'t pollute 64-bit."
...
* commit 'c2404f6c1d29a47c0bc6cdf510c91e43f8a1e424':
Start moving 32-bit cruft somewhere it won't pollute 64-bit.
2013-10-24 17:22:35 -07:00
Elliott Hughes
bbefbf1a75
Merge "Use hidden visibility for generated stubs whose names begin with underscores."
2013-10-25 00:20:24 +00:00
Elliott Hughes
c2404f6c1d
am d60a625d: Merge "Start moving 32-bit cruft somewhere it won\'t pollute 64-bit."
...
* commit 'd60a625dd5e544fb49056d864898ff82bca99950':
Start moving 32-bit cruft somewhere it won't pollute 64-bit.
2013-10-24 17:19:54 -07:00
Elliott Hughes
d60a625dd5
Merge "Start moving 32-bit cruft somewhere it won't pollute 64-bit."
2013-10-25 00:18:15 +00:00
Elliott Hughes
567a8de3ca
Start moving 32-bit cruft somewhere it won't pollute 64-bit.
...
Change-Id: I03a6a50a5243f29e50fb58a3cf8b5e7198640baa
2013-10-24 17:14:55 -07:00
Elliott Hughes
fff6e272e9
Use hidden visibility for generated stubs whose names begin with underscores.
...
Change-Id: Idb39fd04b7a14114801624e744e76e0e7913d951
2013-10-24 17:03:20 -07:00
Elliott Hughes
c55f980d23
am 4b832714: am 97288549: Merge "Let the compiler worry about implementing ffs(3)."
...
* commit '4b83271437727fcc2b2400b5c81dc4d3cbb7391e':
Let the compiler worry about implementing ffs(3).
2013-10-24 16:41:34 -07:00
Elliott Hughes
322ae56a95
am 0c4778d8: am a1b9f0d4: Merge "Revert "Don\'t warn about x86 text relocations. They\'re too prevalent.""
...
* commit '0c4778d8a24aa21367a23475e598f51214fb0fc3':
Revert "Don't warn about x86 text relocations. They're too prevalent."
2013-10-24 16:41:32 -07:00
Elliott Hughes
4b83271437
am 97288549: Merge "Let the compiler worry about implementing ffs(3)."
...
* commit '972885499255a9368e96332f9da0d28b2436d042':
Let the compiler worry about implementing ffs(3).
2013-10-24 16:37:27 -07:00
Elliott Hughes
9728854992
Merge "Let the compiler worry about implementing ffs(3)."
2013-10-24 23:35:51 +00:00
Elliott Hughes
bf425680e4
Let the compiler worry about implementing ffs(3).
...
It does at least as good a job as our old hand-written assembly anyway.
Change-Id: If7c4a1ac508bace0b71ee7b67808caa6eabf11d2
2013-10-24 16:29:40 -07:00
Elliott Hughes
0c4778d8a2
am a1b9f0d4: Merge "Revert "Don\'t warn about x86 text relocations. They\'re too prevalent.""
...
* commit 'a1b9f0d4436fea551f641ad02d49610fb5eab0f0':
Revert "Don't warn about x86 text relocations. They're too prevalent."
2013-10-24 16:10:20 -07:00
Elliott Hughes
a1b9f0d443
Merge "Revert "Don't warn about x86 text relocations. They're too prevalent.""
2013-10-24 23:05:24 +00:00
Elliott Hughes
b8b0b6b412
Revert "Don't warn about x86 text relocations. They're too prevalent."
...
This reverts commit 5be2c5998c .
Change-Id: I3fc8ca530cdbd74c834fb9cfabe812c9386419fc
2013-10-24 22:58:28 +00:00
Elliott Hughes
557a5e08c6
am e4ab1b67: am f8dfb6f2: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls."
...
* commit 'e4ab1b6795e325fe346c792e6254592a8db16d4e':
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
2013-10-24 15:56:17 -07:00
Elliott Hughes
e4ab1b6795
am f8dfb6f2: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls."
...
* commit 'f8dfb6f249da6fc9c91cc8b94fa28c19e598faa6':
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
2013-10-24 15:53:10 -07:00
Elliott Hughes
f8dfb6f249
Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls."
2013-10-24 22:49:49 +00:00
Elliott Hughes
11952073af
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
...
(aarch64 kernels don't have these system calls.)
Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-24 15:48:32 -07:00
Ben Cheng
112b7088e7
am 8b113f75: am fcb37b87: Merge "Add __EXPORTED_HEADERS__ as predefined macro."
...
* commit '8b113f75b3e3835da00d0af61f033410fc29a8ca':
Add __EXPORTED_HEADERS__ as predefined macro.
2013-10-23 15:54:04 -07:00
Ben Cheng
8b113f75b3
am fcb37b87: Merge "Add __EXPORTED_HEADERS__ as predefined macro."
...
* commit 'fcb37b876e3589e8a749610cd8228ed9f6020f44':
Add __EXPORTED_HEADERS__ as predefined macro.
2013-10-23 15:50:45 -07:00
Ben Cheng
fcb37b876e
Merge "Add __EXPORTED_HEADERS__ as predefined macro."
2013-10-23 22:47:21 +00:00
Ben Cheng
460fa7033b
Add __EXPORTED_HEADERS__ as predefined macro.
...
To weed out stuff like this in uapi/linux/types.h
ifndef __EXPORTED_HEADERS__
warning "Attempt to use kernel headers from user space, see
http://kernelnewbies.org/KernelHeaders "
endif /* __EXPORTED_HEADERS__ */
Change-Id: I6506cea6248f7a3b44a839b98e91bdd0d3a6c4cd
2013-10-23 14:44:38 -07:00
Elliott Hughes
dc57fe3389
am 7b9aa1a3: am 9098344a: Merge "Don\'t warn about x86 text relocations. They\'re too prevalent."
...
* commit '7b9aa1a3e7fd3e42782b10965b9e5cde6a17b74c':
Don't warn about x86 text relocations. They're too prevalent.
2013-10-23 14:04:07 -07:00
Elliott Hughes
7b9aa1a3e7
am 9098344a: Merge "Don\'t warn about x86 text relocations. They\'re too prevalent."
...
* commit '9098344afe98ace7b9f7af8898c02d267f1335a5':
Don't warn about x86 text relocations. They're too prevalent.
2013-10-23 14:01:58 -07:00
Elliott Hughes
9098344afe
Merge "Don't warn about x86 text relocations. They're too prevalent."
2013-10-23 20:58:38 +00:00
Elliott Hughes
5be2c5998c
Don't warn about x86 text relocations. They're too prevalent.
...
We should fix this (and disallow it for x86_64), but for now let's get CTS
running again.
libdvm.so and libcutils.so are the main problems.
$ scanelf -qT out/target/product/generic_x86/symbols/system/lib/libcutils.so
libcutils.so: (memory/data?) [0x4125] in (optimized out: previous android_memset16) [0x4100]
libcutils.so: (memory/data?) [0x424F] in (optimized out: previous android_memset16) [0x4100]
libcutils.so: (memory/data?) [0x42F8] in (optimized out: previous android_memset16) [0x4100]
libcutils.so: (memory/data?) [0x4349] in (optimized out: previous android_memset16) [0x4100]
libcutils.so: (memory/data?) [0x4406] in (optimized out: previous android_memset16) [0x4100]
libcutils.so: (memory/data?) [0x45AC] in (optimized out: previous android_memset32) [0x4590]
libcutils.so: (memory/data?) [0x4650] in (optimized out: previous android_memset32) [0x4590]
libcutils.so: (memory/data?) [0x46F9] in (optimized out: previous android_memset32) [0x4590]
libcutils.so: (memory/data?) [0x474A] in (optimized out: previous android_memset32) [0x4590]
libcutils.so: (memory/data?) [0x4807] in (optimized out: previous android_memset32) [0x4590]
Bug: 11353056
Change-Id: Id4a76b310be7fe858a8a60d0d260b09913b66be9
2013-10-23 13:45:01 -07:00
Elliott Hughes
977f91f5bf
am ae61f49b: am cdac5f73: Merge "MIPS\' pipe(2) is weird, but MIPS\' pipe2(2) is the same as everyone else\'s."
...
* commit 'ae61f49b130e65997750f4ffb84f22512e055c5f':
MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
2013-10-23 11:33:24 -07:00
Elliott Hughes
c410e75c68
am 0e1faa2e: am 1370854c: Merge "Fix header file dependencies."
...
* commit '0e1faa2e00a4f1d4508b26a6411ac1daa1ce8b6d':
Fix header file dependencies.
2013-10-23 11:33:23 -07:00
Elliott Hughes
ae61f49b13
am cdac5f73: Merge "MIPS\' pipe(2) is weird, but MIPS\' pipe2(2) is the same as everyone else\'s."
...
* commit 'cdac5f73aca015287d1f40ff50d4fbf293a0c549':
MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
2013-10-23 11:30:08 -07:00
Elliott Hughes
0e1faa2e00
am 1370854c: Merge "Fix header file dependencies."
...
* commit '1370854cc0a4aa652213e44d4a8b268fe614c11f':
Fix header file dependencies.
2013-10-23 11:30:07 -07:00
Elliott Hughes
cdac5f73ac
Merge "MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's."
2013-10-23 18:27:35 +00:00
Elliott Hughes
1370854cc0
Merge "Fix header file dependencies."
2013-10-23 18:27:01 +00:00
Elliott Hughes
93de3d881d
Fix header file dependencies.
...
MIPS' asm/fcntl.h assumes a bunch of __kernel_* types are already declared.
Change-Id: Iff701bbb5ede9667a78230c2de3a8f4fe41371c5
2013-10-23 11:25:54 -07:00
Elliott Hughes
b8cf18b4dd
MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
...
arch/mips/kernel/syscall.c has a special sysm_pipe wrapper, but there's
no special treatment of pipe2 because it carries no historical baggage.
Change-Id: I892c0f690b21992c8a48276a9b732126f18fc0ee
2013-10-23 11:21:36 -07:00
Elliott Hughes
623fcf1e98
am db7f8eb0: am 97dc3309: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls."
...
* commit 'db7f8eb011db18c69ec872823906e5f9660deaf7':
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
2013-10-23 10:34:03 -07:00
Elliott Hughes
db7f8eb011
am 97dc3309: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls."
...
* commit '97dc3309f3d403c391581444ad656c2f3c61303d':
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
2013-10-23 10:30:15 -07:00
Elliott Hughes
97dc3309f3
Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls."
2013-10-23 17:26:40 +00:00
Elliott Hughes
cac7b9d6ec
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
...
(aarch64 kernels only have the newer system calls.)
Also expose the new functionality that's exposed by glibc in our header files.
Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5
2013-10-23 09:48:29 -07:00
Elliott Hughes
e514d2fe66
resolved conflicts for merge of 1dbf56aa to klp-dev-plus-aosp
...
Change-Id: Ia1d1467065320941d6dc3a50f7ea85eb4dbf3841
2013-10-22 16:41:42 -07:00
Elliott Hughes
1dbf56aab5
am ec40edc9: Merge "Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls."
...
* commit 'ec40edc9188aebe5207e47c0a66e89e1ed368bd6':
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls.
2013-10-22 16:34:20 -07:00
Elliott Hughes
ec40edc918
Merge "Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls."
2013-10-22 23:32:25 +00:00
Elliott Hughes
f8fcfbc85a
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls.
...
Modern architectures only get the *at(2) system calls. For example,
aarch64 doesn't have open(2), and expects userspace to use openat(2)
instead.
Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 16:31:01 -07:00
Elliott Hughes
0775b1dae8
am 3f0505cc: am f0ed9bf2: Merge "AArch64: Fix definitions for STDINT_LIMITS"
...
* commit '3f0505cc87ff452f79842ab14aef44d0e4e1a2f2':
AArch64: Fix definitions for STDINT_LIMITS
2013-10-22 12:46:55 -07:00
Elliott Hughes
3f0505cc87
am f0ed9bf2: Merge "AArch64: Fix definitions for STDINT_LIMITS"
...
* commit 'f0ed9bf2537e861ae75e6ab71efb4b4722ad0eee':
AArch64: Fix definitions for STDINT_LIMITS
2013-10-22 12:43:35 -07:00
Elliott Hughes
f0ed9bf253
Merge "AArch64: Fix definitions for STDINT_LIMITS"
2013-10-22 19:41:26 +00:00
Serban Constantinescu
debc021491
AArch64: Fix definitions for STDINT_LIMITS
...
This patches fixes the definitions for STDINT_LIMITS on __LP64__
systems.
Change-Id: I5eb1664e9ef7c303432a2b041c99cec663816b75
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com >
2013-10-22 12:40:16 -07:00
Nick Kralevich
52185f37ae
am b8280db7: am 1756f5a4: Merge "change wording on text relocation message."
...
* commit 'b8280db78b9b6db8851f12d26c49d27179d44366':
change wording on text relocation message.
2013-10-22 12:37:03 -07:00
Nick Kralevich
b8280db78b
am 1756f5a4: Merge "change wording on text relocation message."
...
* commit '1756f5a422446237945682c8811587a29d56fdef':
change wording on text relocation message.
2013-10-22 12:32:04 -07:00
Nick Kralevich
1756f5a422
Merge "change wording on text relocation message."
2013-10-22 19:28:50 +00:00
Elliott Hughes
081b40f378
am 550ccc2e: am 8c39e58b: Merge "Make sure we have a mkfifo symbol."
...
* commit '550ccc2e20cb1998a959a7abb24f5ec382a93192':
Make sure we have a mkfifo symbol.
2013-10-22 12:08:51 -07:00
Elliott Hughes
65104ba533
am 9805f3ec: am 23148470: Merge "AArch64: Fix uses of stack size for 32/64bit libc builds"
...
* commit '9805f3ec5b4ebfbe892e79a086c7d23a0bd393cf':
AArch64: Fix uses of stack size for 32/64bit libc builds
2013-10-22 12:08:50 -07:00
Nick Kralevich
3d4470c14a
change wording on text relocation message.
...
The current message is too alarmist.
Change-Id: I53e8eadca239f867b4e6b9c193eba96e267950c3
2013-10-22 12:06:36 -07:00
Elliott Hughes
550ccc2e20
am 8c39e58b: Merge "Make sure we have a mkfifo symbol."
...
* commit '8c39e58b6a6744c5e7ae08424a6281d75af23072':
Make sure we have a mkfifo symbol.
2013-10-22 12:05:23 -07:00
Elliott Hughes
9805f3ec5b
am 23148470: Merge "AArch64: Fix uses of stack size for 32/64bit libc builds"
...
* commit '231484705bea118259200da6019722a026021f4b':
AArch64: Fix uses of stack size for 32/64bit libc builds
2013-10-22 12:05:22 -07:00
Elliott Hughes
8c39e58b6a
Merge "Make sure we have a mkfifo symbol."
2013-10-22 19:03:57 +00:00
Elliott Hughes
594b1a4af2
Make sure we have a mkfifo symbol.
...
Bug: https://code.google.com/p/android/issues/detail?id=58888
Change-Id: Ic0a883a5f30beb82cb7be3c4e81b6d693d5fbb4d
2013-10-22 12:03:19 -07:00
Elliott Hughes
231484705b
Merge "AArch64: Fix uses of stack size for 32/64bit libc builds"
2013-10-22 19:02:29 +00:00
Serban Constantinescu
7f70c9b64e
AArch64: Fix uses of stack size for 32/64bit libc builds
...
This patch fixes stack size uses to size_t.
Change-Id: I0671c85ddb1c1aceaf9440a7c73c21fe528653fa
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com >
2013-10-22 12:01:29 -07:00
Elliott Hughes
5f985ebb1b
am a5826391: am 393484ab: Merge "Fix statvfs tests for the host."
...
* commit 'a5826391e9afafcb688c103282a30254928f61f3':
Fix statvfs tests for the host.
2013-10-21 20:16:54 -07:00
Elliott Hughes
a5826391e9
am 393484ab: Merge "Fix statvfs tests for the host."
...
* commit '393484ab358040243793375e1525da083008e78e':
Fix statvfs tests for the host.
2013-10-21 20:14:07 -07:00
Elliott Hughes
393484ab35
Merge "Fix statvfs tests for the host."
2013-10-22 03:12:24 +00:00
Elliott Hughes
3d305f1d62
Fix statvfs tests for the host.
...
Using /proc seems like a better idea because it's more similar across devices.
I've switched to ensuring we check the initial and final elements in the struct
too, so we have more reason to believe the whole struct is converted correctly.
Change-Id: Ia23403369485747c1452292f6c9df2bb233c04fb
2013-10-21 19:27:19 -07:00
Elliott Hughes
c6557e3c83
am f777c50a: am c284d47c: Merge "Fix the system property tests to use ."
...
* commit 'f777c50a7130271ed6fefa9bd2bae78be998f4b0':
Fix the system property tests to use $ANDROID_DATA.
2013-10-21 17:45:21 -07:00
Elliott Hughes
41c2874138
am dcc3a211: am 9d4b67ea: Merge "Fix 16-byte stack alignment requirement for x86_64 ABI"
...
* commit 'dcc3a211bade2f2413a689c8d273084cac516a72':
Fix 16-byte stack alignment requirement for x86_64 ABI
2013-10-21 17:45:20 -07:00
Elliott Hughes
f777c50a71
am c284d47c: Merge "Fix the system property tests to use ."
...
* commit 'c284d47c57973f7dde1d2f5cc33074050203a5d3':
Fix the system property tests to use $ANDROID_DATA.
2013-10-21 17:42:00 -07:00
Elliott Hughes
dcc3a211ba
am 9d4b67ea: Merge "Fix 16-byte stack alignment requirement for x86_64 ABI"
...
* commit '9d4b67ea16ad62089da4950d1ccc1b078ebe5adb':
Fix 16-byte stack alignment requirement for x86_64 ABI
2013-10-21 17:42:00 -07:00
Elliott Hughes
c284d47c57
Merge "Fix the system property tests to use $ANDROID_DATA."
2013-10-22 00:40:46 +00:00
Elliott Hughes
e4375196d6
Fix the system property tests to use $ANDROID_DATA.
...
This lets them work on the host.
Change-Id: I771ccc67652ae37451b45859c7831116cd830086
2013-10-21 17:40:15 -07:00
Elliott Hughes
9d4b67ea16
Merge "Fix 16-byte stack alignment requirement for x86_64 ABI"
2013-10-22 00:38:37 +00:00
Pavel Chupin
33a209e575
Fix 16-byte stack alignment requirement for x86_64 ABI
...
Change-Id: I43304803ac54c8688c61688bd96c7160614172d4
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-21 17:36:28 -07:00
Elliott Hughes
16ac7c4d97
am 1d8c8b6a: am f4ac8ba5: Merge "Fix the x86_64 vfork implementation."
...
* commit '1d8c8b6a9ef0100f2f17ef1b6f4d145163b22ed0':
Fix the x86_64 vfork implementation.
2013-10-21 14:27:21 -07:00
Elliott Hughes
f1a93bf7da
am 8173b001: am ac5d29fe: Merge "Fix the x86_64 clone implementation."
...
* commit '8173b00125bc0bdeda09d9b9d4f34a2f82b66016':
Fix the x86_64 clone implementation.
2013-10-21 14:27:20 -07:00
Elliott Hughes
1d8c8b6a9e
am f4ac8ba5: Merge "Fix the x86_64 vfork implementation."
...
* commit 'f4ac8ba566d80679ccc346b3b0af4b46d394319b':
Fix the x86_64 vfork implementation.
2013-10-21 14:24:12 -07:00
Elliott Hughes
8173b00125
am ac5d29fe: Merge "Fix the x86_64 clone implementation."
...
* commit 'ac5d29fee838a1b18c3f2d02de146f98a2d95db7':
Fix the x86_64 clone implementation.
2013-10-21 14:24:12 -07:00
Elliott Hughes
f4ac8ba566
Merge "Fix the x86_64 vfork implementation."
2013-10-21 21:20:51 +00:00
Elliott Hughes
ac5d29fee8
Merge "Fix the x86_64 clone implementation."
2013-10-21 21:19:58 +00:00
Elliott Hughes
53bfdae4ff
Fix the x86_64 clone implementation.
...
Change-Id: Ia75f46dcb4d3222049e9a6a6fabc2b17223b47f7
2013-10-18 19:39:09 -07:00
Elliott Hughes
9ea4d5f3a8
Fix the x86_64 vfork implementation.
...
Change-Id: I599507f5058e6196dc2d5b5653d06d5135dd8ac1
2013-10-18 18:21:11 -07:00
Elliott Hughes
68248e2fec
am 013afce9: am a5bab412: Merge "Fix struct statfs for LP64."
...
* commit '013afce94f1195218531f3da6f3e25f4526dddf4':
Fix struct statfs for LP64.
2013-10-18 17:39:18 -07:00
Elliott Hughes
013afce94f
am a5bab412: Merge "Fix struct statfs for LP64."
...
* commit 'a5bab412e0bcb4f9e449d594330819c321cf18ad':
Fix struct statfs for LP64.
2013-10-18 17:37:03 -07:00
Elliott Hughes
a5bab412e0
Merge "Fix struct statfs for LP64."
2013-10-19 00:35:49 +00:00
Elliott Hughes
c7fdee72dd
Fix struct statfs for LP64.
...
Change-Id: I9649d881588931a1d672b65ddcf94009daadb0ef
2013-10-18 17:00:11 -07:00
Elliott Hughes
7d0204b685
am f7de5d57: am 25269b88: Merge "Fix the time unit tests for systems with 64-bit time_t."
...
* commit 'f7de5d57732d67f967243bea5e01f6da6be5f517':
Fix the time unit tests for systems with 64-bit time_t.
2013-10-18 16:59:10 -07:00
Elliott Hughes
f7de5d5773
am 25269b88: Merge "Fix the time unit tests for systems with 64-bit time_t."
...
* commit '25269b88749061ff80e8a97b738e4bf6bc7e829a':
Fix the time unit tests for systems with 64-bit time_t.
2013-10-18 16:57:03 -07:00
Elliott Hughes
25269b8874
Merge "Fix the time unit tests for systems with 64-bit time_t."
2013-10-18 23:53:03 +00:00
Elliott Hughes
0c40152767
Fix the time unit tests for systems with 64-bit time_t.
...
Change-Id: I29df50b25d022c1c00906e71b612defa58e46e81
2013-10-18 16:21:54 -07:00
Elliott Hughes
f00e772b25
am 63e118b7: am d0402acd: Merge "x86_64: Fix bionic tests build-and-run"
...
* commit '63e118b7dbadb49037cd20f8355e27fe4ac20f3b':
x86_64: Fix bionic tests build-and-run
2013-10-18 15:11:33 -07:00
Elliott Hughes
63e118b7db
am d0402acd: Merge "x86_64: Fix bionic tests build-and-run"
...
* commit 'd0402acdc76e1ea412085b3b633f5ae798022350':
x86_64: Fix bionic tests build-and-run
2013-10-18 15:09:12 -07:00
Elliott Hughes
d0402acdc7
Merge "x86_64: Fix bionic tests build-and-run"
2013-10-18 22:07:03 +00:00
Pavel Chupin
17558dec7f
x86_64: Fix bionic tests build-and-run
...
Change-Id: Iab48362893a212afbcbc362fdfaff5bfa5b55259
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-18 15:04:19 -07:00
Elliott Hughes
ceb6832ca0
am 7d604133: am e3cc1555: Merge "Fix some test assumptions that are wrong for __LP64__."
...
* commit '7d604133770ae3d9da84737a527907a94683fe21':
Fix some test assumptions that are wrong for __LP64__.
2013-10-18 13:36:22 -07:00
Elliott Hughes
7d60413377
am e3cc1555: Merge "Fix some test assumptions that are wrong for __LP64__."
...
* commit 'e3cc1555f6e478109cc3b648f41d4039efc0fdcc':
Fix some test assumptions that are wrong for __LP64__.
2013-10-18 13:32:42 -07:00
Elliott Hughes
2fa423f49f
am c54e7b8d: am 79f79c90: Merge "x86_64: Fix sys/stat.h"
...
* commit 'c54e7b8d30e18eb9fd5320f10707fd57cf831576':
x86_64: Fix sys/stat.h
2013-10-18 13:31:41 -07:00
Elliott Hughes
c54e7b8d30
am 79f79c90: Merge "x86_64: Fix sys/stat.h"
...
* commit '79f79c907f03ff71f800ae2b7a4a00dfb64f0538':
x86_64: Fix sys/stat.h
2013-10-18 13:29:18 -07:00
Elliott Hughes
e3cc1555f6
Merge "Fix some test assumptions that are wrong for __LP64__."
2013-10-18 20:28:22 +00:00
Elliott Hughes
79f79c907f
Merge "x86_64: Fix sys/stat.h"
2013-10-18 20:25:09 +00:00
Pavel Chupin
f68fac8c00
x86_64: Fix sys/stat.h
...
Add 64-bit stat structure mapping 64-bit stat syscall.
Change-Id: Ice517616391bee1d556b6c03e7f5ee610050e6c6
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-18 13:24:25 -07:00
Elliott Hughes
925753aa11
Fix some test assumptions that are wrong for __LP64__.
...
Change-Id: Ic79cd5858ceb611640a76bd03f3da4925d3150d9
2013-10-18 13:17:18 -07:00
Elliott Hughes
b13ad7a8be
am b956f3ce: am e9797ac6: Merge "Fix clone.S for x86_64."
...
* commit 'b956f3ce7a9b4d1d8a15d6debcd36f09e2ef4aa6':
Fix clone.S for x86_64.
2013-10-17 22:58:23 -07:00
Elliott Hughes
b956f3ce7a
am e9797ac6: Merge "Fix clone.S for x86_64."
...
* commit 'e9797ac6756481c0c219eb6b99f9062fd6dfb770':
Fix clone.S for x86_64.
2013-10-17 22:56:03 -07:00
Elliott Hughes
e9797ac675
Merge "Fix clone.S for x86_64."
2013-10-18 05:54:28 +00:00
Elliott Hughes
938f38daee
Fix clone.S for x86_64.
...
We need to pull the arguments off the child stack and put them into the
registers they're expected to be in.
Change-Id: I064b3258cdd89d513c632857cabb46e52492af2b
2013-10-17 22:22:31 -07:00
Elliott Hughes
05c33a59b9
am 0c72ebc9: am 8ea34537: Merge "Add missing aliases for off64_t functions in 64-bit land."
...
* commit '0c72ebc9a1836ce9dda6e28e6b8117b4651e7c8e':
Add missing aliases for off64_t functions in 64-bit land.
2013-10-17 21:48:24 -07:00
Elliott Hughes
0c72ebc9a1
am 8ea34537: Merge "Add missing aliases for off64_t functions in 64-bit land."
...
* commit '8ea3453719854fe9eba4cdc32e2b42d904ab1aea':
Add missing aliases for off64_t functions in 64-bit land.
2013-10-17 21:45:28 -07:00
Elliott Hughes
8ea3453719
Merge "Add missing aliases for off64_t functions in 64-bit land."
2013-10-18 04:42:09 +00:00
Elliott Hughes
23eeda6ad9
am 6519d76c: am 88dcfb5e: Merge "Add ffs and memcmp16 to x86_64."
...
* commit '6519d76c2988f59622892966440577955aed9f49':
Add ffs and memcmp16 to x86_64.
2013-10-17 21:38:00 -07:00
Elliott Hughes
6519d76c29
am 88dcfb5e: Merge "Add ffs and memcmp16 to x86_64."
...
* commit '88dcfb5ebaba0b02dac5d096491ea4278b849bb5':
Add ffs and memcmp16 to x86_64.
2013-10-17 21:35:44 -07:00
Elliott Hughes
88dcfb5eba
Merge "Add ffs and memcmp16 to x86_64."
2013-10-18 04:33:29 +00:00
Elliott Hughes
8ca530e559
Add ffs and memcmp16 to x86_64.
...
Change-Id: I652c1356f1c7c52299977181c2cf154386979380
2013-10-17 17:03:22 -07:00
Elliott Hughes
a6519d6306
Add missing aliases for off64_t functions in 64-bit land.
...
See the comment in SYSCALLS.TXT for an explanation.
Change-Id: I33d4056e84160c3cca74b7b588e9924a569753ed
2013-10-17 16:56:40 -07:00
Elliott Hughes
22cf36af18
am 7e12e6af: am 5b191604: Merge "Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags."
...
* commit '7e12e6af56e1cc256ea6d9c2c69d8438e6ca95be':
Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags.
2013-10-17 13:50:12 -07:00
Elliott Hughes
7e12e6af56
am 5b191604: Merge "Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags."
...
* commit '5b1916043728f7f869f1286b6e04662a3d7d472b':
Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags.
2013-10-17 13:47:28 -07:00
Elliott Hughes
5b19160437
Merge "Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags."
2013-10-17 20:44:07 +00:00
Andrei Emeltchenko
43d2137af0
Add SOCK_CLOEXEC and SOCK_NONBLOCK socket flags.
...
SOCK_CLOEXEC is used to atomically set close-on-exec flag for the new
descriptor(s), and SOCK_NONBLOCK is used to mark descriptor(s) as
non-blocking.
Change-Id: I8ba6a70543d23759e3ddcc7ff9c21b567184d681
2013-10-17 13:32:32 -07:00
Elliott Hughes
8c4947ee7f
am 227e95b2: am 70cf2077: Merge "Build the linker with the same -std flags as the rest of bionic."
...
* commit '227e95b2fb861192fb3a2d6368dfddb2558a5e25':
Build the linker with the same -std flags as the rest of bionic.
2013-10-17 13:18:42 -07:00
Elliott Hughes
227e95b2fb
am 70cf2077: Merge "Build the linker with the same -std flags as the rest of bionic."
...
* commit '70cf2077619cd2d177756e2bb1cf3fbf870ef355':
Build the linker with the same -std flags as the rest of bionic.
2013-10-17 13:17:31 -07:00
Elliott Hughes
70cf207761
Merge "Build the linker with the same -std flags as the rest of bionic."
2013-10-17 20:15:41 +00:00
Elliott Hughes
2258347f3b
Build the linker with the same -std flags as the rest of bionic.
...
Change-Id: I5bdb28ecfdf78a90f6b072077a1c5ffd63f5d2ae
2013-10-17 13:06:20 -07:00
Elliott Hughes
26e2643949
am f702652e: am 41b87c65: Merge "x86_64: Add R_X86_64_64 relocation handling"
...
* commit 'f702652ef89ad53d9bac51fb6ffccd071e7c7b99':
x86_64: Add R_X86_64_64 relocation handling
2013-10-17 12:57:58 -07:00
Elliott Hughes
1732a8da03
am 417c2061: am 922e2af4: Merge "O_CLOEXEC is always defined for arm, mips, x86, and x86_64."
...
* commit '417c2061c857015c1b0319646810111423b5223d':
O_CLOEXEC is always defined for arm, mips, x86, and x86_64.
2013-10-17 12:57:57 -07:00
Elliott Hughes
f702652ef8
am 41b87c65: Merge "x86_64: Add R_X86_64_64 relocation handling"
...
* commit '41b87c651280d1a9a98a309c5a5e77e240920d4e':
x86_64: Add R_X86_64_64 relocation handling
2013-10-17 12:55:09 -07:00
Elliott Hughes
417c2061c8
am 922e2af4: Merge "O_CLOEXEC is always defined for arm, mips, x86, and x86_64."
...
* commit '922e2af432b38c3a454a1cae9e4d269c28c5ff8c':
O_CLOEXEC is always defined for arm, mips, x86, and x86_64.
2013-10-17 12:55:08 -07:00
Elliott Hughes
41b87c6512
Merge "x86_64: Add R_X86_64_64 relocation handling"
2013-10-17 19:51:11 +00:00
Elliott Hughes
922e2af432
Merge "O_CLOEXEC is always defined for arm, mips, x86, and x86_64."
2013-10-17 19:45:35 +00:00
Elliott Hughes
7efbac17bf
am 2039949b: am 967cd1bc: Merge "Fix sigaction(3) for 64-bit."
...
* commit '2039949b225a3f6414250385b8d814440c24bab5':
Fix sigaction(3) for 64-bit.
2013-10-17 11:52:30 -07:00
Elliott Hughes
2039949b22
am 967cd1bc: Merge "Fix sigaction(3) for 64-bit."
...
* commit '967cd1bcaf5e75314b3cff2ea7bbd0eb18ab7438':
Fix sigaction(3) for 64-bit.
2013-10-17 11:49:30 -07:00
Elliott Hughes
e989399dc2
O_CLOEXEC is always defined for arm, mips, x86, and x86_64.
...
I built all four, just to be sure.
Change-Id: I5c818575c8142fccfc8fb163468832807a535e90
2013-10-17 11:45:22 -07:00
Elliott Hughes
967cd1bcaf
Merge "Fix sigaction(3) for 64-bit."
2013-10-17 18:38:31 +00:00
Elliott Hughes
c7e9b23317
Fix sigaction(3) for 64-bit.
...
Also clean up <signal.h> and revert the hacks that were necessary
for 64-bit in linker/debugger.cpp until now.
Change-Id: I3b0554ca8a49ee1c97cda086ce2c1954ebc11892
2013-10-17 11:36:55 -07:00
Ed Heyl
811b0cdb2d
am be662187: merge in klp-release (no-op)
...
* commit 'be662187aa579970cda4af49affd31958efc137c':
2013-10-16 17:47:51 -07:00
Ed Heyl
be662187aa
merge in klp-release (no-op)
2013-10-16 17:34:49 -07:00
Ben Cheng
2cda66116c
am a458b609: am f89f1eaa: Merge "Refresh libc/kernel/common/linux/auxvec.h"
...
* commit 'a458b609dbbff789a58fe4d2710af947b20d7e29':
Refresh libc/kernel/common/linux/auxvec.h
2013-10-16 16:58:47 -07:00
Ben Cheng
a458b609db
am f89f1eaa: Merge "Refresh libc/kernel/common/linux/auxvec.h"
...
* commit 'f89f1eaa6071111c2ef584e97efb23f1b5dbdd2d':
Refresh libc/kernel/common/linux/auxvec.h
2013-10-16 16:56:27 -07:00
Ben Cheng
f89f1eaa60
Merge "Refresh libc/kernel/common/linux/auxvec.h"
2013-10-16 23:52:17 +00:00
Ben Cheng
76b795a8ba
Refresh libc/kernel/common/linux/auxvec.h
...
Change-Id: If9bb50a2f233cdb60e91bd979876edb917e0f66d
2013-10-16 16:50:14 -07:00
Ben Cheng
a5e5fad478
am 29351c80: am 3fdd6b83: Merge "Add processed uapi kernel headers (common and aarch64-specific)"
...
* commit '29351c8091c4b7338bd47fb6b3e5aed94a2abf32':
Add processed uapi kernel headers (common and aarch64-specific)
2013-10-16 16:33:50 -07:00
Elliott Hughes
b2386fed55
am 4346bd9f: am bffe261a: Merge "Sort the syscalls.mk files, give all generated files the same header."
...
* commit '4346bd9fbcfe4144df7ac0e920bdda274d523fc4':
Sort the syscalls.mk files, give all generated files the same header.
2013-10-16 16:33:50 -07:00
Ben Cheng
29351c8091
am 3fdd6b83: Merge "Add processed uapi kernel headers (common and aarch64-specific)"
...
* commit '3fdd6b83379f46d2ae78f376b3630f9d481d6dbb':
Add processed uapi kernel headers (common and aarch64-specific)
2013-10-16 16:32:24 -07:00
Elliott Hughes
4346bd9fbc
am bffe261a: Merge "Sort the syscalls.mk files, give all generated files the same header."
...
* commit 'bffe261a1fcb2099e2188e2e4ca65209b64bc75a':
Sort the syscalls.mk files, give all generated files the same header.
2013-10-16 16:32:23 -07:00
Ben Cheng
3fdd6b8337
Merge "Add processed uapi kernel headers (common and aarch64-specific)"
2013-10-16 23:17:52 +00:00
Ben Cheng
2e0b93b01f
am 3b1b9f9f: am f0447ddb: Merge "Tweaked the cleanup scripts to handle uapi and aarch64 headers."
...
* commit '3b1b9f9ff6a2dc88ac0d78fd17f3b58448440357':
Tweaked the cleanup scripts to handle uapi and aarch64 headers.
2013-10-16 16:09:44 -07:00
Elliott Hughes
6b9321b858
am d6e117b6: am 1f29c2f5: Merge "Switch sigpending over to rt_sigpending."
...
* commit 'd6e117b64bdfbf8d793eb59ea9604b806608ec75':
Switch sigpending over to rt_sigpending.
2013-10-16 16:09:42 -07:00
Ben Cheng
655a7c081f
Add processed uapi kernel headers (common and aarch64-specific)
...
Change-Id: If0be7b83bd8fe7cb02472d173f7c452aabf61124
2013-10-16 16:09:24 -07:00
Elliott Hughes
bffe261a1f
Merge "Sort the syscalls.mk files, give all generated files the same header."
2013-10-16 23:06:48 +00:00
Ben Cheng
3b1b9f9ff6
am f0447ddb: Merge "Tweaked the cleanup scripts to handle uapi and aarch64 headers."
...
* commit 'f0447ddb042150af0e13a364df98dd11673d95d3':
Tweaked the cleanup scripts to handle uapi and aarch64 headers.
2013-10-16 15:35:50 -07:00
Ben Cheng
f0447ddb04
Merge "Tweaked the cleanup scripts to handle uapi and aarch64 headers."
2013-10-16 22:32:12 +00:00
Ben Cheng
8bea2b6fac
Tweaked the cleanup scripts to handle uapi and aarch64 headers.
...
The processed uapi directory is now placed at libc/kernel/uapi as
opposed to libc/kernel/common/uapi as it contains
architectural-dependent headers now.
Change-Id: I53f814704a4d231b452fde398cd94257a0fb2eea
2013-10-16 15:28:56 -07:00
Elliott Hughes
103ccde8fe
Sort the syscalls.mk files, give all generated files the same header.
...
No non-comment changes to the .S files.
Change-Id: Iafcfd004c3ea92b64268f80ab16df615b97cefac
2013-10-16 14:27:59 -07:00
Elliott Hughes
d6e117b64b
am 1f29c2f5: Merge "Switch sigpending over to rt_sigpending."
...
* commit '1f29c2f51097b68110bc2766a7c1560d6a8831d0':
Switch sigpending over to rt_sigpending.
2013-10-16 14:13:10 -07:00
Elliott Hughes
1f29c2f510
Merge "Switch sigpending over to rt_sigpending."
2013-10-16 21:10:00 +00:00
Elliott Hughes
40d105ccb3
Switch sigpending over to rt_sigpending.
...
Change-Id: I7b28984796b5fb343cfbcc47e0afc3a84293d417
2013-10-16 14:07:01 -07:00
Pavel Chupin
c075c18537
x86_64: Add R_X86_64_64 relocation handling
...
Change-Id: I86ffc56fa6a9053bed44e92a579530c2beb8eb2c
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-16 19:13:58 +04:00
The Android Automerger
8e39d2f9f4
merge in klp-release history after reset to klp-dev
2013-10-15 21:13:52 -07:00
Elliott Hughes
d5e5a6a353
am 2426cdb6: am 26242bf2: Merge "Remove support for the useless \'custom\' option in SYSCALLS.TXT."
...
* commit '2426cdb63b95435bb09bacfc3af63304d991c4a2':
Remove support for the useless 'custom' option in SYSCALLS.TXT.
2013-10-15 19:57:53 -07:00
Elliott Hughes
2426cdb63b
am 26242bf2: Merge "Remove support for the useless \'custom\' option in SYSCALLS.TXT."
...
* commit '26242bf266fc7ee72a972ff0e4b12c024df4993c':
Remove support for the useless 'custom' option in SYSCALLS.TXT.
2013-10-15 19:54:40 -07:00
Elliott Hughes
26242bf266
Merge "Remove support for the useless 'custom' option in SYSCALLS.TXT."
2013-10-16 02:51:35 +00:00
Elliott Hughes
afaebc3fef
am 87fc78de: am 608c65f6: Merge "Fix sigsuspend to use rt_sigsuspend on all platforms."
...
* commit '87fc78de6c869d0403ccdd2e756ec1f5d456f3d3':
Fix sigsuspend to use rt_sigsuspend on all platforms.
2013-10-15 18:20:32 -07:00
Elliott Hughes
c9da332cce
Remove support for the useless 'custom' option in SYSCALLS.TXT.
...
This cruft dates from a time when bionic would only output syscall
contants for the syscalls mentioned in SYSCALLS.TXT. I fixed that
a long time ago, but never followed through with the removal of what
was then confusingly called "stub" and was recently renamed "custom".
Change-Id: I8f3872a200b2dc8325e357cc5ee505ea4212ef95
2013-10-15 18:18:58 -07:00
Elliott Hughes
87fc78de6c
am 608c65f6: Merge "Fix sigsuspend to use rt_sigsuspend on all platforms."
...
* commit '608c65f6955213179db4140cc57c40a2a88d5846':
Fix sigsuspend to use rt_sigsuspend on all platforms.
2013-10-15 18:17:53 -07:00
Elliott Hughes
608c65f695
Merge "Fix sigsuspend to use rt_sigsuspend on all platforms."
2013-10-16 01:16:00 +00:00
Elliott Hughes
1f5af926fa
Fix sigsuspend to use rt_sigsuspend on all platforms.
...
Change-Id: I981c1a66d35480d4457a0a08a1b042dac94daa5b
2013-10-15 18:15:19 -07:00
Elliott Hughes
f2a760dca7
am a85606e1: am c100a100: Merge "\'Avoid confusing "read prevented write" log messages\' 2."
...
* commit 'a85606e1563c2153bea3c73dfe4ca1588e778f22':
'Avoid confusing "read prevented write" log messages' 2.
2013-10-15 17:38:17 -07:00
Elliott Hughes
a85606e156
am c100a100: Merge "\'Avoid confusing "read prevented write" log messages\' 2."
...
* commit 'c100a10069a16eca57f5f9ab838ff98d7db6eb03':
'Avoid confusing "read prevented write" log messages' 2.
2013-10-15 17:35:27 -07:00
Elliott Hughes
c100a10069
Merge "'Avoid confusing "read prevented write" log messages' 2."
2013-10-16 00:31:20 +00:00
Elliott Hughes
68b67113a4
'Avoid confusing "read prevented write" log messages' 2.
...
This time it's assembler.
Change-Id: Iae6369833b8046b8eda70238bb4ed0cae64269ea
2013-10-15 17:17:05 -07:00
Elliott Hughes
cbfa1afda3
am 0287db52: am d9913b0b: Merge "Make pthread_create report sched_setscheduler failures on LP64."
...
* commit '0287db52ed93df39ab45c7f60a241ae621866b90':
Make pthread_create report sched_setscheduler failures on LP64.
2013-10-15 17:14:59 -07:00
Elliott Hughes
0287db52ed
am d9913b0b: Merge "Make pthread_create report sched_setscheduler failures on LP64."
...
* commit 'd9913b0b0dfad473bd1cb81463ac0d6b68a0deb6':
Make pthread_create report sched_setscheduler failures on LP64.
2013-10-15 17:12:16 -07:00
Elliott Hughes
d9913b0b0d
Merge "Make pthread_create report sched_setscheduler failures on LP64."
2013-10-16 00:09:54 +00:00
Christopher Ferris
03ce517178
am fbefb252: Modify prefetch for krait memcpy.
...
* commit 'fbefb252b09634114977dbd1b48dd42bb2629b83':
Modify prefetch for krait memcpy.
2013-10-15 17:08:32 -07:00
Elliott Hughes
df17ce7858
am 26491483: am 76725214: Merge "Avoid confusing "read prevented write" log messages."
...
* commit '264914838d1c22c15ed0069d1217a780835c6d1c':
Avoid confusing "read prevented write" log messages.
2013-10-15 16:58:19 -07:00
Elliott Hughes
b01ebe6d4e
am 14e7482c: am d16391bb: Merge "Fix indentation in sched_getaffinity."
...
* commit '14e7482c556820d8ad3b77f025dfc465d55c7262':
Fix indentation in sched_getaffinity.
2013-10-15 16:58:19 -07:00
Elliott Hughes
264914838d
am 76725214: Merge "Avoid confusing "read prevented write" log messages."
...
* commit '7672521440c8b7f98795c3fb4295227398e3e296':
Avoid confusing "read prevented write" log messages.
2013-10-15 16:56:34 -07:00
Elliott Hughes
14e7482c55
am d16391bb: Merge "Fix indentation in sched_getaffinity."
...
* commit 'd16391bb88d92a58e3492921ac75a1d5d86031b7':
Fix indentation in sched_getaffinity.
2013-10-15 16:56:33 -07:00
Elliott Hughes
7672521440
Merge "Avoid confusing "read prevented write" log messages."
2013-10-15 23:53:45 +00:00
Elliott Hughes
d16391bb88
Merge "Fix indentation in sched_getaffinity."
2013-10-15 23:53:25 +00:00
Elliott Hughes
98624c3746
Make pthread_create report sched_setscheduler failures on LP64.
...
We couldn't fix this for 32-bit because there's too much broken
code out there. (Pretty much everyone asks for real-time
scheduling for all their threads, and the kernel says "don't be
stupid".)
Change-Id: I43c5271e6b6bb91278b9a19eec08cbf05391e3c4
2013-10-15 16:51:17 -07:00
Elliott Hughes
0cfc95e010
Fix indentation in sched_getaffinity.
...
Change-Id: I966852149a0255ca132cd7a15f135a875ce400d0
2013-10-15 16:49:49 -07:00
Elliott Hughes
d1eda33f01
Avoid confusing "read prevented write" log messages.
...
Moving to a "function: message" style avoids ambiguity.
Change-Id: If9d590e50265c61725d3673bd03796e65edd2d5e
2013-10-15 16:49:28 -07:00
Christopher Ferris
289c460c55
am ac6bc319: Remove new aligned memcpy path for cortex-a15.
...
* commit 'ac6bc31942e58c8893c0695d9766d0f3e39335fe':
Remove new aligned memcpy path for cortex-a15.
2013-10-15 16:17:14 -07:00
Christopher Ferris
fbefb252b0
Modify prefetch for krait memcpy.
...
I originally modified the krait mainloop prefetch from cacheline * 8 to * 2.
This causes a perf degradation for copies bigger than will fit in the cache.
Fixing this back to the original * 8. I tried other multiples, but * 8 is th
sweet spot on krait.
Bug: 11221806
(cherry picked from commit c3c58fb560 )
Change-Id: I369f81d91ba97a3fcecac84ac57dec921b4758c8
2013-10-15 15:44:00 -07:00
Christopher Ferris
ac6bc31942
Remove new aligned memcpy path for cortex-a15.
...
For some reason the new cortex-a15 memcpy code from ARM is really bad
for really large copies. This change forces us to go down the old path
for all copies.
All of my benchmarks show the new version is faster for large copies, but
something is going on that I don't understand.
Bug: 10838353
Change-Id: I01c16d4a2575e76f4c69862c6f78fd9024eb3fb8
2013-10-15 14:54:02 -07:00
Christopher Ferris
d77ff4f423
am 76d78dc0: am dc9d8d05: Merge "Modify prefetch for krait memcpy."
...
* commit '76d78dc0441ba982438ef613a8d6f2f65c6834e0':
Modify prefetch for krait memcpy.
2013-10-15 14:19:27 -07:00
Christopher Ferris
76d78dc044
am dc9d8d05: Merge "Modify prefetch for krait memcpy."
...
* commit 'dc9d8d050a43e1cd32f1337e79187124bb15d938':
Modify prefetch for krait memcpy.
2013-10-15 14:16:47 -07:00
Elliott Hughes
4681f8244e
am 5b3f1d8b: am 22b83da4: Merge "Clean up the sigprocmask/pthread_sigmask implementation."
...
* commit '5b3f1d8b3a6a1caf059dc376e4967a27ddd57dac':
Clean up the sigprocmask/pthread_sigmask implementation.
2013-10-15 14:16:02 -07:00
Elliott Hughes
5b3f1d8b3a
am 22b83da4: Merge "Clean up the sigprocmask/pthread_sigmask implementation."
...
* commit '22b83da476263bff28fcc6a4696ced58b61d2c1d':
Clean up the sigprocmask/pthread_sigmask implementation.
2013-10-15 14:13:32 -07:00
Christopher Ferris
dc9d8d050a
Merge "Modify prefetch for krait memcpy."
2013-10-15 21:12:31 +00:00
Elliott Hughes
22b83da476
Merge "Clean up the sigprocmask/pthread_sigmask implementation."
2013-10-15 21:10:21 +00:00
Christopher Ferris
c3c58fb560
Modify prefetch for krait memcpy.
...
I originally modified the krait mainloop prefetch from cacheline * 8 to * 2.
This causes a perf degradation for copies bigger than will fit in the cache.
Fixing this back to the original * 8. I tried other multiples, but * 8 is th
sweet spot on krait.
Bug: 11221806
Change-Id: I1f75fad6440f7417e664795a6e7b5616f6a29c45
2013-10-15 12:10:06 -07:00
Elliott Hughes
19e62325c2
Clean up the sigprocmask/pthread_sigmask implementation.
...
Let's have both use rt_sigprocmask, like in glibc. The 64-bit ABIs
can share the same code as the 32-bit ABIs.
Also, let's test the return side of these calls, not just the
setting.
Bug: 11069919
Change-Id: I11da99f85b5b481870943c520d05ec929b15eddb
2013-10-15 11:23:57 -07:00
Stephen Hines
8161b23689
am 4691325d: am abeafbd6: Merge "Wrap sprintf()/snprintf() macros to prevent expansion errors."
...
* commit '4691325d48406033632fe84a944ac9c3bd2e5097':
Wrap sprintf()/snprintf() macros to prevent expansion errors.
2013-10-11 16:33:07 -07:00
Stephen Hines
78f6db64fe
am 36959302: am 8704ada3: Merge "Fix clang warnings in bionic."
...
* commit '36959302a334499c7d2ddf4a090e2ab7e3a8ae1d':
Fix clang warnings in bionic.
2013-10-11 16:33:03 -07:00
Stephen Hines
4691325d48
am abeafbd6: Merge "Wrap sprintf()/snprintf() macros to prevent expansion errors."
...
* commit 'abeafbd6d5e11044dd305e48134bc3d84319a3da':
Wrap sprintf()/snprintf() macros to prevent expansion errors.
2013-10-11 16:30:04 -07:00
Stephen Hines
36959302a3
am 8704ada3: Merge "Fix clang warnings in bionic."
...
* commit '8704ada3d8fae067ed48c2b6da5a1ba4ab062e1a':
Fix clang warnings in bionic.
2013-10-11 16:30:03 -07:00
Stephen Hines
abeafbd6d5
Merge "Wrap sprintf()/snprintf() macros to prevent expansion errors."
2013-10-11 23:28:32 +00:00
Stephen Hines
8704ada3d8
Merge "Fix clang warnings in bionic."
2013-10-11 23:27:40 +00:00
Stephen Hines
6c7b3cb056
Fix clang warnings in bionic.
...
This fixes a few diverse issues that clang warns on in bionic. First,
it specifies the appropriate converted types for format specifiers.
The "h" and "hh" modifiers specify that the user is passing a short or
char respectively. We were passing int deliberately in both cases and
relying on the compiler to implicitly downcast to the smaller type.
We also remove the non-standard "d" suffix from our double-precision
floating point constant. This is an extension for gcc that clang does
not implement. The third fix is to mark the c1 variable as unused,
since it truly is neither read nor written.
Change-Id: I4793352b9d3e58f1f4cac9e7581ef4b2a70b43c7
2013-10-11 16:20:08 -07:00
Stephen Hines
6e38072add
Wrap sprintf()/snprintf() macros to prevent expansion errors.
...
Previously, FORTIFY_SOURCE used single macros to define these standard
functions for use with clang. This can cause conflicts with other macros used
to call these functions, particularly when those macros expand the number of
arguments to the function. This change wraps our macro definitions, so that
expansion properly takes place for programmer arguments first.
Change-Id: I55929b1fd2a643b9d14a17631c4bcab3b0b712cf
2013-10-11 12:14:49 -07:00
Nick Kralevich
49bb53c8e2
am 95de0df8: am eda2679e: Merge "FORTIFY_SOURCE: fortify read()"
...
* commit '95de0df8c2daeefca358010f2d15c3346a5284f1':
FORTIFY_SOURCE: fortify read()
2013-10-09 21:28:52 -07:00
Elliott Hughes
2d38f0c1c7
am 21d70d5f: am 39385aa7: Merge "Clean up the cpuacct cruft."
...
* commit '21d70d5fd8ff2823a6879d59c7d5a8d6c3e0ce8b':
Clean up the cpuacct cruft.
2013-10-09 21:28:51 -07:00
Nick Kralevich
95de0df8c2
am eda2679e: Merge "FORTIFY_SOURCE: fortify read()"
...
* commit 'eda2679e30b997d036e0ec572cda054adc2ac3a6':
FORTIFY_SOURCE: fortify read()
2013-10-09 21:25:51 -07:00
Elliott Hughes
21d70d5fd8
am 39385aa7: Merge "Clean up the cpuacct cruft."
...
* commit '39385aa78c5d437cfabc26a1bccdf050a8c94ac4':
Clean up the cpuacct cruft.
2013-10-09 21:25:50 -07:00
Nick Kralevich
eda2679e30
Merge "FORTIFY_SOURCE: fortify read()"
2013-10-10 04:11:48 +00:00
Elliott Hughes
39385aa78c
Merge "Clean up the cpuacct cruft."
2013-10-10 04:08:44 +00:00
Nick Kralevich
b036b5ca36
FORTIFY_SOURCE: fortify read()
...
Change-Id: Ic7de163fe121db13e00560adb257331bc709814d
2013-10-09 20:17:03 -07:00
Elliott Hughes
232163cf70
Clean up the cpuacct cruft.
...
Change-Id: I6ed63af8dfc2368e211420389fa8af4d5dc0908f
2013-10-09 17:35:36 -07:00
Elliott Hughes
7e049ba470
am 28b8557d: am 92f3cc50: Merge "x86_64: Rename 64-bit linker to linker64"
...
* commit '28b8557d4c117f41cf3fb9c55e30adeb6e46757b':
x86_64: Rename 64-bit linker to linker64
2013-10-09 16:56:27 -07:00
Elliott Hughes
28b8557d4c
am 92f3cc50: Merge "x86_64: Rename 64-bit linker to linker64"
...
* commit '92f3cc50c8d884d1eb3496ebfba7d3916fc711e8':
x86_64: Rename 64-bit linker to linker64
2013-10-09 16:54:16 -07:00
Nick Kralevich
b8771d9fd8
am b35ebe3d: am 848efa9d: Merge "Revert "FORTIFY_SOURCE: fortify read()""
...
* commit 'b35ebe3d7097899fd4498ebb2b93e48fd836ebcf':
Revert "FORTIFY_SOURCE: fortify read()"
2013-10-09 16:53:05 -07:00
Elliott Hughes
92f3cc50c8
Merge "x86_64: Rename 64-bit linker to linker64"
2013-10-09 23:51:29 +00:00
Nick Kralevich
b35ebe3d70
am 848efa9d: Merge "Revert "FORTIFY_SOURCE: fortify read()""
...
* commit '848efa9dae84ac4e5e45869abe26225affeb2038':
Revert "FORTIFY_SOURCE: fortify read()"
2013-10-09 16:50:54 -07:00
Pavel Chupin
1a57f9f75c
x86_64: Rename 64-bit linker to linker64
...
That's for having both on the same system.
Change-Id: Ic2bc2c015e6486e8b6a7576f7b28d2d027534368
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-09 16:50:30 -07:00
Elliott Hughes
41f56e29c7
am c7559aea: am 777ebe86: Merge "Fix MIPS build."
...
* commit 'c7559aeaf17a7c38392d2dc8f79c77316a24c8c0':
Fix MIPS build.
2013-10-09 16:49:46 -07:00
Nick Kralevich
848efa9dae
Merge "Revert "FORTIFY_SOURCE: fortify read()""
2013-10-09 23:47:58 +00:00
Elliott Hughes
c7559aeaf1
am 777ebe86: Merge "Fix MIPS build."
...
* commit '777ebe86677f6fd88c87995652146b2ead19a95f':
Fix MIPS build.
2013-10-09 16:46:33 -07:00
Nick Kralevich
8d25327639
Revert "FORTIFY_SOURCE: fortify read()"
...
This change reverts
* fb3f956d07 .
* 65c99de2cb
Change-Id: Id5774eeede41130579115cf67a72ee914f2b47d5
2013-10-09 16:46:25 -07:00
Elliott Hughes
777ebe8667
Merge "Fix MIPS build."
2013-10-09 23:43:24 +00:00
Elliott Hughes
14b467e840
Fix MIPS build.
...
Warnings are errors for all home-grown bionic code, and the arch-specific
code now counts as home-grown bionic code (it was mistakenly counted as
"not ours" before).
Change-Id: I9c6a881b0dc596bae7dfe112c5c189e073800a3a
2013-10-09 16:40:33 -07:00
Elliott Hughes
6b6c5791a0
am aa3c17e8: am 37953ee3: Merge "Fix build."
...
* commit 'aa3c17e8f8b9b3b5b8dc3c7c0fbe85b774f83722':
Fix build.
2013-10-09 16:39:06 -07:00
Elliott Hughes
1cdc9fe6d5
am 8826ba8a: am bc545e8a: Merge "Fix x86_64 build, clean up intermediate libraries."
...
* commit '8826ba8ab6922927bdac2466d2903916d5806a06':
Fix x86_64 build, clean up intermediate libraries.
2013-10-09 16:35:46 -07:00
Elliott Hughes
aa3c17e8f8
am 37953ee3: Merge "Fix build."
...
* commit '37953ee3feb60b84e43349df0b13544367ca1cd7':
Fix build.
2013-10-09 16:33:59 -07:00
Nick Kralevich
45e3076cdc
am 731ced6b: am c147478c: Merge "FORTIFY_SOURCE: fortify read()"
...
* commit '731ced6b289629a552b5841561fdcccf08d8c43a':
FORTIFY_SOURCE: fortify read()
2013-10-09 16:32:25 -07:00
Elliott Hughes
8826ba8ab6
am bc545e8a: Merge "Fix x86_64 build, clean up intermediate libraries."
...
* commit 'bc545e8a98dd4e1148e8b9c9ca491d1a481ee94d':
Fix x86_64 build, clean up intermediate libraries.
2013-10-09 16:30:42 -07:00
Elliott Hughes
37953ee3fe
Merge "Fix build."
2013-10-09 23:30:39 +00:00
Elliott Hughes
fb3f956d07
Fix build.
...
'private' is no longer on the default include path inside bionic.
Change-Id: I9bfab213a496fac585787118603af3aa2a1f9951
2013-10-09 16:29:42 -07:00
Elliott Hughes
bc545e8a98
Merge "Fix x86_64 build, clean up intermediate libraries."
2013-10-09 23:29:00 +00:00
Nick Kralevich
731ced6b28
am c147478c: Merge "FORTIFY_SOURCE: fortify read()"
...
* commit 'c147478cb75cfaa2aadc67fd920e8765503d97cc':
FORTIFY_SOURCE: fortify read()
2013-10-09 16:25:15 -07:00
Nick Kralevich
c147478cb7
Merge "FORTIFY_SOURCE: fortify read()"
2013-10-09 23:23:27 +00:00
Elliott Hughes
eb847bc866
Fix x86_64 build, clean up intermediate libraries.
...
The x86_64 build was failing because clone.S had a call to __thread_entry which
was being added to a different intermediate .a on the way to making libc.so,
and the linker couldn't guarantee statically that such a relocation would be
possible.
ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC
This patch addresses that by ensuring that the caller and callee end up in the
same intermediate .a. While I'm here, I've tried to clean up some of the mess
that led to this situation too. In particular, this removes libc/private/ from
the default include path (except for the DNS code), and splits out the DNS
code into its own library (since it's a weird special case of upstream NetBSD
code that's diverged so heavily it's unlikely ever to get back in sync).
There's more cleanup of the DNS situation possible, but this is definitely a
step in the right direction, and it's more than enough to get x86_64 building
cleanly.
Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-09 16:00:17 -07:00
Elliott Hughes
ac045c32d0
am f83148af: am 0c17099a: Merge "Fix __errno for LP64 and clean up __get_tls."
...
* commit 'f83148af74704c574ad1bf60082f2f56bcb29706':
Fix __errno for LP64 and clean up __get_tls.
2013-10-09 13:52:56 -07:00
Elliott Hughes
f83148af74
am 0c17099a: Merge "Fix __errno for LP64 and clean up __get_tls."
...
* commit '0c17099a71cb5d1b36b7aab66fd7341b3fc9106d':
Fix __errno for LP64 and clean up __get_tls.
2013-10-09 13:51:14 -07:00
Elliott Hughes
0c17099a71
Merge "Fix __errno for LP64 and clean up __get_tls."
2013-10-09 20:49:10 +00:00
Nick Kralevich
65c99de2cb
FORTIFY_SOURCE: fortify read()
...
Change-Id: I3d7b4ec86d04efb865117ce7629a2e26917f3331
2013-10-09 13:44:38 -07:00
Elliott Hughes
2a0b873065
Fix __errno for LP64 and clean up __get_tls.
...
If __get_tls has the right type, a lot of confusing casting can disappear.
It was probably a mistake that __get_tls was exposed as a function for mips
and x86 (but not arm), so let's (a) ensure that the __get_tls function
always matches the macro, (b) that we have the function for arm too, and
(c) that we don't have the function for any 64-bit architecture.
Change-Id: Ie9cb989b66e2006524ad7733eb6e1a65055463be
2013-10-09 13:39:13 -07:00
Elliott Hughes
7c98d1304d
am 898fd6a1: am 777a4ee6: Merge "Fix 32-bit build."
...
* commit '898fd6a1f0d8a540a3b8950f18e0858042279001':
Fix 32-bit build.
2013-10-08 18:46:10 -07:00
Elliott Hughes
898fd6a1f0
am 777a4ee6: Merge "Fix 32-bit build."
...
* commit '777a4ee6771e6fe3362ef4f24244a44fcd0aabe4':
Fix 32-bit build.
2013-10-08 18:43:56 -07:00
Elliott Hughes
777a4ee677
Merge "Fix 32-bit build."
2013-10-09 01:41:46 +00:00
Elliott Hughes
51aeff7021
Fix 32-bit build.
...
libc/tzcode/localtime.c: In function 'differ_by_repeat':
libc/tzcode/localtime.c:338:2: error: comparison is always false due to limited range of data type [-Werror=type-limits]
Change-Id: Ic84be6391a66e9d50ed98f41d865387c77a60ffa
2013-10-08 18:30:44 -07:00
Elliott Hughes
e17457fbf5
am 3c13dade: am 14b66bff: Merge "Fix malloc debugging for LP64."
...
* commit '3c13daded375cad5fc77613872a85639cd09f54f':
Fix malloc debugging for LP64.
2013-10-08 17:28:25 -07:00
Elliott Hughes
5ca2f97fb6
am 5596240c: am 65e1c48d: Merge "Don\'t allow int<->pointer conversions."
...
* commit '5596240cc86920115cffbfe7aac66116d5136a0b':
Don't allow int<->pointer conversions.
2013-10-08 17:28:25 -07:00
Elliott Hughes
8cc98f0b1e
am 54c7ef7f: am 7027841d: Merge "Fix bionic\'s built-in stack trace dumping for LP64."
...
* commit '54c7ef7fbd1f79ae490eb737f558fccf3c1dbd55':
Fix bionic's built-in stack trace dumping for LP64.
2013-10-08 17:28:24 -07:00
Elliott Hughes
3c13daded3
am 14b66bff: Merge "Fix malloc debugging for LP64."
...
* commit '14b66bffb08d23ad16d69b62d1fbfda769db1c12':
Fix malloc debugging for LP64.
2013-10-08 17:22:52 -07:00
Elliott Hughes
5596240cc8
am 65e1c48d: Merge "Don\'t allow int<->pointer conversions."
...
* commit '65e1c48df095b2af53340ab55f687d5b1c638d66':
Don't allow int<->pointer conversions.
2013-10-08 17:22:51 -07:00
Elliott Hughes
54c7ef7fbd
am 7027841d: Merge "Fix bionic\'s built-in stack trace dumping for LP64."
...
* commit '7027841d8fe27f0cd42ca16db156ebea721f68a8':
Fix bionic's built-in stack trace dumping for LP64.
2013-10-08 17:22:51 -07:00
Elliott Hughes
14b66bffb0
Merge "Fix malloc debugging for LP64."
2013-10-09 00:20:08 +00:00
Elliott Hughes
65e1c48df0
Merge "Don't allow int<->pointer conversions."
2013-10-09 00:18:50 +00:00
Elliott Hughes
7027841d8f
Merge "Fix bionic's built-in stack trace dumping for LP64."
2013-10-09 00:18:44 +00:00
Elliott Hughes
2ec400bfc7
Don't allow int<->pointer conversions.
...
Normally we don't have -Werror for upstream code, but for those warnings
that probably point to 32-bit assumptions about pointers, we want those
warnings to always be errors.
Change-Id: Ibece9caf09b2f7989ca600ef448d07868669a8fb
2013-10-08 17:04:33 -07:00
Elliott Hughes
c7c5f85ead
Fix bionic's built-in stack trace dumping for LP64.
...
Change-Id: I967c5789d7bb2d3d248d94d81a40d5ec4e1bf26d
2013-10-08 17:02:26 -07:00
Elliott Hughes
ef0696d46a
Fix malloc debugging for LP64.
...
Change-Id: Idd0b239f5c66d45de315d556271a5d13b8eb907c
2013-10-08 16:18:55 -07:00
Elliott Hughes
e769368d76
am c8bd2c2e: am 458076c3: Merge "Fix the ALIGN and ALIGNBYTES macros for LP64."
...
* commit 'c8bd2c2e45c93b999a40449e4c6f44470f010367':
Fix the ALIGN and ALIGNBYTES macros for LP64.
2013-10-08 16:15:33 -07:00
Elliott Hughes
c8bd2c2e45
am 458076c3: Merge "Fix the ALIGN and ALIGNBYTES macros for LP64."
...
* commit '458076c3c7f41c72e0d1ae8da23907f75427ca3a':
Fix the ALIGN and ALIGNBYTES macros for LP64.
2013-10-08 16:13:17 -07:00
Elliott Hughes
458076c3c7
Merge "Fix the ALIGN and ALIGNBYTES macros for LP64."
2013-10-08 23:09:54 +00:00
Ed Heyl
53f30951d3
am f87684ee: merge in KQS81M
...
* commit 'f87684eea10d951b056ce664bc890d7607a3c1cf':
Use kernel default for initial thread size
2013-10-08 15:45:46 -07:00
Ed Heyl
f87684eea1
merge in KQS81M
2013-10-08 15:35:17 -07:00
Elliott Hughes
78df45e1d1
Fix the ALIGN and ALIGNBYTES macros for LP64.
...
Change-Id: I3a361255afce375ab1cefa449721f0aea4d47919
2013-10-08 15:31:44 -07:00
Elliott Hughes
42b618cffe
am 58b8f225: am 5cf1f229: Merge "pthread_exit should call __NR_exit with status 0."
...
* commit '58b8f2256637c5b1e24b568b699fb3aa6cf0ca96':
pthread_exit should call __NR_exit with status 0.
2013-10-08 15:06:49 -07:00
Elliott Hughes
58b8f22566
am 5cf1f229: Merge "pthread_exit should call __NR_exit with status 0."
...
* commit '5cf1f229620d02c0ca266c9e03418fdeefd85191':
pthread_exit should call __NR_exit with status 0.
2013-10-08 15:04:45 -07:00
Elliott Hughes
5cf1f22962
Merge "pthread_exit should call __NR_exit with status 0."
2013-10-08 22:02:20 +00:00
Elliott Hughes
caa0deeefb
am 97368e82: am 242b2e0b: Merge "Use /system/lib64 and /vendor/lib64 for 64-bit libraries."
...
* commit '97368e823250fcc0b48f6f392df77c275bf3c5e1':
Use /system/lib64 and /vendor/lib64 for 64-bit libraries.
2013-10-08 14:54:01 -07:00
Elliott Hughes
97368e8232
am 242b2e0b: Merge "Use /system/lib64 and /vendor/lib64 for 64-bit libraries."
...
* commit '242b2e0b928f83083f60bbb856309122981299af':
Use /system/lib64 and /vendor/lib64 for 64-bit libraries.
2013-10-08 14:52:04 -07:00
Elliott Hughes
242b2e0b92
Merge "Use /system/lib64 and /vendor/lib64 for 64-bit libraries."
2013-10-08 21:50:34 +00:00
Elliott Hughes
c4c6e192ac
pthread_exit should call __NR_exit with status 0.
...
We shouldn't have been passing the bottom 32 bits of the address used
for pthread_join to the kernel.
Change-Id: I487e5002d60c27adba51173719213abbee0f183f
2013-10-08 14:48:05 -07:00
Elliott Hughes
011bc0ba45
Use /system/lib64 and /vendor/lib64 for 64-bit libraries.
...
Change-Id: I4886aeb3070bf97b4cfe8053388ecb1bda288017
2013-10-08 14:27:10 -07:00
Elliott Hughes
6260fa5025
am ee9da565: am 58522099: Merge "Make logging fall back to /dev/stderr if we\'re on the host."
...
* commit 'ee9da5653361f0171e417a4bcb1958a2b91f886d':
Make logging fall back to /dev/stderr if we're on the host.
2013-10-08 13:47:48 -07:00
Elliott Hughes
ee9da56533
am 58522099: Merge "Make logging fall back to /dev/stderr if we\'re on the host."
...
* commit '58522099e52be3b5eba702ee6e82c03050e0dcca':
Make logging fall back to /dev/stderr if we're on the host.
2013-10-08 13:45:05 -07:00
Elliott Hughes
58522099e5
Merge "Make logging fall back to /dev/stderr if we're on the host."
2013-10-08 20:42:36 +00:00
Elliott Hughes
0f395b7ba0
Make logging fall back to /dev/stderr if we're on the host.
...
Otherwise you get no logging, which sucks.
Change-Id: Iea1e8f996461afbb217a55711b7967005c39cfcb
2013-10-08 13:19:00 -07:00
Elliott Hughes
2f2e8b9778
am 4a5c4711: am 9c710927: Merge "Use linker64 for the 64-bit linker."
...
* commit '4a5c471162b79a12402ab41a68037a2453b83eaa':
Use linker64 for the 64-bit linker.
2013-10-08 11:41:21 -07:00
Elliott Hughes
4a5c471162
am 9c710927: Merge "Use linker64 for the 64-bit linker."
...
* commit '9c710927ab33a663a5ba34b15902e7062523f8e3':
Use linker64 for the 64-bit linker.
2013-10-08 11:39:45 -07:00
Elliott Hughes
9c710927ab
Merge "Use linker64 for the 64-bit linker."
2013-10-08 18:37:22 +00:00
Elliott Hughes
2ad80c46ba
am 24f4da96: am 3df50f57: Merge "Use C99 structure initializer designator style."
...
* commit '24f4da964263b04d3a89575d42272bf897cddec3':
Use C99 structure initializer designator style.
2013-10-08 10:08:08 -07:00
Elliott Hughes
24f4da9642
am 3df50f57: Merge "Use C99 structure initializer designator style."
...
* commit '3df50f57e5c106dd70483d4a0a295aa031a5906b':
Use C99 structure initializer designator style.
2013-10-08 10:05:20 -07:00
Elliott Hughes
d7398f146d
Use linker64 for the 64-bit linker.
...
Change-Id: I13fc7f93274f99e4cf99b077afdf5293e7233f39
2013-10-08 10:05:05 -07:00
Elliott Hughes
5d389a0acf
am b1f4f9aa: am 26933f40: Merge "x86_64 linker."
...
* commit 'b1f4f9aabd4e9f4019e2f1637ec38e6bfdfa3c6b':
x86_64 linker.
2013-10-08 10:04:31 -07:00
Elliott Hughes
b1f4f9aabd
am 26933f40: Merge "x86_64 linker."
...
* commit '26933f4046d7362bfd276fc208e959a733a121c2':
x86_64 linker.
2013-10-08 10:01:46 -07:00
Elliott Hughes
3df50f57e5
Merge "Use C99 structure initializer designator style."
2013-10-08 17:01:42 +00:00
Elliott Hughes
afac15d686
Use C99 structure initializer designator style.
...
clang warns about using the GCC style of designator.
Change-Id: I86ec79f06c8774618082859f48d7d1f576520e32
2013-10-08 10:01:09 -07:00
Elliott Hughes
26933f4046
Merge "x86_64 linker."
2013-10-08 16:59:17 +00:00
Elliott Hughes
d2e0b1e777
am 83b5acf4: am 5d06718c: Merge "Refactor the syscall generation script."
...
* commit '83b5acf418544394011ee2f29829b5c1791a52eb':
Refactor the syscall generation script.
2013-10-08 09:58:04 -07:00
Elliott Hughes
c00f2cb587
x86_64 linker.
...
Based on I8dc3e2cb596f75dc58ae82e4dc58f8c177dd3323 by
Pavel Chupin <pavel.v.chupin@intel.com >.
Change-Id: Icd582d277cbe273477b450f2848343d72c86ec9f
2013-10-08 09:57:01 -07:00
Elliott Hughes
83b5acf418
am 5d06718c: Merge "Refactor the syscall generation script."
...
* commit '5d06718cd357b509588465ec1fa261db23b5899a':
Refactor the syscall generation script.
2013-10-08 09:55:27 -07:00
Elliott Hughes
5d06718cd3
Merge "Refactor the syscall generation script."
2013-10-08 16:53:02 +00:00
Elliott Hughes
6c3e26ad34
am 64cb7e36: am 0c1379e4: Merge "Fix Clang warning since KernelArgumentBlock is actually a class."
...
* commit '64cb7e36bf96850f0de1d3d8cf01cf18285797b0':
Fix Clang warning since KernelArgumentBlock is actually a class.
2013-10-08 09:18:47 -07:00
Elliott Hughes
64cb7e36bf
am 0c1379e4: Merge "Fix Clang warning since KernelArgumentBlock is actually a class."
...
* commit '0c1379e42ddc7f135403fb06f115ed62396c6102':
Fix Clang warning since KernelArgumentBlock is actually a class.
2013-10-08 09:16:07 -07:00
Elliott Hughes
0c1379e42d
Merge "Fix Clang warning since KernelArgumentBlock is actually a class."
2013-10-08 16:12:54 +00:00
The Android Automerger
303f08b439
merge in klp-release history after reset to klp-dev
2013-10-08 06:00:18 -07:00
Stephen Hines
99f0e1a329
Fix Clang warning since KernelArgumentBlock is actually a class.
...
Change-Id: Id72868d80feffbbc5f7d1e43beaed5d4e4d95f52
2013-10-08 00:08:13 -07:00
Elliott Hughes
0437f3ff29
Refactor the syscall generation script.
...
Primarily so that the new x86_64 alias functionality is now available for
all architectures.
Change-Id: I9fde59093a1d08de98923f121a6e3d05ec5801d2
2013-10-07 23:53:13 -07:00
Elliott Hughes
f662660ca3
am 4501a00b: am d2b6b5f2: Merge "Add an optional alias list to SYSCALLS.TXT"
...
* commit '4501a00be35f2fc851795ac8b15b8956eab69c27':
Add an optional alias list to SYSCALLS.TXT
2013-10-07 23:07:09 -07:00
Elliott Hughes
4501a00be3
am d2b6b5f2: Merge "Add an optional alias list to SYSCALLS.TXT"
...
* commit 'd2b6b5f2dbe56f19b6143f876e2677da1735bb5d':
Add an optional alias list to SYSCALLS.TXT
2013-10-07 23:05:08 -07:00
Elliott Hughes
d2b6b5f2db
Merge "Add an optional alias list to SYSCALLS.TXT"
2013-10-08 06:03:01 +00:00
Elliott Hughes
911214d582
am 3fce4015: Upgrade to tzdata2013g.
...
* commit '3fce4015902bcf8d4257ee7624d463d92453b602':
Upgrade to tzdata2013g.
2013-10-07 15:12:09 -07:00
Elliott Hughes
af19e09b02
resolved conflicts for merge of e1fe52cc to klp-dev-plus-aosp
...
Change-Id: Id3f3176a842fb4bb45f4f48773e6e27ea7d8769f
2013-10-07 15:10:00 -07:00
Elliott Hughes
46a091f5f1
resolved conflicts for merge of 21f59276 to klp-dev-plus-aosp
...
Change-Id: Idab174c61b0e3122124aece6b7bf2179aea1536d
2013-10-07 15:04:47 -07:00
Elliott Hughes
5be92401e9
am 101a6987: am 5d40527a: Merge "libc: fix __cxa_atexit implicit declaration"
...
* commit '101a6987c1e3ebfabefb1692ada492b7c0da43ee':
libc: fix __cxa_atexit implicit declaration
2013-10-07 11:36:40 -07:00
Elliott Hughes
101a6987c1
am 5d40527a: Merge "libc: fix __cxa_atexit implicit declaration"
...
* commit '5d40527aba85bfbd19155a6d7a6ea3bb3a541cb6':
libc: fix __cxa_atexit implicit declaration
2013-10-07 11:35:28 -07:00
Elliott Hughes
5d40527aba
Merge "libc: fix __cxa_atexit implicit declaration"
2013-10-07 18:33:51 +00:00
synergydev
589eaa4c72
libc: fix __cxa_atexit implicit declaration
...
Change-Id: Iacad18b332a717e4485c83df4bd42a850ff7699f
2013-10-07 11:33:20 -07:00
Elliott Hughes
3fc57ce6fd
am d8d60a92: am 04cdfa67: Merge "Clean up the x86 and x86_64 _exit_with_stack_teardown implementations."
...
* commit 'd8d60a92e7029ff8eeae5cbe62db94972e6cc06d':
Clean up the x86 and x86_64 _exit_with_stack_teardown implementations.
2013-10-07 10:53:08 -07:00
Elliott Hughes
d8d60a92e7
am 04cdfa67: Merge "Clean up the x86 and x86_64 _exit_with_stack_teardown implementations."
...
* commit '04cdfa67c7e4755ddbcd1d907f00d3cbdf6cd1f2':
Clean up the x86 and x86_64 _exit_with_stack_teardown implementations.
2013-10-07 10:51:24 -07:00
Elliott Hughes
04cdfa67c7
Merge "Clean up the x86 and x86_64 _exit_with_stack_teardown implementations."
2013-10-07 17:49:19 +00:00
H.J. Lu
6fe4e87954
Add an optional alias list to SYSCALLS.TXT
...
This patch adds an optional alias list to SYSCALLS.TXT. It is used to
create aliases for a syscall. For x86-64, lseek64 is an alias for lseek.
Change-Id: Icb11fd2bb461ea4f5f0a26bfc585471d7d7cc468
Signed-off-by: H.J. Lu <hjl.tools@gmail.com >
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-07 21:37:12 +04:00
Elliott Hughes
4d388c6a32
am 019d0f33: am d262e17e: Merge "Don\'t define the meaningless SOFTFLOAT for x86."
...
* commit '019d0f33478f10ebd2c885e6a920d3bbed7a8de3':
Don't define the meaningless SOFTFLOAT for x86.
2013-10-07 10:32:25 -07:00
Elliott Hughes
019d0f3347
am d262e17e: Merge "Don\'t define the meaningless SOFTFLOAT for x86."
...
* commit 'd262e17ec13b9a844940c12c90b30334f6ad744c':
Don't define the meaningless SOFTFLOAT for x86.
2013-10-07 10:29:32 -07:00
Elliott Hughes
d262e17ec1
Merge "Don't define the meaningless SOFTFLOAT for x86."
2013-10-07 17:27:18 +00:00
Elliott Hughes
a97cc5b458
Clean up the x86 and x86_64 _exit_with_stack_teardown implementations.
...
Change-Id: I4bcbbc53893612bd94643ef07722becb00f91792
2013-10-07 10:25:11 -07:00
Elliott Hughes
ee489f6ad2
Don't define the meaningless SOFTFLOAT for x86.
...
Change-Id: I9f932ad5d9f731a0de18efb881d02cedf9fcbede
2013-10-07 09:53:44 -07:00
Elliott Hughes
22678c4db9
am dd384c3e: am a6e9ae80: Merge "Fix MIPS build."
...
* commit 'dd384c3e7bae2e55981aeadee42f5ee0049219ec':
Fix MIPS build.
2013-10-06 22:37:44 -07:00
Elliott Hughes
dd384c3e7b
am a6e9ae80: Merge "Fix MIPS build."
...
* commit 'a6e9ae80e51bffa40e600beb38e7796d2ef45242':
Fix MIPS build.
2013-10-06 22:35:05 -07:00
Elliott Hughes
a6e9ae80e5
Merge "Fix MIPS build."
2013-10-07 05:32:56 +00:00
Elliott Hughes
21e7164335
Fix MIPS build.
...
Although 'register' is deprecated, we need to use v1, and there's
no way to do that through register constraints on the assembler
fragment itself.
Change-Id: Ib5b12c4c3652513d10cc61d4a4b11314ece25663
2013-10-06 22:29:17 -07:00
Elliott Hughes
ddd8a91729
am 06ac96d1: am 4e965d95: Merge "libc: Remove deprecated register"
...
* commit '06ac96d134fe5c5f3797ef2adc9df837c45d74f3':
libc: Remove deprecated register
2013-10-06 21:47:25 -07:00
Elliott Hughes
06ac96d134
am 4e965d95: Merge "libc: Remove deprecated register"
...
* commit '4e965d95cfe19cc7d3aefd9b8d0ad607475793fe':
libc: Remove deprecated register
2013-10-06 21:45:58 -07:00
Elliott Hughes
4e965d95cf
Merge "libc: Remove deprecated register"
2013-10-07 04:43:57 +00:00
Elliott Hughes
51bbfd6fb2
am 8eafc786: am fcfb6822: Merge "Upgrade to tzdata2013g."
...
* commit '8eafc786eadea69cd1e7fde8afd9372a94dffff6':
Upgrade to tzdata2013g.
2013-10-06 20:03:24 -07:00
Elliott Hughes
8eafc786ea
am fcfb6822: Merge "Upgrade to tzdata2013g."
...
* commit 'fcfb6822d1cd26d754d6f6f3bfd737b33c55b7db':
Upgrade to tzdata2013g.
2013-10-06 20:00:14 -07:00
Elliott Hughes
3fce401590
Upgrade to tzdata2013g.
...
From the release notes:
Changes affecting current and near-future time stamps
Morocco now observes DST from the last Sunday in March to the last
Sunday in October, not April to September respectively. (Thanks
to Steffen Thorsen.)
(cherry picked from commit 40f072192f )
Change-Id: I247f8cf4ef32ec5d6e6fe3845f9a8977b7e748b9
2013-10-06 19:59:14 -07:00
Elliott Hughes
fcfb6822d1
Merge "Upgrade to tzdata2013g."
2013-10-07 02:57:30 +00:00
synergydev
baa5874404
libc: Remove deprecated register
...
In c++11, register has been deprecated, and
libc is now built as gnu++11
From the documentation:
A register specifier is a hint to the implementation
that the variable so declared will be heavily used.
[ Note: The hint can be ignored and in most implementations
it will be ignored if the address of the variable is taken.
This use is deprecated (see D.2)
Change-Id: I459dc3f5f9de63fc09eeda3bc6700f31bdf20f6f
2013-10-06 13:25:02 -07:00
Elliott Hughes
e1fe52ccf1
Upgrade to tzdata2013f.
...
From the release notes:
Changes affecting near-future time stamps
Tocantins will very likely not observe DST starting this spring.
(Thanks to Steffen Thorsen.)
Jordan will likely stay at UTC+3 indefinitely, and will not fall
back this fall.
Palestine will fall back at 00:00, not 01:00. (Thanks to Steffen Thorsen.)
(cherry picked from commit 4ced7ef05a )
Change-Id: Icd4754694fbe3b7c475a63666eeeab36c72908ac
2013-10-06 11:41:17 -07:00
Elliott Hughes
21f5927605
Upgrade to tzdata2013e.
...
From the release notes:
Changes affecting near-future time stamps
This year Fiji will start DST on October 27, not October 20.
(Thanks to David Wheeler for the heads-up.) For now, guess that
Fiji will continue to spring forward the Sunday before the fourth
Monday in October.
Changes affecting time stamps before 1970
Pacific/Johnston is now a link to Pacific/Honolulu. This corrects
some errors before 1947.
Some zones have been turned into links, when they differ from
existing zones only in older data that was likely invented or that
differs only in LMT or transition from LMT. These changes affect
only time stamps before 1943. The affected zones are:
Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
America/Grenada, America/Guadeloupe, America/Marigot,
America/Montserrat, America/St_Barthelemy, America/St_Kitts,
America/St_Lucia, America/St_Thomas, America/St_Vincent,
America/Tortola, and Europe/Vaduz. (Thanks to Alois Treindl for
confirming that the old Europe/Vaduz zone was wrong and the new
link is better for WWII-era times.)
Change Kingston Mean Time from -5:07:12 to -5:07:11. This affects
America/Cayman, America/Jamaica and America/Grand_Turk time stamps
from 1890 to 1912.
Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
This affects Europe/Zurich time stamps from 1853 to 1894. (Thanks
to Alois Treindl).
Change the date of the circa-1850 Zurich transition from 1849-09-12
to 1853-07-16, overriding Shanks with data from Messerli about
postal and telegraph time in Switzerland.
Data changes affecting behavior of tzselect and similar programs
Country code BQ is now called the more-common name "Caribbean Netherlands"
rather than the more-official "Bonaire, St Eustatius & Saba".
Remove from zone.tab the names America/Montreal, America/Shiprock,
and Antarctica/South_Pole, as they are equivalent to existing
same-country-code zones for post-1970 time stamps. The data for
these names are unchanged, so the names continue to work as before.
(cherry picked from commit 35b123ef1e )
Change-Id: Ieb2627cc817db93280ceabe4034800bf36ca3f5f
2013-10-06 11:40:07 -07:00
Elliott Hughes
40f072192f
Upgrade to tzdata2013g.
...
From the release notes:
Changes affecting current and near-future time stamps
Morocco now observes DST from the last Sunday in March to the last
Sunday in October, not April to September respectively. (Thanks
to Steffen Thorsen.)
Change-Id: I9a657a1b819ce17bb424474d4bcdae093f4c4dca
2013-10-06 11:35:34 -07:00
Elliott Hughes
9258c7b23e
am b7d77a9e: am 56777421: Merge "Add arch-x86_64/include/machine."
...
* commit 'b7d77a9eb1effd5f0472dff14a8fe77d9da2c7a2':
Add arch-x86_64/include/machine.
2013-10-04 16:21:25 -07:00
Elliott Hughes
b7d77a9eb1
am 56777421: Merge "Add arch-x86_64/include/machine."
...
* commit '5677742199456e96a5f5e006102a0bafa79747b2':
Add arch-x86_64/include/machine.
2013-10-04 16:19:29 -07:00
Elliott Hughes
5677742199
Merge "Add arch-x86_64/include/machine."
2013-10-04 23:17:31 +00:00
Elliott Hughes
72645164b6
Add arch-x86_64/include/machine.
...
This is basically the other half of I5de76f6c46ac87779f207d568a86bb453e2414de
from Pavel Chupin <pavel.v.chupin@intel.com >, but taking the exact upstream
_types.h instead of the modified version. (I was confused when I suggested
otherwise.)
I've also cleaned up the internal_types.h situation; we weren't gaining
anything from these empty files, and there is no upstream internal_types.h
for x86_64.
Change-Id: I802a9a6a8df1c979e820659212c75a47c2ef392e
2013-10-04 16:10:13 -07:00
Elliott Hughes
12e62b4fe7
am fb8ce528: am 8fb977ba: Merge "Add arch-x86_64/bionic."
...
* commit 'fb8ce528373555a4b2782343e0b19e0b074e8e92':
Add arch-x86_64/bionic.
2013-10-04 15:06:24 -07:00
Elliott Hughes
fb8ce52837
am 8fb977ba: Merge "Add arch-x86_64/bionic."
...
* commit '8fb977ba114e3fcb4965bc0211d3f9a409915994':
Add arch-x86_64/bionic.
2013-10-04 15:04:53 -07:00
Elliott Hughes
8fb977ba11
Merge "Add arch-x86_64/bionic."
2013-10-04 22:02:07 +00:00
Elliott Hughes
4906e5653c
Add arch-x86_64/bionic.
...
This is basically half of I5de76f6c46ac87779f207d568a86bb453e2414de from
Pavel Chupin <pavel.v.chupin@intel.com >, but with the stock upstream
setjump/sigsetjmp and H.J. Lu's suggested changes to __rt_sigreturn.
Change-Id: I8167ec228faeb2065391e5bec0413cca662f3d33
2013-10-04 14:55:30 -07:00
Nick Kralevich
7909bd19ab
am 9da8b682: am c417d0a5: Merge "Make error messages even better!"
...
* commit '9da8b6829cb8febb70af46761b7f2ca19e6498ce':
Make error messages even better!
2013-10-04 12:02:57 -07:00
Elliott Hughes
83b719a88e
am c89f1db0: am 7021e438: Merge "x86_64: Remove lseek64 for x86_64 for a while"
...
* commit 'c89f1db0a92e4530f1a1686b3629d3d3960f825f':
x86_64: Remove lseek64 for x86_64 for a while
2013-10-04 12:02:57 -07:00
Nick Kralevich
9da8b6829c
am c417d0a5: Merge "Make error messages even better!"
...
* commit 'c417d0a5cd0743d691fc63cc1007979b836945a0':
Make error messages even better!
2013-10-04 11:56:57 -07:00
Elliott Hughes
c89f1db0a9
am 7021e438: Merge "x86_64: Remove lseek64 for x86_64 for a while"
...
* commit '7021e438771f5328843e35e948838bf74392d353':
x86_64: Remove lseek64 for x86_64 for a while
2013-10-04 11:56:56 -07:00
Elliott Hughes
bc109ea47d
am aa3c74d1: am 57d9cebb: Merge "Remove useless x86 fallbacks."
...
* commit 'aa3c74d175634ab2222ee5a771b01e7434093dbf':
Remove useless x86 fallbacks.
2013-10-04 11:53:25 -07:00
Nick Kralevich
c417d0a5cd
Merge "Make error messages even better!"
2013-10-04 18:48:47 +00:00
Nick Kralevich
6861c6f85e
Make error messages even better!
...
Change-Id: I72bd1eb1d526dc59833e5bc3c636171f7f9545af
2013-10-04 11:43:30 -07:00
Elliott Hughes
7021e43877
Merge "x86_64: Remove lseek64 for x86_64 for a while"
2013-10-04 18:30:56 +00:00
Pavel Chupin
9373bbb24b
x86_64: Remove lseek64 for x86_64 for a while
...
Just to keep x86_64 libc buildable
Change-Id: I6e69abe2b699bc4ac12e41178ee080df5dac47b7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-04 11:30:27 -07:00
Elliott Hughes
aa3c74d175
am 57d9cebb: Merge "Remove useless x86 fallbacks."
...
* commit '57d9cebbeaa63b9c3ca5c4f66938154fe7bb870c':
Remove useless x86 fallbacks.
2013-10-04 11:07:03 -07:00
Elliott Hughes
57d9cebbea
Merge "Remove useless x86 fallbacks."
2013-10-04 18:05:48 +00:00
Elliott Hughes
10ab1ec319
am 82d974c7: am a81fd294: Merge "Fixed ASM_ALIGN macro"
...
* commit '82d974c7ef88f7f796794f2417dd707cc5be6a9c':
Fixed ASM_ALIGN macro
2013-10-04 09:58:26 -07:00
Nick Kralevich
e0a14e7573
am ed1f8ea0: am bf452313: Merge "FORTIFY_SOURCE: emphasize prevention in error messages."
...
* commit 'ed1f8ea0369195aa0c3aa9926a94efa26fd14639':
FORTIFY_SOURCE: emphasize prevention in error messages.
2013-10-04 09:58:25 -07:00
Elliott Hughes
9d3b4b48d8
am 71e0b240: am 41ba05e2: Merge "x86_64: Fix get_tls and statvfs"
...
* commit '71e0b240ed980e77f736be2a27d255d64747b388':
x86_64: Fix get_tls and statvfs
2013-10-04 09:58:23 -07:00
Elliott Hughes
be7b6408b3
am 6d923d49: am 14102932: Merge "Move common arch-* code to arch-common directory"
...
* commit '6d923d497373c160f6fdddd42f5ed56e7bf0923a':
Move common arch-* code to arch-common directory
2013-10-04 09:58:23 -07:00
Elliott Hughes
82d974c7ef
am a81fd294: Merge "Fixed ASM_ALIGN macro"
...
* commit 'a81fd294be55f8781dbf22f381a3335212d8dbd9':
Fixed ASM_ALIGN macro
2013-10-04 09:26:44 -07:00
Elliott Hughes
a81fd294be
Merge "Fixed ASM_ALIGN macro"
2013-10-04 16:25:47 +00:00
Nick Kralevich
ed1f8ea036
am bf452313: Merge "FORTIFY_SOURCE: emphasize prevention in error messages."
...
* commit 'bf452313b0fcc2a14e55435b93eebd0ead73ad3e':
FORTIFY_SOURCE: emphasize prevention in error messages.
2013-10-04 09:23:26 -07:00
Nick Kralevich
bf452313b0
Merge "FORTIFY_SOURCE: emphasize prevention in error messages."
2013-10-04 16:20:20 +00:00
Nick Kralevich
e2617290fc
FORTIFY_SOURCE: emphasize prevention in error messages.
...
FORTIFY_SOURCE prevents buffer overflows from occurring.
However, the error message often implies that we only
detect it, not prevent it.
Bring more clarity to the error messages by emphasizing
prevention over detection.
Change-Id: I5f3e1478673bdfc589e6cc4199fce8e52e197a24
2013-10-04 08:57:17 -07:00
Pavel Chupin
719269db18
Fixed ASM_ALIGN macro
...
Got it all wrong on first patch. Somehow that didn't affect system
build, neither arm nor x86... something to think about.
Change-Id: I45416d843aad44af62841c6f6ab607ccf3f012ea
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-04 11:12:58 +04:00
Elliott Hughes
7e841ed688
Remove useless x86 fallbacks.
...
The NDK ABI requires that you support SSE2, and the build system won't let you
build with ARCH_X86_HAVE_SSE2 set to false. So let's stop pretending this
constant is actually a variable, and let's remove the corresponding dead code.
Also, the USE_SSE2 and USE_SSE3 macros are unused, so let's not bother
setting them.
Change-Id: I40b501d998530d22518ce1c4d14575513a8125bb
2013-10-03 23:30:33 -07:00
Elliott Hughes
71e0b240ed
am 41ba05e2: Merge "x86_64: Fix get_tls and statvfs"
...
* commit '41ba05e22ed1829cc7431fd4899cfa5725c76044':
x86_64: Fix get_tls and statvfs
2013-10-03 21:23:28 -07:00
Elliott Hughes
41ba05e22e
Merge "x86_64: Fix get_tls and statvfs"
2013-10-04 00:34:50 +00:00
Pavel Chupin
1e52a54a47
x86_64: Fix get_tls and statvfs
...
* bionic_tls.h - Add x86_64 version of get_tls macro;
* statvfs.h - 64-bit kernels don't have __statfs64/__fstatfs64, applying
workaround;
Change-Id: I20d7ddad74c7b7243866373d0142da6627c08280
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-03 17:31:50 -07:00
Elliott Hughes
6d923d4973
am 14102932: Merge "Move common arch-* code to arch-common directory"
...
* commit '141029327cdc62629e248b3be1d7a58d4e9e5ba8':
Move common arch-* code to arch-common directory
2013-10-03 16:20:28 -07:00
Elliott Hughes
141029327c
Merge "Move common arch-* code to arch-common directory"
2013-10-03 23:17:58 +00:00
Nick Kralevich
2837f83068
am 687c7e3e: am e8dc673c: Merge "Don\'t export unnecessary symbol."
...
* commit '687c7e3ece0f485c79654ca0c4da15b86b1f8a7f':
Don't export unnecessary symbol.
2013-10-03 15:57:09 -07:00
Nick Kralevich
6f10368926
am 2e819c58: am 2ff3c746: Merge "Check memory size on FD_* functions"
...
* commit '2e819c58c9396eec3e4311ef2c9bdcadd107f001':
Check memory size on FD_* functions
2013-10-03 15:57:09 -07:00
Nick Kralevich
687c7e3ece
am e8dc673c: Merge "Don\'t export unnecessary symbol."
...
* commit 'e8dc673ca56556389ad06ce1bb55e6624b4db721':
Don't export unnecessary symbol.
2013-10-03 15:54:27 -07:00
Nick Kralevich
2e819c58c9
am 2ff3c746: Merge "Check memory size on FD_* functions"
...
* commit '2ff3c746aeafeac9d1019bed97a99346515516af':
Check memory size on FD_* functions
2013-10-03 15:54:27 -07:00
Nick Kralevich
e8dc673ca5
Merge "Don't export unnecessary symbol."
2013-10-03 22:52:02 +00:00
Nick Kralevich
2ff3c746ae
Merge "Check memory size on FD_* functions"
2013-10-03 22:46:49 +00:00
Nick Kralevich
7943df62f7
Check memory size on FD_* functions
...
Make sure the buffer we're dealing with has enough room.
Might as well check for memory issues while we're here,
even though I don't imagine they'll happen in practice.
Change-Id: I0ae1f0f06aca9ceb91e58c70183bb14e275b92b5
2013-10-03 15:45:10 -07:00
Nick Kralevich
35c1862cdf
Don't export unnecessary symbol.
...
Change-Id: I8b1d75a08476c41dd8e3f09fc93a3df617928f88
2013-10-03 14:59:05 -07:00
Christopher Ferris
1a086a52d3
am 270c52da: am 1fe477fc: Merge "Add dependencies on included makefiles."
...
* commit '270c52da0db68c6961eb576b67adc0c41c418763':
Add dependencies on included makefiles.
2013-10-03 14:57:21 -07:00
Christopher Ferris
270c52da0d
am 1fe477fc: Merge "Add dependencies on included makefiles."
...
* commit '1fe477fcb77ba29ef3264f689e7002f6512715ab':
Add dependencies on included makefiles.
2013-10-03 14:40:12 -07:00
Christopher Ferris
1fe477fcb7
Merge "Add dependencies on included makefiles."
2013-10-03 21:35:37 +00:00
Christopher Ferris
d7a632948d
Add dependencies on included makefiles.
...
Bug: 11050594
Merge from internal master.
(cherry-picked from f389284e86 )
Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 14:17:14 -07:00
Christopher Ferris
bdc610aba5
am dc7f8ddc: am 6088047a: Merge "Remove dead files."
...
* commit 'dc7f8ddc227e833b889eb1eedc16b9b5827fc127':
Remove dead files.
2013-10-03 13:26:38 -07:00
Christopher Ferris
dc7f8ddc22
am 6088047a: Merge "Remove dead files."
...
* commit '6088047a64abb1e8a27fcb9868b00a630fbdfed4':
Remove dead files.
2013-10-03 13:23:45 -07:00
Christopher Ferris
6088047a64
Merge "Remove dead files."
2013-10-03 19:53:21 +00:00
Christopher Ferris
fc4d70fe54
Remove dead files.
...
memcpy.a15.S/strcmp.a15.S files were submitted by ARM for use as the basis
for the memcpy/strcmp implementations in cortex-a15.
memset.S was moved in to the generic directory.
NOTE: memcpy.a9.S was submitted by Linaro to be the basis for the memcpy
for cortex-a9/cortex-a15 but has not been incorporated yet.
Bug: 10971279
Merge from internal master.
(cherry-picked from 48fc3e8b9f )
Change-Id: I8f9297578990d517f004e4e8840e2b2cbd5a47d8
2013-10-03 12:35:56 -07:00
Pavel Chupin
b49c17c2bf
Move common arch-* code to arch-common directory
...
Will be helpful on adding x86_64
Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-03 11:14:33 +04:00
Christopher Ferris
de7ed18df0
am 0292c1c8: am 3901b1bd: Merge "Remove the __ARM_FEATURE_DSP check."
...
* commit '0292c1c81dfed23a32d46fb0b089b7eccb87e21e':
Remove the __ARM_FEATURE_DSP check.
2013-10-02 23:27:06 -07:00
Christopher Ferris
0292c1c81d
am 3901b1bd: Merge "Remove the __ARM_FEATURE_DSP check."
...
* commit '3901b1bdd939973a72e01272177757b2524995d3':
Remove the __ARM_FEATURE_DSP check.
2013-10-02 23:25:08 -07:00
Christopher Ferris
3901b1bdd9
Merge "Remove the __ARM_FEATURE_DSP check."
2013-10-03 06:22:27 +00:00
Christopher Ferris
aec1b3540a
Remove the __ARM_FEATURE_DSP check.
...
The check for __ARM_FEATURE_DSP being defined is pointless since it
is always defined.
Bug: 10971279
Merge from internal master.
(cherry-picked from d2642fa70c )
Change-Id: If23ab3271f4da0c38cd531ffdc9a7e5eed6ec5dc
2013-10-02 23:14:01 -07:00
Elliott Hughes
fa9fb5cb01
am 2a3d760e: am 00a816e5: Merge "Fix 32-bit issues in tests, and add a trivial test for the FD_* macros."
...
* commit '2a3d760e0fc0cbd2cac03754949457c062ced5f5':
Fix 32-bit issues in tests, and add a trivial test for the FD_* macros.
2013-10-02 21:04:32 -07:00
Elliott Hughes
2a3d760e0f
am 00a816e5: Merge "Fix 32-bit issues in tests, and add a trivial test for the FD_* macros."
...
* commit '00a816e5874153ae3103af869182a81b31445388':
Fix 32-bit issues in tests, and add a trivial test for the FD_* macros.
2013-10-02 21:02:43 -07:00
Elliott Hughes
00a816e587
Merge "Fix 32-bit issues in tests, and add a trivial test for the FD_* macros."
2013-10-03 04:00:30 +00:00
Elliott Hughes
b8b8b6dc2e
am 14d5e22f: am 66b18dd4: Merge "Fix the x86_64 fenv.h."
...
* commit '14d5e22feef2f097bf7139c2f452d2810970651a':
Fix the x86_64 fenv.h.
2013-10-02 20:51:50 -07:00
Elliott Hughes
14d5e22fee
am 66b18dd4: Merge "Fix the x86_64 fenv.h."
...
* commit '66b18dd4e4294de72728f51af61b79f6f7885a2f':
Fix the x86_64 fenv.h.
2013-10-02 20:50:21 -07:00
Elliott Hughes
66b18dd4e4
Merge "Fix the x86_64 fenv.h."
2013-10-03 03:48:19 +00:00
Nick Kralevich
670f372470
am b6201932: am 2c701a1b: Merge "libc: don\'t export unnecessary symbols"
...
* commit 'b6201932838c46a567e3411047719fd5c2797e96':
libc: don't export unnecessary symbols
2013-10-02 17:03:42 -07:00
Elliott Hughes
361847f9ac
Fix the x86_64 fenv.h.
...
We should clean all the fenv.h files up, but not now. I've raised
bug 11050744 as a reminder.
Change-Id: I640c15b0f0477ec1a7891c031860404875bbe4b5
2013-10-02 17:02:58 -07:00
Nick Kralevich
b620193283
am 2c701a1b: Merge "libc: don\'t export unnecessary symbols"
...
* commit '2c701a1bac2bd852b68f5a2e50c2c60fa82266e0':
libc: don't export unnecessary symbols
2013-10-02 17:01:22 -07:00
Nick Kralevich
2c701a1bac
Merge "libc: don't export unnecessary symbols"
2013-10-02 23:59:23 +00:00
Elliott Hughes
5b9310e502
Fix 32-bit issues in tests, and add a trivial test for the FD_* macros.
...
Change-Id: Ia3f21ce1f0ed9236527fe44d36ccb7de6bf63113
2013-10-02 16:59:05 -07:00
Nick Kralevich
32bbf8a63b
libc: don't export unnecessary symbols
...
Symbols associated with the internal implementation of memcpy
like routines should be private.
Change-Id: I2b1d1f59006395c29d518c153928437b08f93d16
2013-10-02 16:54:58 -07:00
Nick Kralevich
5634373320
am 8598cd68: am f741e1c2: Merge "FORTIFY_SOURCE: Add __FD_* checks"
...
* commit '8598cd6888366008033286113bd633b44c70b7dd':
FORTIFY_SOURCE: Add __FD_* checks
2013-10-02 16:30:51 -07:00
Nick Kralevich
8598cd6888
am f741e1c2: Merge "FORTIFY_SOURCE: Add __FD_* checks"
...
* commit 'f741e1c2ed27f153e92a2a36c9db3b189f9a6388':
FORTIFY_SOURCE: Add __FD_* checks
2013-10-02 16:28:00 -07:00
Nick Kralevich
f741e1c2ed
Merge "FORTIFY_SOURCE: Add __FD_* checks"
2013-10-02 23:26:50 +00:00
Nick Kralevich
90201d5eca
FORTIFY_SOURCE: Add __FD_* checks
...
Add FORTIFY_SOURCE checks for the following macros:
* FD_CLR
* FD_ISSET
* FD_SET
Bug: 11047121
Change-Id: I3c5952136aec9eff3288b91b1318677ff971525c
2013-10-02 16:11:30 -07:00
Stephen Hines
a6d4acc9f9
am 1986d369: am 32c0c6e7: Merge "Use gnu++11 and gnu99 explicitly for C++/C files."
...
* commit '1986d36957089bfc8a9d8135768f067395e98bd5':
Use gnu++11 and gnu99 explicitly for C++/C files.
2013-10-02 15:22:56 -07:00
Stephen Hines
1986d36957
am 32c0c6e7: Merge "Use gnu++11 and gnu99 explicitly for C++/C files."
...
* commit '32c0c6e7d56ea2fad0a362f37bb84937b82c3be2':
Use gnu++11 and gnu99 explicitly for C++/C files.
2013-10-02 15:20:36 -07:00
Stephen Hines
32c0c6e7d5
Merge "Use gnu++11 and gnu99 explicitly for C++/C files."
2013-10-02 22:18:26 +00:00
Nick Kralevich
944ce989f8
am f7da611b: am 00d51c9f: Merge "Use alloc_size attribute on *alloc functions"
...
* commit 'f7da611b3dedaf9951e08b0296daf67eda8228c0':
Use alloc_size attribute on *alloc functions
2013-10-02 14:38:12 -07:00
Nick Kralevich
f7da611b3d
am 00d51c9f: Merge "Use alloc_size attribute on *alloc functions"
...
* commit '00d51c9f6e9b3f10bddad80b3938ffa553094578':
Use alloc_size attribute on *alloc functions
2013-10-02 14:35:03 -07:00
Nick Kralevich
00d51c9f6e
Merge "Use alloc_size attribute on *alloc functions"
2013-10-02 21:31:43 +00:00
Nick Kralevich
b91791d71c
Use alloc_size attribute on *alloc functions
...
malloc and family were not declared with __attribute__((alloc_size)).
This was (sometimes) preventing FORTIFY_SOURCE related functions
from knowing the size of the buffer it's dealing with, inhibiting
FORTIFY_SOURCE protections.
Add __attribute__((alloc_size))
Information about the alloc_size attribute can be found
at http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
Change-Id: Ia2f0a445f0170a7325f69259b5e7fb35a9f14921
2013-10-02 14:14:40 -07:00
Stephen Hines
762cea46f0
Use gnu++11 and gnu99 explicitly for C++/C files.
...
Clang and gcc default to different standards, so we should be explicit
about the versions we want to compile for.
Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-02 12:37:16 -07:00
Elliott Hughes
a0a5a50152
am 2e2a4f97: am 4bbf3a8b: Merge "Remove #define _BITSIZE 32."
...
* commit '2e2a4f97bfbb7b94d12690395c5cbcf7d7d1edc7':
Remove #define _BITSIZE 32.
2013-10-02 10:10:27 -07:00
Elliott Hughes
2e2a4f97bf
am 4bbf3a8b: Merge "Remove #define _BITSIZE 32."
...
* commit '4bbf3a8b558ea8b5ce62f2d1ee2599a8e95c21c0':
Remove #define _BITSIZE 32.
2013-10-02 10:08:58 -07:00
Elliott Hughes
4bbf3a8b55
Merge "Remove #define _BITSIZE 32."
2013-10-02 17:06:44 +00:00
Stephen Hines
9218adc390
am 62f95981: am 70e1730c: Merge "Remove _FORTIFY_SOURCE in implementation files."
...
* commit '62f95981df783575efd44cb4206be7b2cbdfcf1c':
Remove _FORTIFY_SOURCE in implementation files.
2013-10-02 09:33:27 -07:00
Stephen Hines
95fa896206
am dcffa999: am e0e6409c: Merge "Add simple implementation _Unwind_GetIP() for clang compiles."
...
* commit 'dcffa9998e95dc0fb89d0c9e0ae51a0557d5b2b4':
Add simple implementation _Unwind_GetIP() for clang compiles.
2013-10-02 09:33:27 -07:00
Stephen Hines
62f95981df
am 70e1730c: Merge "Remove _FORTIFY_SOURCE in implementation files."
...
* commit '70e1730c38ad91cf65425e29732b5c041dd0cf43':
Remove _FORTIFY_SOURCE in implementation files.
2013-10-02 09:31:56 -07:00
Stephen Hines
dcffa9998e
am e0e6409c: Merge "Add simple implementation _Unwind_GetIP() for clang compiles."
...
* commit 'e0e6409c12d21cf1f0390c435fd76e74b5c4580d':
Add simple implementation _Unwind_GetIP() for clang compiles.
2013-10-02 09:31:55 -07:00
Stephen Hines
70e1730c38
Merge "Remove _FORTIFY_SOURCE in implementation files."
2013-10-02 16:30:15 +00:00
Stephen Hines
e0e6409c12
Merge "Add simple implementation _Unwind_GetIP() for clang compiles."
2013-10-02 16:29:22 +00:00
Elliott Hughes
5e72c513bf
Remove #define _BITSIZE 32.
...
I've no idea what _BITSIZE was supposed to be, glibc doesn't have it,
the BSDs don't have it, and no code is currently using it. But having
it set unconditionally to 32 sounds like a bad idea.
Change-Id: I900235c1489afba891fff0bc3b43e9d593249a4f
2013-10-02 09:23:46 -07:00
Elliott Hughes
5cf3b4bd34
am a8f4e905: am e26135ab: Merge "The x86_64 kernel headers are the x86 kernel headers."
...
* commit 'a8f4e905fa3fe5998607ff084091879b77257fd0':
The x86_64 kernel headers are the x86 kernel headers.
2013-10-02 08:57:27 -07:00
Elliott Hughes
a8f4e905fa
am e26135ab: Merge "The x86_64 kernel headers are the x86 kernel headers."
...
* commit 'e26135ab18c94ba6ee9866bc04471853a899565b':
The x86_64 kernel headers are the x86 kernel headers.
2013-10-02 08:55:07 -07:00
Elliott Hughes
e26135ab18
Merge "The x86_64 kernel headers are the x86 kernel headers."
2013-10-02 15:52:02 +00:00
Elliott Hughes
14cf72860f
am f0470422: am 9461e9fa: Merge "Add missing backslash in MIPS filelist"
...
* commit 'f04704225b64d2ced8d34036af3336a57d945af5':
Add missing backslash in MIPS filelist
2013-10-01 19:51:21 -07:00
Elliott Hughes
f04704225b
am 9461e9fa: Merge "Add missing backslash in MIPS filelist"
...
* commit '9461e9fae33bddecd2b1746e3158b9d2309a8163':
Add missing backslash in MIPS filelist
2013-10-01 19:49:00 -07:00
Elliott Hughes
9461e9fae3
Merge "Add missing backslash in MIPS filelist"
2013-10-02 02:46:12 +00:00
Chris Dearman
fa4d596abc
Add missing backslash in MIPS filelist
...
Change-Id: I993ea7038cd641ea167d974226e2350e49d41c88
2013-10-01 19:11:26 -07:00
Stephen Hines
5f6cfce4f6
Add simple implementation _Unwind_GetIP() for clang compiles.
...
Clang (prior to 3.4) does not actually provide a declaration (or definition)
of _Unwind_GetIP() for ARM. We can work around this by writing our own
basic implementation using the available primitive operations.
Change-Id: If6c66846952d8545849ad32d2b55daa4599cfe2c
2013-10-01 18:20:51 -07:00
Elliott Hughes
b1b8babbbb
am c7e8e990: am 5e244a9b: Merge "Fix libm build for x86_64."
...
* commit 'c7e8e99082efaa616b15fb43ffe0f2e11423ea7d':
Fix libm build for x86_64.
2013-10-01 18:05:24 -07:00
Elliott Hughes
86d920c302
The x86_64 kernel headers are the x86 kernel headers.
...
Change-Id: I8763aee7043800eb23a720914b57396e79fa812e
2013-10-01 18:03:23 -07:00
Elliott Hughes
c7e8e99082
am 5e244a9b: Merge "Fix libm build for x86_64."
...
* commit '5e244a9bee8f26d7eed4e81b25483fbd86f7b6d4':
Fix libm build for x86_64.
2013-10-01 18:02:39 -07:00
Elliott Hughes
5e244a9bee
Merge "Fix libm build for x86_64."
2013-10-02 01:00:25 +00:00
Elliott Hughes
770a349560
Fix libm build for x86_64.
...
Change-Id: If89da2d5c3d9a88f78ffd8b260ad0f2fd391c608
2013-10-01 17:57:19 -07:00
Elliott Hughes
7cb6933c0d
am 8a50d0c0: am bcc2bd3b: Merge "x86_64: libm fixes"
...
* commit '8a50d0c06f456ca32c49f8e52883ede959c91c21':
x86_64: libm fixes
2013-10-01 17:37:55 -07:00
Elliott Hughes
8a50d0c06f
am bcc2bd3b: Merge "x86_64: libm fixes"
...
* commit 'bcc2bd3b1e625243df41bdf212bdb3dd2ec3c26e':
x86_64: libm fixes
2013-10-01 17:35:39 -07:00
Elliott Hughes
a1de7e5033
am f1c534ce: am 6892a29b: Merge "Remove more assumptions that pointers are 32-bit."
...
* commit 'f1c534ce222de66bdeac06f2dca62fbd84f629f9':
Remove more assumptions that pointers are 32-bit.
2013-10-01 17:34:34 -07:00
Elliott Hughes
bcc2bd3b1e
Merge "x86_64: libm fixes"
2013-10-02 00:32:43 +00:00
Elliott Hughes
f1c534ce22
am 6892a29b: Merge "Remove more assumptions that pointers are 32-bit."
...
* commit '6892a29b9e63f0bb54bd402081431b1233c125aa':
Remove more assumptions that pointers are 32-bit.
2013-10-01 17:32:19 -07:00
Elliott Hughes
6892a29b9e
Merge "Remove more assumptions that pointers are 32-bit."
2013-10-02 00:30:51 +00:00
Elliott Hughes
405f8553cf
Remove more assumptions that pointers are 32-bit.
...
Change-Id: I2157e2fc4db7692b746c697982c3d028a056462a
2013-10-01 17:25:28 -07:00
Elliott Hughes
c1cd0f74c9
am f43f8aa8: am b2acd5de: Merge "x86_64: Update Makefiles for x86_64 targets and add symlinks"
...
* commit 'f43f8aa80a77f59f4ad941d367fe25e30387a72b':
x86_64: Update Makefiles for x86_64 targets and add symlinks
2013-10-01 15:41:27 -07:00
Elliott Hughes
f43f8aa80a
am b2acd5de: Merge "x86_64: Update Makefiles for x86_64 targets and add symlinks"
...
* commit 'b2acd5ded1e801fb1379ec51c6f43eab63af50f5':
x86_64: Update Makefiles for x86_64 targets and add symlinks
2013-10-01 15:39:19 -07:00
Elliott Hughes
b2acd5ded1
Merge "x86_64: Update Makefiles for x86_64 targets and add symlinks"
2013-10-01 22:37:10 +00:00
Pavel Chupin
a567a8e4bd
x86_64: Update Makefiles for x86_64 targets and add symlinks
...
Use basic .c versions of all functions for x86_64 until they are
manually optimized and .s versions released.
Change-Id: I59bba08931e894822db485c8803c2665c226234a
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-01 15:36:08 -07:00
Stephen Hines
35d937e4eb
Remove _FORTIFY_SOURCE in implementation files.
...
This was causing conflicting declarations for the library definitions of
common functions like sprintf(), snprintf(), and strchr().
Change-Id: I5daaa8a58183aa0d4d0fae8a7cb799671810f576
2013-10-01 15:02:07 -07:00
Elliott Hughes
211fd4f963
am 24e1dd80: am 4eaa1e1e: Merge "x86_64: add new __NR_arch_prctl syscall"
...
* commit '24e1dd8016eeaaa6ef3646cbb143de1506e733e8':
x86_64: add new __NR_arch_prctl syscall
2013-10-01 14:04:19 -07:00
Elliott Hughes
24e1dd8016
am 4eaa1e1e: Merge "x86_64: add new __NR_arch_prctl syscall"
...
* commit '4eaa1e1ea8e4ba4fed31e4bd884e27683db90d81':
x86_64: add new __NR_arch_prctl syscall
2013-10-01 14:01:09 -07:00
Elliott Hughes
35336777f1
am 67e0214d: am 232dff3a: Merge "Regenerate the system call stubs (to get x86_64)."
...
* commit '67e0214d0f620df7a7928ef0fa1a9c0aac326a20':
Regenerate the system call stubs (to get x86_64).
2013-10-01 13:59:59 -07:00
Elliott Hughes
4eaa1e1ea8
Merge "x86_64: add new __NR_arch_prctl syscall"
2013-10-01 20:58:41 +00:00
Elliott Hughes
67e0214d0f
am 232dff3a: Merge "Regenerate the system call stubs (to get x86_64)."
...
* commit '232dff3af296d8b86658a9742288ee487b41dd3f':
Regenerate the system call stubs (to get x86_64).
2013-10-01 13:56:51 -07:00
Pavel Chupin
9a4127bb0a
x86_64: add new __NR_arch_prctl syscall
...
This is used to set/get TLS on x86_64. There's no public declaration
of this because it's not meant to be used outside the C library, like
glibc (though we don't currently have any visibility controls to ensure
this).
Change-Id: I5fc0a5e3ffc3f4cd597d92ee685ab19568ea18f7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-01 13:56:21 -07:00
Elliott Hughes
232dff3af2
Merge "Regenerate the system call stubs (to get x86_64)."
2013-10-01 20:53:51 +00:00
Elliott Hughes
1e99886172
am c58d08d6: am 475e8dde: Merge "x86_64: Add x86_64 syscalls and tune gen scripts for x86_64"
...
* commit 'c58d08d655fbb3e0472fcb6ea9879fd1ced39172':
x86_64: Add x86_64 syscalls and tune gen scripts for x86_64
2013-10-01 13:38:16 -07:00
Elliott Hughes
c58d08d655
am 475e8dde: Merge "x86_64: Add x86_64 syscalls and tune gen scripts for x86_64"
...
* commit '475e8dde178f05f91626a22ade795244efe69a3e':
x86_64: Add x86_64 syscalls and tune gen scripts for x86_64
2013-10-01 13:30:28 -07:00
Elliott Hughes
e4ffd9f234
Regenerate the system call stubs (to get x86_64).
...
This touches the x86 stubs too because arm, x86, and x86_64 now
all share the same header (at a source level), which causes a
reordering of the #include lines.
Change-Id: If9a1e2b2718bd41d8399fea748bce672c513ef84
2013-10-01 13:29:43 -07:00
Elliott Hughes
475e8dde17
Merge "x86_64: Add x86_64 syscalls and tune gen scripts for x86_64"
2013-10-01 20:27:49 +00:00
Pavel Chupin
f12a18b850
x86_64: Add x86_64 syscalls and tune gen scripts for x86_64
...
* Tune syscall stubs generator for 4th target: x86_64
* Update SYSCALLS.TXT with x86_64 syscalls:
- Most of the x86 syscalls are equally supported
- *32 syscalls are not supported on 64-bit
- *64 syscalls are replaced accordingly without 64 suffix
- Some syscalls are not supported, replaced with x86_64 analog
Syscalls are regenerated as separate patch for review convenience.
Change-Id: I4ea2e0f13759b0aa61f05208ca68da8d6bc7c048
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-01 13:27:07 -07:00
Pavel Chupin
ce7add19d8
x86_64: libm fixes
...
* Makefile update for x86_64 target
* amd64 arch files
Change-Id: I8f17e3338bffd89a3086fbddd1e91bb4619eac1b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-10-01 11:38:54 -07:00
Elliott Hughes
a08be021cc
am 57e55fe3: am fd152c31: Merge "Clean up some comments."
...
* commit '57e55fe3b32465023071a19e368d91f4804ade3b':
Clean up some comments.
2013-10-01 11:14:27 -07:00
Elliott Hughes
57e55fe3b3
am fd152c31: Merge "Clean up some comments."
...
* commit 'fd152c31586a1f5e6763b06f1182ccd72cb86b69':
Clean up some comments.
2013-10-01 11:12:09 -07:00
Elliott Hughes
fd152c3158
Merge "Clean up some comments."
2013-10-01 18:10:54 +00:00
Elliott Hughes
c0af695426
Clean up some comments.
...
Copyright headers shouldn't contain the filename (and especially
shouldn't contain a different file's filename).
Change-Id: I82690a3bf371265402bc16f5d2fbb9299c3a1926
2013-10-01 11:10:21 -07:00
Elliott Hughes
d4e6961041
am 1a46de67: am f281fd02: Merge "Better statfs/fstatfs glibc compatibility."
...
* commit '1a46de67b3f78ce44ddf622bcf5918fe758dd4d4':
Better statfs/fstatfs glibc compatibility.
2013-10-01 10:04:30 -07:00
Elliott Hughes
58413fe735
am 4b5a0e1a: am 693bd73f: Merge "Remove 32-bit assumptions from the ELF code."
...
* commit '4b5a0e1ad76d76d6a8793f61e3c0902ea4628ce7':
Remove 32-bit assumptions from the ELF code.
2013-10-01 10:04:29 -07:00
Elliott Hughes
1a46de67b3
am f281fd02: Merge "Better statfs/fstatfs glibc compatibility."
...
* commit 'f281fd02e9eebea3de9c07412c5b66647ca0c290':
Better statfs/fstatfs glibc compatibility.
2013-10-01 10:02:16 -07:00
Elliott Hughes
4b5a0e1ad7
am 693bd73f: Merge "Remove 32-bit assumptions from the ELF code."
...
* commit '693bd73fcdf1504e84aef314d1933f5efc2c817d':
Remove 32-bit assumptions from the ELF code.
2013-10-01 10:02:16 -07:00
Elliott Hughes
f281fd02e9
Merge "Better statfs/fstatfs glibc compatibility."
2013-10-01 15:30:40 +00:00
Elliott Hughes
693bd73fcd
Merge "Remove 32-bit assumptions from the ELF code."
2013-10-01 15:23:44 +00:00
Elliott Hughes
01a700e5d2
Better statfs/fstatfs glibc compatibility.
...
Change-Id: I069d169c96cd71b75a045ec911fb4bd484c6b2c9
2013-09-30 21:57:07 -07:00
Elliott Hughes
6c8dc46406
am 28317d3a: am f5ea738b: Merge "Fix x86 build."
...
* commit '28317d3a161c88f88e85d97d584d656ffbe63a19':
Fix x86 build.
2013-09-30 20:53:55 -07:00
Elliott Hughes
28317d3a16
am f5ea738b: Merge "Fix x86 build."
...
* commit 'f5ea738baa0ad5b32348f2ac42450d33d452ef31':
Fix x86 build.
2013-09-30 20:51:53 -07:00
Elliott Hughes
f5ea738baa
Merge "Fix x86 build."
2013-10-01 02:23:02 +00:00
Elliott Hughes
3456a1f5f4
Fix x86 build.
...
Change-Id: I1f2d8189bec3d0e25d21ca7d7bd73fd02f8678e2
2013-09-30 19:20:02 -07:00
Elliott Hughes
5d641bcf70
am f5dcdfc4: am 6dee3b9a: Merge "Add x86_64 to the bionic headers."
...
* commit 'f5dcdfc438684bbe93e398b6551f915fe3fe10bf':
Add x86_64 to the bionic headers.
2013-09-30 18:45:57 -07:00
Elliott Hughes
f5dcdfc438
am 6dee3b9a: Merge "Add x86_64 to the bionic headers."
...
* commit '6dee3b9aeec40bb518c1a29b4462300869a03d8e':
Add x86_64 to the bionic headers.
2013-09-30 18:44:28 -07:00
Elliott Hughes
c620059479
Remove 32-bit assumptions from the ELF code.
...
Change-Id: I2c1f3d34c33685799aade8866eec44479ff9f963
2013-09-30 18:43:46 -07:00
Elliott Hughes
6dee3b9aee
Merge "Add x86_64 to the bionic headers."
2013-10-01 01:42:43 +00:00
Elliott Hughes
d3e64a3f40
Add x86_64 to the bionic headers.
...
Manual changes:
cpp.py: cope with macros that refer to other macros.
defaults.py: x86 no longer always implies __i386__; use __i386__ to replace
the kernel CONFIG_X86_32 flag.
asm/page.h: the upstream page.h isn't a uapi header and no longer includes
the stuff we were using it for. Let's just have our own static file, since
it's the same for all our architectures (both 32- and 64-bit).
sys/select.h: we used to use the various FD_SET-related macros from the
kernel header files, but they've gone. Adjust by adding trivial equivalent
definitions.
Automated changes:
libc/kernel/arch-x86, libc/kernel/common: regenerated from
external/kernel-headers.
Change-Id: I84fc0ed52dc742e043b4ae300fd3b58ee99b7fcd
2013-09-30 18:42:13 -07:00
Elliott Hughes
b277509095
am 34284954: am 76218efb: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
...
* commit '34284954b3b43010d87c6f99a50dc673a55fbb04':
Fix inttypes.h and stdint.h for 64-bit (and C++11).
2013-09-30 16:23:03 -07:00
Elliott Hughes
34284954b3
am 76218efb: Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
...
* commit '76218efbeb2e124656ce15d4eb5a7039da065123':
Fix inttypes.h and stdint.h for 64-bit (and C++11).
2013-09-30 16:19:18 -07:00
Elliott Hughes
76218efbeb
Merge "Fix inttypes.h and stdint.h for 64-bit (and C++11)."
2013-09-30 21:53:06 +00:00
Elliott Hughes
a9a02acc9f
Fix inttypes.h and stdint.h for 64-bit (and C++11).
...
Change-Id: I394630348413c9aafcac137ce1ca5f0a93d9ab6f
2013-09-30 14:46:47 -07:00
Christopher Ferris
a59e16bac9
am 34c2a9fc: Move stack unwinding test into library.
...
* commit '34c2a9fc37848d446bf91ce61783884232fffeb1':
Move stack unwinding test into library.
2013-09-30 14:46:05 -07:00
Christopher Ferris
427e8cf902
Fix line that got removed by merge.
...
(cherry picked from commit f14d71fcf7 )
Change-Id: Id3dd54d9efd87ef2bbb2c90adae2ce3911695027
2013-09-29 22:14:56 -07:00
The Android Automerger
33f6390064
merge in klp-release history after reset to klp-dev
2013-09-29 06:00:40 -07:00
Elliott Hughes
967a6d3768
am ef8eb557: am 4d016c6a: Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
...
* commit 'ef8eb55708f67fc2977a155dddb1b3f1f732b3fe':
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
2013-09-27 15:44:53 -07:00
Elliott Hughes
ef8eb55708
am 4d016c6a: Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
...
* commit '4d016c6a83bb8c8b8ec88400031b42c41f18edbb':
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
2013-09-27 15:41:25 -07:00
Elliott Hughes
4d016c6a83
Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."
2013-09-27 22:38:45 +00:00
Nick Kralevich
cadc6aaf41
am f56e0e4b: am 6aed6077: Merge "Fix unnecessary call to __strncpy_chk2"
...
* commit 'f56e0e4b5e97f4e7fed6e06dde30053ea687716e':
Fix unnecessary call to __strncpy_chk2
2013-09-27 15:18:21 -07:00
Nick Kralevich
f56e0e4b5e
am 6aed6077: Merge "Fix unnecessary call to __strncpy_chk2"
...
* commit '6aed6077fbe2b2039ab9160fb1e33ffe07907f32':
Fix unnecessary call to __strncpy_chk2
2013-09-27 15:15:31 -07:00
Nick Kralevich
6aed6077fb
Merge "Fix unnecessary call to __strncpy_chk2"
2013-09-27 22:13:19 +00:00
Nick Kralevich
d13c2b1ba6
Fix unnecessary call to __strncpy_chk2
...
If "n" is smaller than the size of "src", then we'll
never read off the end of src. It makes no sense to call
__strncpy_chk2 in those circumstances.
For example, consider the following code:
int main() {
char src[10];
char dst[5];
memcpy(src, "0123456789", sizeof(src));
strncpy(dst, src, sizeof(dst));
dst[4] = '\0';
printf("%s\n", dst);
return 0;
}
In this code, it's clear that the strncpy will never read off
the end of src.
Change-Id: I9cf58857a0c5216b4576d21d3c1625e2913ccc03
2013-09-27 13:21:24 -07:00
Conley Owens
e83a780600
resolved conflicts for merge of f4af9110 to klp-dev-plus-aosp
...
Change-Id: I9e499e552b758392dd0c7b8d888944c0150dd22a
2013-09-27 13:13:30 -07:00
Nick Kralevich
9a622f874c
am cc362291: am 8427b745: Merge "libc: fortify recvfrom()"
...
* commit 'cc362291362f8183431eccb19267c8a625f36006':
libc: fortify recvfrom()
2013-09-27 09:11:00 -07:00
Nick Kralevich
cc36229136
am 8427b745: Merge "libc: fortify recvfrom()"
...
* commit '8427b7450fe068db6484d161f7004661c4698858':
libc: fortify recvfrom()
2013-09-27 09:08:25 -07:00
Nick Kralevich
8427b7450f
Merge "libc: fortify recvfrom()"
2013-09-27 16:05:44 +00:00
Elliott Hughes
e0d0b15de6
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
...
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 00:04:30 -07:00
Elliott Hughes
b1542b09d9
am 174e98c9: am ad1244b2: Merge "Upgrade to tzdata2013f."
...
* commit '174e98c9a96879af82e8bbda2d6322544fb74d90':
Upgrade to tzdata2013f.
2013-09-26 23:34:10 -07:00
Elliott Hughes
174e98c9a9
am ad1244b2: Merge "Upgrade to tzdata2013f."
...
* commit 'ad1244b2e7588df2f4e66747e1355016d6d014bc':
Upgrade to tzdata2013f.
2013-09-26 23:31:50 -07:00
Elliott Hughes
ad1244b2e7
Merge "Upgrade to tzdata2013f."
2013-09-27 06:30:00 +00:00
Elliott Hughes
1b709a946f
am 3b7d4697: am abd4b254: Merge "Upgrade to tzdata2013e."
...
* commit '3b7d4697b765cb4cd65a1e306d27c607dc486d66':
Upgrade to tzdata2013e.
2013-09-26 23:25:40 -07:00
Elliott Hughes
3b7d4697b7
am abd4b254: Merge "Upgrade to tzdata2013e."
...
* commit 'abd4b2542b0e161f40a80c48970b77097af76dd9':
Upgrade to tzdata2013e.
2013-09-26 23:23:15 -07:00
Elliott Hughes
4ced7ef05a
Upgrade to tzdata2013f.
...
From the release notes:
Changes affecting near-future time stamps
Tocantins will very likely not observe DST starting this spring.
(Thanks to Steffen Thorsen.)
Jordan will likely stay at UTC+3 indefinitely, and will not fall
back this fall.
Palestine will fall back at 00:00, not 01:00. (Thanks to Steffen Thorsen.)
Change-Id: Iccee57578eef2ab51c519a23f151bc1963262ffe
2013-09-26 23:22:23 -07:00
Elliott Hughes
abd4b2542b
Merge "Upgrade to tzdata2013e."
2013-09-27 06:20:18 +00:00
Elliott Hughes
35b123ef1e
Upgrade to tzdata2013e.
...
From the release notes:
Changes affecting near-future time stamps
This year Fiji will start DST on October 27, not October 20.
(Thanks to David Wheeler for the heads-up.) For now, guess that
Fiji will continue to spring forward the Sunday before the fourth
Monday in October.
Changes affecting time stamps before 1970
Pacific/Johnston is now a link to Pacific/Honolulu. This corrects
some errors before 1947.
Some zones have been turned into links, when they differ from
existing zones only in older data that was likely invented or that
differs only in LMT or transition from LMT. These changes affect
only time stamps before 1943. The affected zones are:
Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
America/Grenada, America/Guadeloupe, America/Marigot,
America/Montserrat, America/St_Barthelemy, America/St_Kitts,
America/St_Lucia, America/St_Thomas, America/St_Vincent,
America/Tortola, and Europe/Vaduz. (Thanks to Alois Treindl for
confirming that the old Europe/Vaduz zone was wrong and the new
link is better for WWII-era times.)
Change Kingston Mean Time from -5:07:12 to -5:07:11. This affects
America/Cayman, America/Jamaica and America/Grand_Turk time stamps
from 1890 to 1912.
Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
This affects Europe/Zurich time stamps from 1853 to 1894. (Thanks
to Alois Treindl).
Change the date of the circa-1850 Zurich transition from 1849-09-12
to 1853-07-16, overriding Shanks with data from Messerli about
postal and telegraph time in Switzerland.
Data changes affecting behavior of tzselect and similar programs
Country code BQ is now called the more-common name "Caribbean Netherlands"
rather than the more-official "Bonaire, St Eustatius & Saba".
Remove from zone.tab the names America/Montreal, America/Shiprock,
and Antarctica/South_Pole, as they are equivalent to existing
same-country-code zones for post-1970 time stamps. The data for
these names are unchanged, so the names continue to work as before.
Change-Id: If78a517687532afcc0b22c7df664b5955f6e1564
2013-09-26 22:41:09 -07:00
Christopher Ferris
6c4ef74757
am 7bfef355: Change hard-coded directory.
...
* commit '7bfef355b1590cb8ac68d8caa97eaf0018191db8':
Change hard-coded directory.
2013-09-26 14:39:31 -07:00
Christopher Ferris
9018a0f462
am 6d1f85dc: Change hard-coded temporary directory.
...
* commit '6d1f85dcdcf32117332b48563357d311a2886c30':
Change hard-coded temporary directory.
2013-09-26 14:39:30 -07:00
Elliott Hughes
5825f979b7
am 88f29444: am 7b538021: Merge "Make it easier to add syscalls for another architecture."
...
* commit '88f2944421839b725e02e97c62d119c9e608ec58':
Make it easier to add syscalls for another architecture.
2013-09-26 09:02:46 -07:00
Elliott Hughes
88f2944421
am 7b538021: Merge "Make it easier to add syscalls for another architecture."
...
* commit '7b538021bdaa0a7c2d60e25d10e5908043680467':
Make it easier to add syscalls for another architecture.
2013-09-26 09:01:20 -07:00
Elliott Hughes
7b538021bd
Merge "Make it easier to add syscalls for another architecture."
2013-09-26 15:59:33 +00:00
Elliott Hughes
d612165c67
Make it easier to add syscalls for another architecture.
...
Much of the per-architecture duplication can be removed, so let's do so
before we add the 64-bit architectures.
Change-Id: Ieb796503c8e5353ea38c3bab768bb9a690c9a767
2013-09-26 08:57:17 -07:00
Elliott Hughes
fcdb47d7f5
am dbd4dbc0: am a1c1a334: Merge "Add a unit test for %n."
...
* commit 'dbd4dbc02c969531ff4891c06e66c63ec7a6d75d':
Add a unit test for %n.
2013-09-25 22:16:18 -07:00
Elliott Hughes
dbd4dbc02c
am a1c1a334: Merge "Add a unit test for %n."
...
* commit 'a1c1a3344de1c0a35126ea6f43e1d55184f078da':
Add a unit test for %n.
2013-09-25 22:13:52 -07:00
Elliott Hughes
a1c1a3344d
Merge "Add a unit test for %n."
2013-09-26 05:10:28 +00:00
Michael Wright
18c2cc68e8
am 92d512f6: am c612a133: Merge "Update capability.h"
...
* commit '92d512f6cf273d6d9e281dc362cc25cf8892b3f9':
Update capability.h
2013-09-25 16:35:33 -07:00
Michael Wright
92d512f6cf
am c612a133: Merge "Update capability.h"
...
* commit 'c612a133dcc3ffaa1a2172d2cac20bddbd5df284':
Update capability.h
2013-09-25 16:33:24 -07:00
Michael Wright
c612a133dc
Merge "Update capability.h"
2013-09-25 23:29:32 +00:00
Michael Wright
8bd5aa6a76
Update capability.h
...
To upstream SHA 6e4664525b1db28f8c4e1130957f70a94c19213e (v3.11)
Change-Id: Ic0d95464bc9001246df898489b2ea603a97ca231
2013-09-25 14:55:55 -07:00
Elliott Hughes
7248a2d4d0
Add a unit test for %n.
...
Change-Id: I9335e089d66c98d34577f5e1d1a54b8f507b94f6
2013-09-24 18:01:33 -07:00
Nick Kralevich
60f4f9a5b9
libc: fortify recvfrom()
...
Fortify calls to recv() and recvfrom().
We use __bos0 to match glibc's behavior, and because I haven't
tested using __bos.
Change-Id: Iad6ae96551a89af17a9c347b80cdefcf2020c505
2013-09-24 16:45:01 -07:00
Elliott Hughes
67e34826d8
am 3c49c6ec: am 759111ca: Merge "Simplify the SYSCALLS.TXT format."
...
* commit '3c49c6ec49e0a4170ff7c9c74ac2e76b9b846ced':
Simplify the SYSCALLS.TXT format.
2013-09-24 11:29:29 -07:00
Elliott Hughes
3c49c6ec49
am 759111ca: Merge "Simplify the SYSCALLS.TXT format."
...
* commit '759111cadf84f337f98177259d9e3f9d39c9eea9':
Simplify the SYSCALLS.TXT format.
2013-09-24 11:27:42 -07:00
Elliott Hughes
759111cadf
Merge "Simplify the SYSCALLS.TXT format."
2013-09-24 18:25:50 +00:00
Elliott Hughes
2f81ac8443
am 4808f052: am c8d98679: Merge "Update taskstats.h from Linux 3.11.1"
...
* commit '4808f05238d66ba474c6d33da066da799d4e6cf3':
Update taskstats.h from Linux 3.11.1
2013-09-24 07:37:48 -07:00
Elliott Hughes
4808f05238
am c8d98679: Merge "Update taskstats.h from Linux 3.11.1"
...
* commit 'c8d98679faa9b7f824e09d969cc1a469c721f4d8':
Update taskstats.h from Linux 3.11.1
2013-09-24 07:36:12 -07:00
Elliott Hughes
c8d98679fa
Merge "Update taskstats.h from Linux 3.11.1"
2013-09-24 14:29:29 +00:00
Elliott Hughes
5e52279256
Simplify the SYSCALLS.TXT format.
...
This will make addition of new architectures less unpleasant.
Change-Id: I77c866a63b686e8e70709d08fcf52e8a2d37310a
2013-09-24 00:35:31 -07:00
Elliott Hughes
a663ebd468
am f8222078: am 43e5badd: Merge "Fix %hhd formats in the printf family."
...
* commit 'f82220785d20385fa02aa78b02f3fdb98e5aa553':
Fix %hhd formats in the printf family.
2013-09-23 16:39:13 -07:00
Elliott Hughes
f82220785d
am 43e5badd: Merge "Fix %hhd formats in the printf family."
...
* commit '43e5baddbcaf571c1a74149c53d1e70a5a2c9de3':
Fix %hhd formats in the printf family.
2013-09-23 16:36:19 -07:00
Elliott Hughes
43e5baddbc
Merge "Fix %hhd formats in the printf family."
2013-09-23 23:34:00 +00:00
Elliott Hughes
1d13c64d78
Fix %hhd formats in the printf family.
...
Found by adapting the simple unit tests for libc logging to test
snprintf too. Fix taken from upstream OpenBSD without updating
the rest of stdio.
Change-Id: Ie339a8e9393a36080147aae4d6665118e5d93647
2013-09-23 16:02:39 -07:00
Christopher Ferris
34c2a9fc37
Move stack unwinding test into library.
...
Bug: 8291716
(cherry picked from commit 8240bed918 )
Change-Id: I1da2d0757ed304c352229f9818c052925d4e976a
2013-09-23 12:16:19 -07:00
Christopher Ferris
f4af911065
Create bionic unit test library for use with CTS.
...
Bug: 8291716
(cherry picked from commit 153d92765b )
Change-Id: Ia53b85b95621b7000034e4c6259d6586d0987dee
2013-09-23 12:16:01 -07:00
Christopher Ferris
7bfef355b1
Change hard-coded directory.
...
The tests are using /data/data which is not accessible to a non-root
user. Change this to /data/local/tmp which is accessible to all users.
Bug: 8291716
(cherry picked from commit 5227bb363d )
Change-Id: I83bf70aa8edd21b00321363d7ddcb65a5f048ba5
2013-09-23 12:12:58 -07:00
Christopher Ferris
6d1f85dcdc
Change hard-coded temporary directory.
...
The properties tests creates a temporary directory in /data/nativetest,
but this directory might not exist in all circumstances.
Change this to create the temporary directory in /data/local/tmp.
(cherry picked from commit bd6dc6a886 )
Change-Id: I15144ece7ffb5c29eded9a1ef399db630f6af5ab
2013-09-23 12:10:49 -07:00
Elliott Hughes
4988ec89db
am b9f3d31c: am fc2ceae7: Merge "Remove two -D flags for unused macros."
...
* commit 'b9f3d31ce40bceec4ecf86e2aaf83f1d8857f346':
Remove two -D flags for unused macros.
2013-09-23 11:22:05 -07:00
Elliott Hughes
b9f3d31ce4
am fc2ceae7: Merge "Remove two -D flags for unused macros."
...
* commit 'fc2ceae778afdcb2deee4abb5e2fc9b9904fa761':
Remove two -D flags for unused macros.
2013-09-23 11:19:22 -07:00
Elliott Hughes
fc2ceae778
Merge "Remove two -D flags for unused macros."
2013-09-23 18:14:57 +00:00
Elliott Hughes
3f33165acd
Remove two -D flags for unused macros.
...
Change-Id: Ia95b0f0e2003cadd875e84437afa1853c8fe2598
2013-09-23 11:12:09 -07:00
Sami Kyostila
50a1b776fd
Update taskstats.h from Linux 3.11.1
...
Change-Id: I50853efe20fa2524f6288f78505a774a72071367
2013-09-23 11:01:59 +01:00
Christopher Ferris
b835cec372
am 63e4644e: am c2de11d3: Merge "__memcpy_chk: Fix signed cmp of unsigned values."
...
* commit '63e4644ebd2da86e10aa41761d11b6beea20b439':
__memcpy_chk: Fix signed cmp of unsigned values.
2013-09-20 20:42:08 -07:00
Christopher Ferris
63e4644ebd
am c2de11d3: Merge "__memcpy_chk: Fix signed cmp of unsigned values."
...
* commit 'c2de11d3a4ff1e4937406596aeb289c5715c4466':
__memcpy_chk: Fix signed cmp of unsigned values.
2013-09-20 20:39:27 -07:00
Christopher Ferris
c2de11d3a4
Merge "__memcpy_chk: Fix signed cmp of unsigned values."
2013-09-21 03:36:31 +00:00
Christopher Ferris
16e185c908
__memcpy_chk: Fix signed cmp of unsigned values.
...
I accidentally did a signed comparison of the size_t values passed in
for three of the _chk functions. Changing them to unsigned compares.
Add three new tests to verify this failure is fixed.
Bug: 10691831
Merge from internal master.
(cherry-picked from 883ef2499c )
Change-Id: Id9a96b549435f5d9b61dc132cf1082e0e30889f5
2013-09-20 20:12:09 -07:00
Christopher Ferris
f67d11b2b4
am 8da175c8: (-s ours) am ad999b60: Merge "Fix all debug directives."
...
* commit '8da175c8c348522c869a0a6d6016b74165a22abd':
Fix all debug directives.
2013-09-20 20:05:53 -07:00
Christopher Ferris
8da175c8c3
am ad999b60: Merge "Fix all debug directives."
...
* commit 'ad999b6062909d4922fb360a6f3b7f412cc06111':
Fix all debug directives.
2013-09-20 19:44:36 -07:00
Christopher Ferris
ad999b6062
Merge "Fix all debug directives."
2013-09-21 02:41:54 +00:00
Christopher Ferris
74f7414d30
am 768c576d: (-s ours) am 7493568b: Merge "Update all debug directives."
...
* commit '768c576d478cef5cb7a7d01a5702e83cc6561f19':
Update all debug directives.
2013-09-20 19:39:42 -07:00
Christopher Ferris
768c576d47
am 7493568b: Merge "Update all debug directives."
...
* commit '7493568ba82752d405bbb16dd7c42b3b88c67f86':
Update all debug directives.
2013-09-20 19:01:32 -07:00
Christopher Ferris
a57c9c084b
Fix all debug directives.
...
The backtrace when a fortify check failed was not correct. This change
adds all of the necessary directives to get a correct backtrace.
Fix the strcmp directives and change all labels to local labels.
Testing:
- Verify that the runtime can decode the stack for __memcpy_chk, __memset_chk,
__strcpy_chk, __strcat_chk fortify failures.
- Verify that gdb can decode the stack properly when hitting a fortify check.
- Verify that the runtime can decode the stack for a seg fault for all of the
_chk functions and for memcpy/memset.
- Verify that gdb can decode the stack for a seg fault for all of the _chk
functions and for memcpy/memset.
- Verify that the runtime can decode the stack for a seg fault for strcmp.
- Verify that gdb can decode the stack for a seg fault in strcmp.
Bug: 10342460
Bug: 10345269
Merge from internal master.
(cherry-picked from 05332f2ce7 )
Change-Id: Ibc919b117cfe72b9ae97e35bd48185477177c5ca
2013-09-20 18:59:58 -07:00
Christopher Ferris
7493568ba8
Merge "Update all debug directives."
2013-09-21 01:58:56 +00:00
Christopher Ferris
bd7fe1d3c4
Update all debug directives.
...
The libcorkscrew stack unwinder does not understand cfi directives,
so add .save directives so that it can function properly.
Also add the directives in to strcmp.S and fix a missing set of
directives in cortex-a9/memcpy_base.S.
Bug: 10345269
Merge from internal master.
(cherry-picked from 5f7ccea3ff )
Change-Id: If48a216203216a643807f5d61906015984987189
2013-09-20 13:49:38 -07:00
Nick Kralevich
df3ff45216
am 5a58a1e0: am bef76b54: Merge "Add linux/sock_diag.h"
...
* commit '5a58a1e0abf51402170abeb6feaceb53915b8a6e':
Add linux/sock_diag.h
2013-09-20 08:24:59 -07:00
Nick Kralevich
5a58a1e0ab
am bef76b54: Merge "Add linux/sock_diag.h"
...
* commit 'bef76b54a6fe747617334e3aaea892a19370cd29':
Add linux/sock_diag.h
2013-09-20 08:22:28 -07:00
Nick Kralevich
bef76b54a6
Merge "Add linux/sock_diag.h"
2013-09-20 15:20:03 +00:00
Elliott Hughes
e74f77f92d
am 48a909c9: am aad3c52e: Merge "Ensure we have the off64_t variant of every function that takes an off_t."
...
* commit '48a909c9fd6dbe9be5655ad172d1083fa69c4107':
Ensure we have the off64_t variant of every function that takes an off_t.
2013-09-19 17:43:01 -07:00
Elliott Hughes
48a909c9fd
am aad3c52e: Merge "Ensure we have the off64_t variant of every function that takes an off_t."
...
* commit 'aad3c52e9d3e726eb59870b03c3fa89a3ba1a89a':
Ensure we have the off64_t variant of every function that takes an off_t.
2013-09-19 17:40:39 -07:00
Elliott Hughes
aad3c52e9d
Merge "Ensure we have the off64_t variant of every function that takes an off_t."
2013-09-20 00:37:28 +00:00
Nick Kralevich
8470f01cca
Add linux/sock_diag.h
...
This file was generated using bionic/libc/kernel/tools/update_all.py
Change-Id: Iad33e96253978ed9a76d429d66eed9f245685c10
2013-09-19 16:44:53 -07:00
Elliott Hughes
b4f7616fd6
Ensure we have the off64_t variant of every function that takes an off_t.
...
Change-Id: Ib2eee0cf13162be3b62559b84e90c6dcf5aab1c3
2013-09-19 16:27:24 -07:00
Elliott Hughes
a5a508a9b6
am 35cfcc11: am f8e71bac: Merge "Add mmap64()"
...
* commit '35cfcc11fa923c75ead9356c71466ecabfafcc42':
Add mmap64()
2013-09-19 14:27:34 -07:00
Elliott Hughes
35cfcc11fa
am f8e71bac: Merge "Add mmap64()"
...
* commit 'f8e71bac14a4bc52cc95c56adfe042c3938279b5':
Add mmap64()
2013-09-19 14:25:00 -07:00
Elliott Hughes
f8e71bac14
Merge "Add mmap64()"
2013-09-19 21:22:42 +00:00
Daniel Leung
afcc0cccda
Add mmap64()
...
This adds mmap64() to bionic so that it is possible to have
large offset passed to kernel. However, the syscall mechanism
only passes 32-bit number to kernel. So effectively, the
largest offset that can be passed is about 43 bits (since
offset is signed, and the number passed to kernel is number
of pages (page size == 4K => 12 bits)).
Change-Id: Ib54f4e9b54acb6ef8b0324f3b89c9bc810b07281
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com >
2013-09-19 14:11:26 -07:00
Elliott Hughes
1b75f3e07a
am fd5f6f19: am d5ddf40e: Merge "Fix host tests that need the shell."
...
* commit 'fd5f6f192ab6dcc01091b0e36af822dd3480f9b4':
Fix host tests that need the shell.
2013-09-19 12:06:44 -07:00
Elliott Hughes
44fd0d92d6
am 94c325fb: am 269851bf: Merge "Declare __page_shift and __page_size with C linkage."
...
* commit '94c325fb3bd8844dcc58640afb8f33668b684bc1':
Declare __page_shift and __page_size with C linkage.
2013-09-19 12:06:43 -07:00
Elliott Hughes
fd5f6f192a
am d5ddf40e: Merge "Fix host tests that need the shell."
...
* commit 'd5ddf40ecf72a03e38164389555ccdade779ab5a':
Fix host tests that need the shell.
2013-09-19 12:05:09 -07:00
Elliott Hughes
94c325fb3b
am 269851bf: Merge "Declare __page_shift and __page_size with C linkage."
...
* commit '269851bf950049f16eeb2a402f700952480bcecf':
Declare __page_shift and __page_size with C linkage.
2013-09-19 12:05:08 -07:00
Elliott Hughes
d5ddf40ecf
Merge "Fix host tests that need the shell."
2013-09-19 19:04:10 +00:00
Elliott Hughes
269851bf95
Merge "Declare __page_shift and __page_size with C linkage."
2013-09-19 19:03:19 +00:00
Bernhard Rosenkraenzer
9ae59c02ca
Declare __page_shift and __page_size with C linkage.
...
__page_shift and __page_size were accidentally declared in unistd.h with
C linkage - their implementation needs to use the same linkage.
Going forward, though, let's stop the inlining madness and let's kill
the non-standard __getpageshift(). This patch takes getpagesize(3) out
of line and removes __getpageshift but fixes __page_shift and __page_size
for backwards binary compatibility.
Change-Id: I35ed66a08989ced1db422eb03e4d154a5d6b5bda
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org >
2013-09-19 11:55:36 -07:00
Elliott Hughes
a3285dc914
am 8ff879a5: am a259472c: Merge "Fix mismatch between declaration and forward declaration"
...
* commit '8ff879a528b8876db811f5abd4dbf0640e3a0408':
Fix mismatch between declaration and forward declaration
2013-09-19 11:46:46 -07:00
Elliott Hughes
8ff879a528
am a259472c: Merge "Fix mismatch between declaration and forward declaration"
...
* commit 'a259472ca076ee230523e63502999be13a3f72d2':
Fix mismatch between declaration and forward declaration
2013-09-19 11:44:11 -07:00
Elliott Hughes
a259472ca0
Merge "Fix mismatch between declaration and forward declaration"
2013-09-19 18:41:06 +00:00
Elliott Hughes
e60c4f0a6c
Fix host tests that need the shell.
...
By making the /system/bin/sh available.
Change-Id: I99200c1ddc922a2f6b5cea8ff2da98aedbe70e7b
2013-09-19 11:28:20 -07:00
Elliott Hughes
823a4e0a7e
am 26e71c19: am 045f311b: Merge "Use and to find the tzdata."
...
* commit '26e71c19875e36ca4f37993bd0b40cdf2d9aee4e':
Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.
2013-09-19 11:23:55 -07:00
Elliott Hughes
26e71c1987
am 045f311b: Merge "Use and to find the tzdata."
...
* commit '045f311b0a5b3ceed09dfc4b4246c99183a2cef4':
Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.
2013-09-19 11:21:21 -07:00
Elliott Hughes
045f311b0a
Merge "Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata."
2013-09-19 18:19:00 +00:00
Elliott Hughes
cf178bf7d0
Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.
...
This lets us run binaries linked against bionic on an x86 host.
Change-Id: Icd60cf99a90d747c77304c05b4f764e4d26af985
2013-09-19 11:17:42 -07:00
Nick Kralevich
d85d0b4c23
am 0c12f125: am 814bbd52: Merge "Update netlink.h from tip-of-tree external/kernel-headers"
...
* commit '0c12f125cfc90f83475532e64aa7f533e02e3798':
Update netlink.h from tip-of-tree external/kernel-headers
2013-09-18 21:09:22 -07:00
Nick Kralevich
0c12f125cf
am 814bbd52: Merge "Update netlink.h from tip-of-tree external/kernel-headers"
...
* commit '814bbd521affba78db04135515bae1f5e099bbd9':
Update netlink.h from tip-of-tree external/kernel-headers
2013-09-18 21:06:43 -07:00
Nick Kralevich
814bbd521a
Merge "Update netlink.h from tip-of-tree external/kernel-headers"
2013-09-19 04:04:07 +00:00
Elliott Hughes
ca0f0662f4
am 2443358b: am 4a509d89: Merge "Add bionic-unit-tests-run-on-host special target"
...
* commit '2443358b3717bdce932303bbcbe625f59e1ae380':
Add bionic-unit-tests-run-on-host special target
2013-09-18 19:20:31 -07:00
Elliott Hughes
2443358b37
am 4a509d89: Merge "Add bionic-unit-tests-run-on-host special target"
...
* commit '4a509d898e24cefe0f7f0edf927b11ce7c304c81':
Add bionic-unit-tests-run-on-host special target
2013-09-18 19:17:55 -07:00
Elliott Hughes
4a509d898e
Merge "Add bionic-unit-tests-run-on-host special target"
2013-09-19 02:16:00 +00:00
Pavel Chupin
f22fb68751
Add bionic-unit-tests-run-on-host special target
...
Allows running the tests linked with bionic .so on the host if host and
target are compatible. See more comments and usage limitation inlined.
make bionic-unit-tests-run-on-host should do build and run.
Change-Id: I5946fa72e009d324baa9da18f460294b3c1a615e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-09-18 19:09:24 -07:00
Nick Kralevich
45e52faeb7
Update netlink.h from tip-of-tree external/kernel-headers
...
This file was generated using bionic/libc/kernel/tools/update_all.py
The only change is a new netlink.h file, from external/kernel-headers.
Please see the commit message there for details.
Change-Id: I83645b88f0baff838131197913ebd70be69abd3f
2013-09-18 17:14:02 -07:00
Bernhard Rosenkraenzer
edad1e1558
Fix mismatch between declaration and forward declaration
...
KernelArgumentBlock is defined as a class in KernelArgumentBlock.h, but
forward declarations refer to it as a struct.
While this is essentially the same, the mismatch causes a compiler
warning in clang (and may cause warnings in future versions of gcc) in
code that is supposed to be compiled with -Werror.
Change-Id: I4ba49d364c44d0a42c276aff3a8098300dbdcdf0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org >
2013-09-18 23:40:19 +02:00
Elliott Hughes
56326d14b5
am e0d1d4cf: am 6ebc24fc: am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev
...
* commit 'e0d1d4cf497bddd8f24b6d22feec33d655cae0dd':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 17:13:46 -07:00
Brian Carlstrom
4105fcdb3c
am 059f5c3f: am 8512992f: Merge "Simplify main thread stack size initialization"
...
* commit '059f5c3f6ce2a1783b5d96b4059df1b9104101d5':
Simplify main thread stack size initialization
2013-09-13 17:05:20 -07:00
Brian Carlstrom
d062806699
am 5f0b5108: am 850f59d8: Merge "Use kernel default for initial thread size"
...
* commit '5f0b5108e340bddca796b7b8d2b072e30ccea112':
Use kernel default for initial thread size
2013-09-13 17:05:20 -07:00
Brian Carlstrom
059f5c3f6c
am 8512992f: Merge "Simplify main thread stack size initialization"
...
* commit '8512992f50e8444c1985bbeb17c3385a58fc0fed':
Simplify main thread stack size initialization
2013-09-13 17:02:51 -07:00
Brian Carlstrom
5f0b5108e3
am 850f59d8: Merge "Use kernel default for initial thread size"
...
* commit '850f59d8516c7060be9484e9771aa54231e8ff48':
Use kernel default for initial thread size
2013-09-13 17:02:50 -07:00
Brian Carlstrom
8512992f50
Merge "Simplify main thread stack size initialization"
2013-09-14 00:00:41 +00:00
Brian Carlstrom
850f59d851
Merge "Use kernel default for initial thread size"
2013-09-14 00:00:33 +00:00
Brian Carlstrom
50af69e8f3
Simplify main thread stack size initialization
...
Change-Id: Iec09433d9de501031cce09dc75848a5e8f3d96bf
2013-09-13 16:44:47 -07:00
Brian Carlstrom
322e7bce23
Use kernel default for initial thread size
...
Bug: 10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
2013-09-13 16:25:25 -07:00
Brian Carlstrom
0890436da9
am 9a74e36f: Use kernel default for initial thread size
...
* commit '9a74e36f4810ca22cb12f8eafe4f929edfa57e58':
Use kernel default for initial thread size
2013-09-13 13:20:19 -07:00
Elliott Hughes
e0d1d4cf49
am 6ebc24fc: am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev
...
* commit '6ebc24fcc3cf07f1be936ef9d7a8c3afff1861c7':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 11:50:20 -07:00
Elliott Hughes
6ebc24fcc3
am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev
...
* commit 'd3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 11:46:09 -07:00
Brian Carlstrom
7751d9158f
Use kernel default for initial thread size
...
Bug: 10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
2013-09-13 11:16:50 -07:00
Elliott Hughes
d3f9e8155b
resolved conflicts for merge of 5d0ad38c to jb-mr2-dev
...
Change-Id: I606f6d86aad46c5eda0dc0d907fe691ca0eea826
2013-09-13 11:16:11 -07:00
Elliott Hughes
5d0ad38c72
resolved conflicts for merge of ca2c6f75 to jb-mr1-dev-plus-aosp
...
Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e
2013-09-13 11:09:46 -07:00
Elliott Hughes
ca2c6f75a8
am 592c0708: am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
...
* commit '592c07084bf0d86b42e216002e5aaabf40023ea8':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:56:39 -07:00
Elliott Hughes
592c07084b
am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
...
* commit 'b30f6eb026db05c969afacc758e529e73f0e314d':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:53:43 -07:00
Elliott Hughes
b30f6eb026
am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
...
* commit '9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:51:31 -07:00
Elliott Hughes
9e6104d54f
resolved conflicts for merge of 05292dd6 to jb-mr1-dev
...
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-13 10:17:10 -07:00
Elliott Hughes
05292dd65b
resolved conflicts for merge of cc7f0dc5 to jb-dev-plus-aosp
...
Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15
2013-09-13 10:09:56 -07:00
Elliott Hughes
cc7f0dc5a1
Upgrade pre-jb-mr2 releases to tzdata2013d.
...
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I8caa139f0eecbe038643df43a27088278c6185cd
2013-09-13 09:43:15 -07:00
Brian Carlstrom
9a74e36f48
Use kernel default for initial thread size
...
Bug: 10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
2013-09-12 22:19:44 -07:00
The Android Automerger
25519f0fb0
merge in klp-release history after reset to klp-dev
2013-09-11 06:00:09 -07:00
Christopher Ferris
2e7a8b44c2
resolved conflicts for merge of 883ef249 to klp-dev-plus-aosp
...
Change-Id: I1e2bd03a0cb5a0ab191c525d1574377bc7fd90ab
2013-09-10 19:49:04 -07:00
Christopher Ferris
883ef2499c
__memcpy_chk: Fix signed cmp of unsigned values.
...
I accidentally did a signed comparison of the size_t values passed in
for three of the _chk functions. Changing them to unsigned compares.
Add three new tests to verify this failure is fixed.
Bug: 10691831
Change-Id: Ia831071f7dffd5972a748d888dd506c7cc7ddba3
2013-09-10 17:34:03 -07:00
Christopher Ferris
5cb0436930
am 1a88ca08: am 98c726ec: Merge "Add the dl_iterate_phdr function to libdl for arm."
...
* commit '1a88ca08046ea510bfc8d3de6875537f124b3ce3':
Add the dl_iterate_phdr function to libdl for arm.
2013-09-06 10:57:40 -07:00
Christopher Ferris
1a88ca0804
am 98c726ec: Merge "Add the dl_iterate_phdr function to libdl for arm."
...
* commit '98c726ec9b40e75efdd3ea027cd9cc627329f85e':
Add the dl_iterate_phdr function to libdl for arm.
2013-09-06 10:54:56 -07:00
Christopher Ferris
98c726ec9b
Merge "Add the dl_iterate_phdr function to libdl for arm."
2013-09-06 17:52:35 +00:00
Christopher Ferris
24053a461e
Add the dl_iterate_phdr function to libdl for arm.
...
Bug: 8410085
Merge from internal master.
(cherry-picked from cb491bc66d )
Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f
2013-09-06 09:53:54 -07:00
Elliott Hughes
a015800e73
am 5d094c40: am df7436e7: Merge "Avoid segfaults if properties are not initialized"
...
* commit '5d094c408841370e4a6f2846ae3408d2e6d12f94':
Avoid segfaults if properties are not initialized
2013-09-03 14:12:31 -07:00
Elliott Hughes
5d094c4088
am df7436e7: Merge "Avoid segfaults if properties are not initialized"
...
* commit 'df7436e709035fb6f5667980042848c8b4ca3e79':
Avoid segfaults if properties are not initialized
2013-09-03 14:09:08 -07:00
Elliott Hughes
df7436e709
Merge "Avoid segfaults if properties are not initialized"
2013-09-03 21:07:16 +00:00
Elliott Hughes
eb31e1c558
am 1e96d49a: am afa31042: Merge "Fix strchr for basic non-sse case on x86"
...
* commit '1e96d49a7d4d1af8f3bd6630e4ec9369813f18e7':
Fix strchr for basic non-sse case on x86
2013-09-03 14:07:11 -07:00
Elliott Hughes
1e96d49a7d
am afa31042: Merge "Fix strchr for basic non-sse case on x86"
...
* commit 'afa310427e04f067976e5b979e2cceb3d759bf3f':
Fix strchr for basic non-sse case on x86
2013-09-03 14:05:51 -07:00
Elliott Hughes
afa310427e
Merge "Fix strchr for basic non-sse case on x86"
2013-09-03 21:03:39 +00:00
Pavel Chupin
3c4b50fd8c
Fix strchr for basic non-sse case on x86
...
Fix source location. Move declaration of __strchr_chk out of
ifdef __BIONIC_FORTIFY which should be available for strchr.cpp
compilation when __BIONIC_FORTIFY is not defined.
Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-09-03 16:20:52 +04:00
Pavel Chupin
a21e696d90
Avoid segfaults if properties are not initialized
...
Null or constant dereferencing occurs if properties are not initialized.
On Android devices it shouldn't happen but can be faced if testing bionic
libc.so on Linux host.
Change-Id: I8f047cbe17d0e7bcde40ace000a8aa53789c16cb
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-09-03 13:27:09 +04:00
The Android Automerger
82a8fe37d7
merge in klp-release history after reset to klp-dev
2013-09-02 06:00:18 -07:00
Christopher Ferris
153ec2a76f
am 49c0d471: Merge "Fix all debug directives." into klp-dev
...
* commit '49c0d471a8ba9ed32e7fdadb7e4ea6118b4b4af4':
Fix all debug directives.
2013-08-29 14:23:06 -07:00
Christopher Ferris
49c0d471a8
Merge "Fix all debug directives." into klp-dev
2013-08-29 21:21:20 +00:00
Christopher Ferris
7a80982913
am fc24bc25: am 99b859cf: Merge "Move stack unwinding test into library."
...
* commit 'fc24bc2544edad03798a1c69d6a76259e6f1e7dd':
Move stack unwinding test into library.
2013-08-29 14:18:41 -07:00
Christopher Ferris
fc24bc2544
am 99b859cf: Merge "Move stack unwinding test into library."
...
* commit '99b859cf786f208300f7fc3a6fa5b570c3333433':
Move stack unwinding test into library.
2013-08-29 14:16:18 -07:00
Christopher Ferris
99b859cf78
Merge "Move stack unwinding test into library."
2013-08-29 21:13:22 +00:00
Christopher Ferris
8240bed918
Move stack unwinding test into library.
...
Bug: 8291716
Change-Id: Ia270f074b574a8fe86b5ad435bdef80999c64295
2013-08-29 14:00:25 -07:00
Christopher Ferris
05332f2ce7
Fix all debug directives.
...
The backtrace when a fortify check failed was not correct. This change
adds all of the necessary directives to get a correct backtrace.
Fix the strcmp directives and change all labels to local labels.
Testing:
- Verify that the runtime can decode the stack for __memcpy_chk, __memset_chk,
__strcpy_chk, __strcat_chk fortify failures.
- Verify that gdb can decode the stack properly when hitting a fortify check.
- Verify that the runtime can decode the stack for a seg fault for all of the
_chk functions and for memcpy/memset.
- Verify that gdb can decode the stack for a seg fault for all of the _chk
functions and for memcpy/memset.
- Verify that the runtime can decode the stack for a seg fault for strcmp.
- Verify that gdb can decode the stack for a seg fault in strcmp.
Bug: 10342460
Bug: 10345269
Change-Id: I1dedadfee207dce4a285e17a21e8952bbc63786a
2013-08-28 15:42:05 -07:00
Nick Kralevich
4d0fbf9b07
am 89dcc10c: am 4e3ed44d: Merge "cdefs.h: introduce __bos0"
...
* commit '89dcc10c320c032faef83c4940a57949ade01dba':
cdefs.h: introduce __bos0
2013-08-28 14:36:50 -07:00
Nick Kralevich
89dcc10c32
am 4e3ed44d: Merge "cdefs.h: introduce __bos0"
...
* commit '4e3ed44db1200ca810842b0667e7fc80125de28d':
cdefs.h: introduce __bos0
2013-08-28 14:33:59 -07:00
Nick Kralevich
4e3ed44db1
Merge "cdefs.h: introduce __bos0"
2013-08-28 21:31:55 +00:00
Nick Kralevich
bd8e6749b7
cdefs.h: introduce __bos0
...
Introduce __bos0 as a #define for __builtin_object_size((s), 0).
This macro is intended to be used for places where the standard
__bos macro isn't appropriate.
memcpy, memmove, and memset deliberately use __bos0. This is done
for two reasons:
1) I haven't yet tested to see if __bos is safe to use.
2) glibc uses __bos0 for these methods.
Change-Id: Ifbe02efdb10a72fe3529dbcc47ff647bde6feeca
2013-08-28 14:27:14 -07:00
Nick Kralevich
2c87c3ff02
am cfd0d72d: am eb8f3622: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit 'cfd0d72da8641087f9c4015ee586614da9f7320a':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 13:07:57 -07:00
Nick Kralevich
cfd0d72da8
am eb8f3622: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit 'eb8f36223e51db626a23b8032f03c095be80998b':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 13:05:38 -07:00
Nick Kralevich
eb8f36223e
Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
2013-08-28 20:04:06 +00:00
Nick Kralevich
93501d3ab8
FORTIFY_SOURCE: introduce __strncpy_chk2
...
This change detects programs reading beyond the end of "src" when
calling strncpy.
Change-Id: Ie1b42de923385d62552b22c27b2d4713ab77ee03
2013-08-28 12:39:06 -07:00
Christopher Ferris
7c8ebaf6c1
am d923b307: am 2557433d: Merge "Change hard-coded directory."
...
* commit 'd923b3075c9cf9e0749cee7373cabb9afba9420c':
Change hard-coded directory.
2013-08-27 17:41:17 -07:00
Christopher Ferris
d923b3075c
am 2557433d: Merge "Change hard-coded directory."
...
* commit '2557433d8ea4c489f061170822f34f038b930b96':
Change hard-coded directory.
2013-08-27 17:38:07 -07:00
Christopher Ferris
2557433d8e
Merge "Change hard-coded directory."
2013-08-28 00:35:12 +00:00
Christopher Ferris
3825da5c07
am 7a2c2784: am 1f216e30: Merge "Create bionic unit test library for use with CTS."
...
* commit '7a2c2784a656adfae613b6b53d388988d6f2efa6':
Create bionic unit test library for use with CTS.
2013-08-27 17:22:37 -07:00
Christopher Ferris
5227bb363d
Change hard-coded directory.
...
The tests are using /data/data which is not accessible to a non-root
user. Change this to /data/local/tmp which is accessible to all users.
Bug: 8291716
Change-Id: I66476bbbaf5d1dc0c103863abf9219405f06a85b
2013-08-27 17:22:34 -07:00
Christopher Ferris
7a2c2784a6
am 1f216e30: Merge "Create bionic unit test library for use with CTS."
...
* commit '1f216e30b6a9301211193d05f995cdefbdc9619f':
Create bionic unit test library for use with CTS.
2013-08-27 17:20:39 -07:00
Christopher Ferris
1f216e30b6
Merge "Create bionic unit test library for use with CTS."
2013-08-28 00:19:06 +00:00
Nick Kralevich
f6186e9592
am 1278ae38: am 22f5ef6b: Merge "Delete CAVEATS / fix spelling."
...
* commit '1278ae38366102369b5a35152f2213426a148512':
Delete CAVEATS / fix spelling.
2013-08-27 17:11:06 -07:00
Nick Kralevich
1278ae3836
am 22f5ef6b: Merge "Delete CAVEATS / fix spelling."
...
* commit '22f5ef6b84057bf56f023263859a9b45eccd620b':
Delete CAVEATS / fix spelling.
2013-08-27 17:08:11 -07:00
Nick Kralevich
22f5ef6b84
Merge "Delete CAVEATS / fix spelling."
2013-08-28 00:06:19 +00:00
Nick Kralevich
bdbdbb8319
Delete CAVEATS / fix spelling.
...
Change-Id: I0ed504271b7c2e4434d0d5f53bc10335c8cf7b5b
2013-08-27 17:05:19 -07:00
Christopher Ferris
153d92765b
Create bionic unit test library for use with CTS.
...
Bug: 8291716
Change-Id: I46b749348456fae7892eecca6b44aef51a0e4747
2013-08-27 14:35:56 -07:00
The Android Automerger
da4bedf52f
merge in klp-release history after reset to klp-dev
2013-08-27 06:00:58 -07:00
Brian Carlstrom
112ad6bf21
am 6ab75bf4: Merge "Fix pthread_getcpuclockid." into klp-dev
...
* commit '6ab75bf41e5ca24f5d313673b8a05e2dbb803106':
Fix pthread_getcpuclockid.
2013-08-26 15:05:30 -07:00
Robert Greenwalt
cd1480a662
am 26ac8032: Merge "Change how DNS resolver handle no default iface" into klp-dev
...
* commit '26ac803232540fc074709c75d17bc3ec0c03f2c4':
Change how DNS resolver handle no default iface
2013-08-26 15:03:44 -07:00
Brian Carlstrom
6ab75bf41e
Merge "Fix pthread_getcpuclockid." into klp-dev
2013-08-26 21:21:17 +00:00
Jeff Hao
e9e10c13ff
Fix pthread_getcpuclockid.
...
clock_gettime was returning EINVAL for the values
produced by pthread_getcpuclockid.
Bug: 10346183
(cherry picked from commit 9b06cc3c1b )
Change-Id: Ib81a7024c218a4502f256c3002b9030e2aaa278d
2013-08-26 14:04:16 -07:00
Elliott Hughes
bda15698bc
am d23ef69a: am 33dd7c11: Merge "Add explicit -m32/-melf_i386 for x86 target"
...
* commit 'd23ef69ad1d089c10547ac3d42ba199b66260ae3':
Add explicit -m32/-melf_i386 for x86 target
2013-08-26 10:11:55 -07:00
Elliott Hughes
d23ef69ad1
am 33dd7c11: Merge "Add explicit -m32/-melf_i386 for x86 target"
...
* commit '33dd7c116d652223b5bf3dabe49641c310d1216b':
Add explicit -m32/-melf_i386 for x86 target
2013-08-26 10:09:36 -07:00
Elliott Hughes
33dd7c116d
Merge "Add explicit -m32/-melf_i386 for x86 target"
2013-08-26 17:05:31 +00:00
The Android Automerger
8eca269b4b
merge in klp-release history after reset to klp-dev
2013-08-26 06:00:41 -07:00
Robert Greenwalt
e5911f3128
resolved conflicts for merge of 937c3742 to klp-dev-plus-aosp
...
Change-Id: I4c0ad42ea3802cd232c80e5589af8a8e25f88a60
2013-08-24 08:21:41 -07:00
Robert Greenwalt
937c374225
am c6135ba7: Merge "Change how DNS resolver handle no default iface"
...
* commit 'c6135ba76db027d85751f84bf648a865609c0e1b':
Change how DNS resolver handle no default iface
2013-08-24 05:40:18 -07:00
Robert Greenwalt
c6135ba76d
Merge "Change how DNS resolver handle no default iface"
2013-08-24 12:35:08 +00:00
Robert Greenwalt
26ac803232
Merge "Change how DNS resolver handle no default iface" into klp-dev
2013-08-24 12:20:01 +00:00
Robert Greenwalt
d67662b9d6
Change how DNS resolver handle no default iface
...
We used to just try any iface we'd been told about as a
fallback, but that will end up mistakenly using a secondary
network's dns when we really don't have a default connection.
It also messed up our detection of whether we were doing the
lookup on the default or not (we'd get back our secondary net
iface as the default, do the compare and think we were on default).
Remove the lies and let dns fail if we don't have an iface for it.
bug:10132565
Conflicts:
libc/netbsd/resolv/res_cache.c
Change-Id: I357a9c34dad83215f44c5e0dd41ce2a7d6fe8f3f
2013-08-23 11:48:26 -07:00
Pavel Chupin
e85c183424
Add explicit -m32/-melf_i386 for x86 target
...
Required for x86 build with multilib compiler.
Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-08-23 16:46:42 +04:00
Robert Greenwalt
a31ddef36d
Change how DNS resolver handle no default iface
...
We used to just try any iface we'd been told about as a
fallback, but that will end up mistakenly using a secondary
network's dns when we really don't have a default connection.
It also messed up our detection of whether we were doing the
lookup on the default or not (we'd get back our secondary net
iface as the default, do the compare and think we were on default).
Remove the lies and let dns fail if we don't have an iface for it.
bug:10132565
Change-Id: I5f0f2abacaaaaf23c5292b20fba9d8dcb6fb10c5
2013-08-22 21:05:49 -07:00
Elliott Hughes
9fd0cf8170
am 345eb225: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
* commit '345eb225ae2e87e36354be5f1e62301179482804':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:34:14 -07:00
Elliott Hughes
2d38fced00
am 7003a14b: am 41f08abf: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
...
* commit '7003a14b536bad08476d2f2005ebcc0490b77b24':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:32:44 -07:00
Elliott Hughes
7003a14b53
am 41f08abf: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
...
* commit '41f08abf3d020ad8b48ff4151f8c623a119790e0':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:30:42 -07:00
Elliott Hughes
345eb225ae
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
Author: Paul Eggert <eggert@cs.ucla.edu >
Date: Thu Aug 22 12:47:51 2013 -0700
* localtime.c: Fix another integer overflow bug in mktime.
(time2sub): Avoid undefined behavior on time_t overflow.
Reported by Elliott Hughes in
<http://mm.icann.org/pipermail/tz/2013-August/019580.html >.
Bug: 10310929
(cherry picked from commit 713fe6463e )
Change-Id: I9ec79fd8d825e6b9e8bb5af549dbfc2182346c05
2013-08-22 14:29:07 -07:00
Elliott Hughes
41f08abf3d
Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
2013-08-22 21:27:55 +00:00
Elliott Hughes
713fe6463e
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
Author: Paul Eggert <eggert@cs.ucla.edu >
Date: Thu Aug 22 12:47:51 2013 -0700
* localtime.c: Fix another integer overflow bug in mktime.
(time2sub): Avoid undefined behavior on time_t overflow.
Reported by Elliott Hughes in
<http://mm.icann.org/pipermail/tz/2013-August/019580.html >.
Bug: 10310929
Change-Id: I3bf26f1f91371552e0a3828457d27e22af55acb2
2013-08-22 14:18:04 -07:00
Elliott Hughes
5cf93f8d91
am f0c10a4a: Work around tzcode\'s reliance on signed overflow.
...
* commit 'f0c10a4a16c74f5099cf6b272c0a2f11f454e63c':
Work around tzcode's reliance on signed overflow.
2013-08-22 12:36:34 -07:00
Elliott Hughes
6b5eb3134a
am e5ac43e1: am c44205cf: Merge "Work around tzcode\'s reliance on signed overflow."
...
* commit 'e5ac43e19afe270c2a70e4fb5d02b4cf056d50d7':
Work around tzcode's reliance on signed overflow.
2013-08-22 12:27:52 -07:00
Elliott Hughes
e5ac43e19a
am c44205cf: Merge "Work around tzcode\'s reliance on signed overflow."
...
* commit 'c44205cf717fc8ab8ccaf3631032fa236ba61a86':
Work around tzcode's reliance on signed overflow.
2013-08-22 12:25:10 -07:00
Elliott Hughes
f0c10a4a16
Work around tzcode's reliance on signed overflow.
...
I've mailed the tz list about this, and will switch to whatever upstream
fix comes along as soon as it's available.
Bug: 10310929
(cherry picked from commit 7843d44a59 )
Change-Id: I205e2440703444c50cecd91d3458d33613ddbc59
2013-08-22 12:23:47 -07:00
Elliott Hughes
c44205cf71
Merge "Work around tzcode's reliance on signed overflow."
2013-08-22 19:22:16 +00:00
Elliott Hughes
7843d44a59
Work around tzcode's reliance on signed overflow.
...
I've mailed the tz list about this, and will switch to whatever upstream
fix comes along as soon as it's available.
Bug: 10310929
Change-Id: I36bf3fcf11f5ac9b88137597bac3487a7bb81b0f
2013-08-22 12:21:18 -07:00
The Android Automerger
13ea69528e
merge in klp-release history after reset to klp-dev
2013-08-22 06:00:33 -07:00
Brian Carlstrom
91df2dd346
am b6cd9cec: am bb34907f: Merge "Make mips_relocate_got tolerate a missing got"
...
* commit 'b6cd9cecc818fd5303e8c664fcbc5b408883c185':
Make mips_relocate_got tolerate a missing got
2013-08-21 10:30:24 -07:00
Brian Carlstrom
b6cd9cecc8
am bb34907f: Merge "Make mips_relocate_got tolerate a missing got"
...
* commit 'bb34907ff5f60cf1600e83ea1bb4a6c26da6854e':
Make mips_relocate_got tolerate a missing got
2013-08-21 10:28:51 -07:00
Brian Carlstrom
baebc6489a
am 9ef1fbb6: Make mips_relocate_got tolerate a missing got
...
* commit '9ef1fbb644bf85fa211588853316efa4848547c6':
Make mips_relocate_got tolerate a missing got
2013-08-21 10:27:06 -07:00
Brian Carlstrom
bb34907ff5
Merge "Make mips_relocate_got tolerate a missing got"
2013-08-21 17:25:48 +00:00
Brian Carlstrom
9ef1fbb644
Make mips_relocate_got tolerate a missing got
...
Bug: 10094803
(cherry picked from commit 7ee26878065abb494600595349ce58b2b2db3709)
Change-Id: I9fbb65d20011f2f625fde3b15ac8c6887dd03ae4
2013-08-21 10:20:53 -07:00
Brian Carlstrom
87c358524e
Make mips_relocate_got tolerate a missing got
...
Bug: 10094803
(cherry picked from commit 7ee26878065abb494600595349ce58b2b2db3709)
Change-Id: Ib15bccecaee421dc463d46a3956b054051708759
2013-08-21 10:20:13 -07:00
The Android Automerger
948fbefa2a
merge in klp-release history after reset to klp-dev
2013-08-21 06:01:31 -07:00
Christopher Ferris
1ebb44013c
am 5f7ccea3: Update all debug directives.
...
* commit '5f7ccea3ffab05aeceecb85c821003cf580630d3':
Update all debug directives.
2013-08-20 13:23:32 -07:00
Christopher Ferris
5f7ccea3ff
Update all debug directives.
...
The libcorkscrew stack unwinder does not understand cfi directives,
so add .save directives so that it can function properly.
Also add the directives in to strcmp.S and fix a missing set of
directives in cortex-a9/memcpy_base.S.
Bug: 10345269
Change-Id: I043f493e0bb6c45bd3f4906fbe1d9f628815b015
2013-08-20 11:22:34 -07:00
Christopher Ferris
2389a26705
am c058154b: am c8039337: Merge "Change hard-coded temporary directory."
...
* commit 'c058154b747f295c98ad771d3dec4065749ee1a9':
Change hard-coded temporary directory.
2013-08-16 12:25:58 -07:00
Elliott Hughes
e714eb157e
am 6b6aaec8: am 4eacb341: Merge "Fix pthread_getcpuclockid."
...
* commit '6b6aaec892b1f256787fbbf106449f7d7e5888a2':
Fix pthread_getcpuclockid.
2013-08-16 12:25:58 -07:00
Christopher Ferris
c058154b74
am c8039337: Merge "Change hard-coded temporary directory."
...
* commit 'c8039337e3ee608e23f8ca6e5ea123d938b08029':
Change hard-coded temporary directory.
2013-08-16 12:21:55 -07:00
Elliott Hughes
6b6aaec892
am 4eacb341: Merge "Fix pthread_getcpuclockid."
...
* commit '4eacb34132b3162cc3716edfee8bad528d84c16f':
Fix pthread_getcpuclockid.
2013-08-16 12:21:46 -07:00
Christopher Ferris
4ff3ec05df
am 2e544837: Merge commit \'cf052994\' into manualmerge
...
* commit '2e544837e7acb479c3e4e22f53835e9740800af7':
Create optimized __strcpy_chk/__strcat_chk.
2013-08-16 12:21:27 -07:00
Christopher Ferris
c8039337e3
Merge "Change hard-coded temporary directory."
2013-08-16 03:13:42 +00:00
Christopher Ferris
2e544837e7
Merge commit 'cf052994' into manualmerge
...
Fixing merge conflict and pulling in all of the changes that I stupidly
marked as not requiring a merge.
Conflicts:
libc/arch-arm/arm.mk
libc/arch-arm/cortex-a15/bionic/memcpy.S
libc/arch-arm/cortex-a15/bionic/memset.S
libc/arch-arm/cortex-a9/bionic/memcpy.S
libc/arch-arm/cortex-a9/bionic/memset.S
libc/arch-arm/cortex-a9/cortex-a9.mk
libc/arch-arm/krait/bionic/memcpy.S
libc/arch-arm/krait/bionic/memset.S
libc/arch-arm/krait/krait.mk
Change-Id: I5da280dd8700681f118719c964a4d13446db51db
2013-08-15 19:27:08 -07:00
Elliott Hughes
4eacb34132
Merge "Fix pthread_getcpuclockid."
2013-08-15 22:34:58 +00:00
Jeff Hao
9b06cc3c1b
Fix pthread_getcpuclockid.
...
clock_gettime was returning EINVAL for the values
produced by pthread_getcpuclockid.
Bug: 10346183
Change-Id: Iabe643d7d46110bb311a0367aa0fc737f653208e
2013-08-15 15:34:22 -07:00
Christopher Ferris
cf0529946a
Merge "Create optimized __strcpy_chk/__strcat_chk."
2013-08-15 20:02:59 +00:00
Christopher Ferris
bd6dc6a886
Change hard-coded temporary directory.
...
The properties tests creates a temporary directory in /data/nativetest,
but this directory might not exist in all circumstances.
Change this to create the temporary directory in /data/local/tmp.
Change-Id: I812d3e24fcd084c5d74055c9faa95b1656f255bc
2013-08-15 12:54:40 -07:00
Christopher Ferris
b25b276031
am 11855d47: (-s ours) am c5cf5370: (-s ours) Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."
...
* commit '11855d4789501956c546604a35d5e56da280040c':
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
2013-08-15 11:16:11 -07:00
Christopher Ferris
11855d4789
am c5cf5370: (-s ours) Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."
...
* commit 'c5cf53701a5e04aeead70b1298bb38c51633e96d':
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
2013-08-15 11:14:56 -07:00
Christopher Ferris
5f45d583b0
Create optimized __strcpy_chk/__strcat_chk.
...
This change pulls the memcpy code out into a new file so that the
__strcpy_chk and __strcat_chk can use it with an include.
The new versions of the two chk functions uses assembly versions
of strlen and memcpy to implement this check. This allows near
parity with the assembly versions of strcpy/strcat. It also means that
as memcpy implementations get faster, so do the chk functions.
Other included changes:
- Change all of the assembly labels to local labels. The other labels
confuse gdb and mess up backtracing.
- Add .cfi_startproc and .cfi_endproc directives so that gdb is not
confused when falling through from one function to another.
- Change all functions to use cfi directives since they are more powerful.
- Move the memcpy_chk fail code outside of the memcpy function definition
so that backtraces work properly.
- Preserve lr before the calls to __fortify_chk_fail so that the backtrace
actually works.
Testing:
- Ran the bionic unit tests. Verified all error messages in logs are set
correctly.
- Ran libc_test, replacing strcpy with __strcpy_chk and replacing
strcat with __strcat_chk.
- Ran the debugger on nexus10, nexus4, and old nexus7. Verified that the
backtrace is correct for all fortify check failures. Also verify that
when falling through from __memcpy_chk to memcpy that the backtrace is
still correct. Also verified the same for __memset_chk and bzero.
Verified the two different paths in the cortex-a9 memset routine that
save variables to the stack still show the backtrace properly.
Bug: 9293744
(cherry-picked from 2be91915dc )
Change-Id: Ia407b74d3287d0b6af0139a90b6eb3bfaebf2155
2013-08-15 11:13:39 -07:00
Christopher Ferris
c5cf53701a
Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."
2013-08-15 18:11:02 +00:00
Christopher Ferris
59a13c122e
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.
...
This change creates assembler versions of __memcpy_chk/__memset_chk
that is implemented in the memcpy/memset assembler code. This change
avoids an extra call to memcpy/memset, instead allowing a simple fall
through to occur from the chk code into the body of the real
implementation.
Testing:
- Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices.
- Wrote a small test executable that has three calls to __memcpy_chk and
three calls to __memset_chk. First call dest_len is length + 1. Second
call dest_len is length. Third call dest_len is length - 1.
Verified that the first two calls pass, and the third fails. Examined
the logcat output on all nexus devices to verify that the fortify
error message was sent properly.
- I benchmarked the new __memcpy_chk and __memset_chk on all systems. For
__memcpy_chk and large copies, the savings is relatively small (about 1%).
For small copies, the savings is large on cortex-a15/krait devices
(between 5% to 30%).
For cortex-a9 and small copies, the speed up is present, but relatively
small (about 3% to 5%).
For __memset_chk and large copies, the savings is also small (about 1%).
However, all processors show larger speed-ups on small copies (about 30% to
100%).
Bug: 9293744
Merge from internal master.
(cherry-picked from 7c860db074 )
Change-Id: I916ad305e4001269460ca6ebd38aaa0be8ac7f52
2013-08-14 18:14:43 -07:00
Brian Carlstrom
26c755b256
am 0f14e8d5: am c85e0dbb: Merge "Add more information to error due to truncated Elf32_Ehdr"
...
* commit '0f14e8d5ea2cef28cfa0f39851ad55b134043e7d':
Add more information to error due to truncated Elf32_Ehdr
2013-08-14 15:56:12 -07:00
Brian Carlstrom
0f14e8d5ea
am c85e0dbb: Merge "Add more information to error due to truncated Elf32_Ehdr"
...
* commit 'c85e0dbb0b8d602f930cf7ae99901730c1c6a26a':
Add more information to error due to truncated Elf32_Ehdr
2013-08-14 15:54:08 -07:00
Brian Carlstrom
c85e0dbb0b
Merge "Add more information to error due to truncated Elf32_Ehdr"
2013-08-14 22:51:47 +00:00
Brian Carlstrom
0e79b91962
Add more information to error due to truncated Elf32_Ehdr
...
Change-Id: I24f30bd0c1120bcf85d77f5c4e69f0fefe9a2478
2013-08-14 15:47:46 -07:00
The Android Open Source Project
243ae9f461
Reconcile with klp-release - do not merge
...
Change-Id: I427a690248ab49aca987347b18f08ec0aabe38b9
2013-08-14 14:10:28 -07:00
Michael Wright
a71f676b47
am 7b197ea1: am 5e4a2f31: Merge "Update kernel input headers"
...
* commit '7b197ea1107055bcdf0a15f285495c5d70a3555c':
Update kernel input headers
2013-08-14 13:48:18 -07:00
Michael Wright
7b197ea110
am 5e4a2f31: Merge "Update kernel input headers"
...
* commit '5e4a2f3174485678d461d6b0eeb11a5e9a32e531':
Update kernel input headers
2013-08-14 13:47:03 -07:00
Michael Wright
5e4a2f3174
Merge "Update kernel input headers"
2013-08-14 20:45:19 +00:00
Michael Wright
55bdef8677
Update kernel input headers
...
To upstream SHA e1c85813f3832b909d1c4309b213bb0a52c79ba5
Change-Id: I72ee3d59c105bc0252b5ca0c49c569d12ec685d1
2013-08-14 13:30:20 -07:00
Christopher Ferris
3f78cb428e
am f0c3d909: Create optimized __strcpy_chk/__strcat_chk.
...
* commit 'f0c3d909136167fdbe32b7815e5e1e02b4c35d62':
Create optimized __strcpy_chk/__strcat_chk.
2013-08-14 07:58:50 -07:00
The Android Automerger
de19a0c55d
merge in klp-release history after reset to klp-dev
2013-08-14 06:04:54 -07:00
Christopher Ferris
f0c3d90913
Create optimized __strcpy_chk/__strcat_chk.
...
This change pulls the memcpy code out into a new file so that the
__strcpy_chk and __strcat_chk can use it with an include.
The new versions of the two chk functions uses assembly versions
of strlen and memcpy to implement this check. This allows near
parity with the assembly versions of strcpy/strcat. It also means that
as memcpy implementations get faster, so do the chk functions.
Other included changes:
- Change all of the assembly labels to local labels. The other labels
confuse gdb and mess up backtracing.
- Add .cfi_startproc and .cfi_endproc directives so that gdb is not
confused when falling through from one function to another.
- Change all functions to use cfi directives since they are more powerful.
- Move the memcpy_chk fail code outside of the memcpy function definition
so that backtraces work properly.
- Preserve lr before the calls to __fortify_chk_fail so that the backtrace
actually works.
Testing:
- Ran the bionic unit tests. Verified all error messages in logs are set
correctly.
- Ran libc_test, replacing strcpy with __strcpy_chk and replacing
strcat with __strcat_chk.
- Ran the debugger on nexus10, nexus4, and old nexus7. Verified that the
backtrace is correct for all fortify check failures. Also verify that
when falling through from __memcpy_chk to memcpy that the backtrace is
still correct. Also verified the same for __memset_chk and bzero.
Verified the two different paths in the cortex-a9 memset routine that
save variables to the stack still show the backtrace properly.
Bug: 9293744
Change-Id: Id5aec8c3cb14101d91bd125eaf3770c9c8aa3f57
(cherry picked from commit 2be91915dc )
2013-08-14 07:46:00 +00:00
Elliott Hughes
d861b6cbdf
am 3912f90e: Make ctype.h a little less unhygienic.
...
* commit '3912f90e56780ef54c68c796ff6793f5692e7658':
Make ctype.h a little less unhygienic.
2013-08-13 14:48:40 -07:00
Elliott Hughes
34cd499875
am fd61eccf: am ff9b7aa6: Merge "Make ctype.h a little less unhygienic."
...
* commit 'fd61eccf6b909ee6374ad43164f0e9bcd4b3547c':
Make ctype.h a little less unhygienic.
2013-08-13 14:45:44 -07:00
Elliott Hughes
0d5745fe8a
am 5951e846: Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
...
* commit '5951e84646553cdcba0c619f1424f2d934eeabb2':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
2013-08-13 14:45:22 -07:00
Elliott Hughes
fd61eccf6b
am ff9b7aa6: Merge "Make ctype.h a little less unhygienic."
...
* commit 'ff9b7aa695bd4860c0551b8899f2f26311174855':
Make ctype.h a little less unhygienic.
2013-08-13 14:43:26 -07:00
Elliott Hughes
3912f90e56
Make ctype.h a little less unhygienic.
...
This caused trouble for stlport.
(cherry picked from commit 5e9b20f721 )
Change-Id: I85d09c12c6de1e8502f83e0ef0f17747fdfe08a5
2013-08-13 14:42:43 -07:00
Elliott Hughes
5951e84646
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
...
(cherry picked from commit aec2ffbc5a )
Change-Id: Ib61b52dc37e63493094a0a7af23bf89d4a9f0ce5
2013-08-13 14:41:07 -07:00
Elliott Hughes
ff9b7aa695
Merge "Make ctype.h a little less unhygienic."
2013-08-13 21:40:13 +00:00
Elliott Hughes
5e9b20f721
Make ctype.h a little less unhygienic.
...
This caused trouble for stlport.
Change-Id: Id40787c5a2b7a3a4e12fb557efe549778a01cbbd
2013-08-13 14:30:59 -07:00
Elliott Hughes
c1772397f9
am ff8dcd4a: am c933493a: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
...
* commit 'ff8dcd4a1056257b454da71e1ea1371bb73d3a79':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
2013-08-12 14:28:52 -07:00
Elliott Hughes
ff8dcd4a10
am c933493a: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
...
* commit 'c933493ac28c40558f369d175da738ba601d8499':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
2013-08-12 13:25:48 -07:00
Elliott Hughes
c933493ac2
Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
2013-08-12 20:23:34 +00:00
Elliott Hughes
aec2ffbc5a
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
...
Change-Id: I94c411c22634e43184445c82e7388e51fc46a8cc
2013-08-12 12:07:05 -07:00
The Android Automerger
f63a467cdd
merge in klp-release history after reset to klp-dev
2013-08-12 06:00:44 -07:00
Elliott Hughes
2a5d2e98f9
am 9e9d1e01: resolved conflicts for merge of 86125aca to klp-dev
...
* commit '9e9d1e016faf12c4bc5454ce16e20f7db693a72d':
2013-08-08 18:10:55 -07:00
Elliott Hughes
9e9d1e016f
resolved conflicts for merge of 86125aca to klp-dev
...
Change-Id: I78622ecbad27301b285193a085fa04374aa60033
2013-08-08 18:08:33 -07:00
Elliott Hughes
598f3e9c4a
Merge "resolved conflicts for merge of dce94165 to klp-dev-plus-aosp" into klp-dev-plus-aosp
2013-08-09 01:05:49 +00:00
Elliott Hughes
3c3a64616a
resolved conflicts for merge of dce94165 to klp-dev-plus-aosp
...
Change-Id: If5f34f4a31c6a1218751f472ac949c324117a948
2013-08-08 18:03:38 -07:00
Elliott Hughes
14ec1b5886
am ceb670cf: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev
...
* commit 'ceb670cfc09e407a30627d5044f45d5e28e1be5d':
Add futimens.
2013-08-08 17:59:33 -07:00
Christopher Ferris
a07a955666
am 1036cd79: am 6beb3ea6: (-s ours) am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit '1036cd7939a4d6474d3f5762ea8bfdd95d3d0cfe':
2013-08-08 17:59:32 -07:00
Christopher Ferris
0a7e61d4a1
am 5ec2ab68: am 21b4ffa7: (-s ours) am 5427eb5c: (-s ours) am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '5ec2ab68f98af7fcb4975bafcb7293f835c9c4b6':
2013-08-08 17:59:31 -07:00
Elliott Hughes
ceb670cfc0
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev
2013-08-08 17:53:31 -07:00
Christopher Ferris
1036cd7939
am 6beb3ea6: (-s ours) am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit '6beb3ea6a1a49baef001ddd8c6872631f5e90f82':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
2013-08-08 17:53:19 -07:00
Christopher Ferris
5ec2ab68f9
am 21b4ffa7: (-s ours) am 5427eb5c: (-s ours) am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '21b4ffa7372b029e5a4898b877feb843da2831e9':
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
2013-08-08 17:53:18 -07:00
Elliott Hughes
840a114eb1
Add futimens.
...
(cherry picked from commit d0be7c8f9a )
Bug: 10239370
Change-Id: I0087e85a94d83b6ce68ec6a0768c44cbe4bd0132
2013-08-08 17:52:06 -07:00
Elliott Hughes
86125acacd
am dce94165: am ee48fed5: Merge "Add futimens."
...
* commit 'dce94165a5624935db9855e208420d36c763f771':
Add futimens.
2013-08-08 17:45:45 -07:00
Christopher Ferris
6beb3ea6a1
am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit 'd7d5049d58427e23318fa1920d63712676fc7725':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
2013-08-08 17:45:45 -07:00
Christopher Ferris
21b4ffa737
am 5427eb5c: (-s ours) am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '5427eb5c63417c7bc59bbfe112c97917dcef4e8c':
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
2013-08-08 17:45:44 -07:00
Christopher Ferris
d41e52a238
am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit 'd7d5049d58427e23318fa1920d63712676fc7725':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
2013-08-08 17:44:21 -07:00
Christopher Ferris
2e0a707f79
am 5427eb5c: (-s ours) am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '5427eb5c63417c7bc59bbfe112c97917dcef4e8c':
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
2013-08-08 17:44:21 -07:00
Elliott Hughes
dce94165a5
am ee48fed5: Merge "Add futimens."
...
* commit 'ee48fed51894f3db324e957058ed2ddcf23dddc7':
Add futimens.
2013-08-08 17:41:15 -07:00
Christopher Ferris
d7d5049d58
am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit '632fd5183a611b80e009be36f881f572acc41619':
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
2013-08-08 17:41:15 -07:00
Christopher Ferris
5427eb5c63
am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit 'e2066293e8279641d4abd13ec3fbdd6f42def83d':
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
2013-08-08 17:41:14 -07:00
Elliott Hughes
ee48fed518
Merge "Add futimens."
2013-08-09 00:37:32 +00:00
Elliott Hughes
d0be7c8f9a
Add futimens.
...
Bug: 10239370
Change-Id: I518340084103dc339ef8a065d4837d6258a1381d
2013-08-08 17:13:33 -07:00
Christopher Ferris
632fd5183a
Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
2013-08-08 19:12:20 +00:00
Christopher Ferris
e2066293e8
Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
2013-08-08 19:12:00 +00:00
Christopher Ferris
b922ed3498
Fix strcpy.c that should have been strcpy.S. DO NOT MERGE
...
Merge from internal master.
(cherry-picked from 1ce6654163 )
Change-Id: I376b831df42248baadde7202a30a68112f752ff7
2013-08-08 12:09:37 -07:00
Christopher Ferris
4e24dcc8d8
Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE
...
Create one version of strcat/strcpy/strlen for cortex-a15/krait and another
version for cortex-a9.
Tested with the libc_test strcat/strcpy/strlen tests.
Including new tests that verify that the src for strcat/strcpy do not
overread across page boundaries.
NOTE: The handling of unaligned strcpy (same code in strcat) could probably
be optimized further such that the src is read 64 bits at a time instead of
the partial reads occurring now.
strlen improves slightly since it was recently optimized.
Performance improvements for strcpy and strcat (using an empty dest string):
cortex-a9
- Small copies vary from about 5% to 20% as the size gets above 10 bytes.
- Copies >= 1024, about a 60% improvement.
- Unaligned copies, from about 40% improvement.
cortex-a15
- Most small copies exhibit a 100% improvement, a few copies only
improve by 20%.
- Copies >= 1024, about 150% improvement.
- Unaligned copies, about 100% improvement.
krait
- Most small copies vary widely, but on average 20% improvement, then
the performance gets better, hitting about a 100% improvement when
copies 64 bytes of data.
- Copies >= 1024, about 100% improvement.
- When coping MBs of data, about 50% improvement.
- Unaligned copies, about 90% improvement.
As strcat destination strings get larger in size:
cortex-a9
- about 40% improvement for small dst strings (>= 32).
- about 250% improvement for dst strings >= 1024.
cortex-a15
- about 200% improvement for small dst strings (>=32).
- about 250% improvement for dst strings >= 1024.
krait
- about 25% improvement for small dst strings (>=32).
- about 100% improvement for dst strings >=1024.
Merge from internal master.
(cherry-picked from d119b7b6f4 )
Change-Id: I296463b251ef9fab004ee4dded2793feca5b547a
2013-08-08 11:13:46 -07:00
The Android Automerger
b683cf117d
merge in klp-release history after reset to klp-dev
2013-08-08 07:53:11 -07:00
Colin Cross
7f4074d17d
bionic: name malloc'd regions
...
Use the new __bionic_name_mem function to name malloc'd memory as
"libc_malloc" on kernels that support it.
Change-Id: I7235eae6918fa107010039b9ab8b7cb362212272
2013-08-08 00:42:39 +00:00
Colin Cross
6771b9cef6
bionic: add function to name memory
...
Only works on some kernels, and only on page-aligned regions of
anonymous memory. It will show up in /proc/pid/maps as
[anon:<name>] and in /proc/pid/smaps as Name: <name>
Change-Id: If31667cf45ff41cc2a79a140ff68707526def80e
2013-08-07 15:41:30 -07:00
Christopher Ferris
7c860db074
Optimize __memset_chk, __memcpy_chk.
...
This change creates assembler versions of __memcpy_chk/__memset_chk
that is implemented in the memcpy/memset assembler code. This change
avoids an extra call to memcpy/memset, instead allowing a simple fall
through to occur from the chk code into the body of the real
implementation.
Testing:
- Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices.
- Wrote a small test executable that has three calls to __memcpy_chk and
three calls to __memset_chk. First call dest_len is length + 1. Second
call dest_len is length. Third call dest_len is length - 1.
Verified that the first two calls pass, and the third fails. Examined
the logcat output on all nexus devices to verify that the fortify
error message was sent properly.
- I benchmarked the new __memcpy_chk and __memset_chk on all systems. For
__memcpy_chk and large copies, the savings is relatively small (about 1%).
For small copies, the savings is large on cortex-a15/krait devices
(between 5% to 30%).
For cortex-a9 and small copies, the speed up is present, but relatively
small (about 3% to 5%).
For __memset_chk and large copies, the savings is also small (about 1%).
However, all processors show larger speed-ups on small copies (about 30% to
100%).
Bug: 9293744
Change-Id: I8926d59fe2673e36e8a27629e02a7b7059ebbc98
2013-08-06 15:38:29 -07:00
The Android Automerger
2b899b04e9
merge in klp-release history after reset to master
2013-08-06 08:16:59 -07:00
Christopher Ferris
1ce6654163
Fix strcpy.c that should have been strcpy.S.
...
Change-Id: Ib4609baad3a14c8b0f37556269781fa2b06916dc
2013-08-05 17:08:06 -07:00
Christopher Ferris
e1857431e8
Merge "Optimize strcat/strcpy, small tweaks to strlen."
2013-08-05 23:32:06 +00:00
Elliott Hughes
e66ffef900
am cd927519: Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"
...
* commit 'cd927519a94939f2ebc307544f827baade529bc9':
Fix stdint.h intptr_t/uintptr_t for x86_64/x32
2013-08-05 15:51:54 -07:00
Elliott Hughes
28e0ec8d61
am a0473d77: Merge "syslog needs a valid socket path for _PATH_LOG"
...
* commit 'a0473d77b2d3a6f26e29cc8c2fdaeb2a4b3ab8f8':
syslog needs a valid socket path for _PATH_LOG
2013-08-05 15:51:53 -07:00
Elliott Hughes
cd927519a9
Merge "Fix stdint.h intptr_t/uintptr_t for x86_64/x32"
2013-08-05 20:55:24 +00:00
Elliott Hughes
a0473d77b2
Merge "syslog needs a valid socket path for _PATH_LOG"
2013-08-05 20:41:50 +00:00
Robert Greenwalt
662bb875e4
am a9c5bb97: Merge "Fix the detection of alt-network in dns resolver."
...
* commit 'a9c5bb972df7cbb4e65cfb53673b26f9d42deacd':
Fix the detection of alt-network in dns resolver.
2013-08-05 11:55:53 -07:00
Robert Greenwalt
a9c5bb972d
Merge "Fix the detection of alt-network in dns resolver."
2013-08-05 18:45:03 +00:00
Robert Greenwalt
1d8d9a308c
Fix the detection of alt-network in dns resolver.
...
Used to determine proper A/AAAA record request.
bug:10132565
Change-Id: I7229f6672e879920a6fae58672cddd72db78546c
2013-08-05 18:44:30 +00:00
The Android Automerger
1714c787b6
merge in klp-release history after reset to master
2013-08-05 06:00:46 -07:00
Elliott Hughes
49b24b4efb
am 3287dccf: Merge "Add ssse3 implementation of __memcmp16."
...
* commit '3287dccf2ecced89bb39b857abc8eba997bc3f51':
Add ssse3 implementation of __memcmp16.
2013-08-02 18:04:01 -07:00
Ben Cheng
b78f43579f
am aa2733d1: Merge "Update the comments to reflect the current status."
...
* commit 'aa2733d17b87c607fccbd6e6a0f44d2d411ffd77':
Update the comments to reflect the current status.
2013-08-02 17:58:47 -07:00
Elliott Hughes
3287dccf2e
Merge "Add ssse3 implementation of __memcmp16."
2013-08-03 00:58:46 +00:00
Elliott Hughes
d0313e7a2a
am a6ed05c1: Merge "libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher"
...
* commit 'a6ed05c1c4c787241b56df132e77512c64cbc595':
libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher
2013-08-02 17:58:46 -07:00
Alexander Ivchenko
baa91f4f89
Add ssse3 implementation of __memcmp16.
...
__memcmp16 was missing in x86. Also added C-version for backward
compatibility. Added bionic test for __memcmp16 and for wmemcmp.
Change-Id: I33718441e7ee343cdb021d91dbeaf9ce2d4d7eb4
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com >
2013-08-02 17:57:23 -07:00
Ben Cheng
aa2733d17b
Merge "Update the comments to reflect the current status."
2013-08-02 23:06:10 +00:00
Ben Cheng
772b797b7b
Update the comments to reflect the current status.
...
Change-Id: I3a6348b568230fe8b21d121e5b8d30561a9703c2
2013-08-02 15:53:18 -07:00
Elliott Hughes
a6ed05c1c4
Merge "libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher"
2013-08-02 22:39:08 +00:00
Christopher Ferris
d119b7b6f4
Optimize strcat/strcpy, small tweaks to strlen.
...
Create one version of strcat/strcpy/strlen for cortex-a15/krait and another
version for cortex-a9.
Tested with the libc_test strcat/strcpy/strlen tests.
Including new tests that verify that the src for strcat/strcpy do not
overread across page boundaries.
NOTE: The handling of unaligned strcpy (same code in strcat) could probably
be optimized further such that the src is read 64 bits at a time instead of
the partial reads occurring now.
strlen improves slightly since it was recently optimized.
Performance improvements for strcpy and strcat (using an empty dest string):
cortex-a9
- Small copies vary from about 5% to 20% as the size gets above 10 bytes.
- Copies >= 1024, about a 60% improvement.
- Unaligned copies, from about 40% improvement.
cortex-a15
- Most small copies exhibit a 100% improvement, a few copies only
improve by 20%.
- Copies >= 1024, about 150% improvement.
- Unaligned copies, about 100% improvement.
krait
- Most small copies vary widely, but on average 20% improvement, then
the performance gets better, hitting about a 100% improvement when
copies 64 bytes of data.
- Copies >= 1024, about 100% improvement.
- When coping MBs of data, about 50% improvement.
- Unaligned copies, about 90% improvement.
As strcat destination strings get larger in size:
cortex-a9
- about 40% improvement for small dst strings (>= 32).
- about 250% improvement for dst strings >= 1024.
cortex-a15
- about 200% improvement for small dst strings (>=32).
- about 250% improvement for dst strings >= 1024.
krait
- about 25% improvement for small dst strings (>=32).
- about 100% improvement for dst strings >=1024.
Change-Id: Ifd091ebdbce70fe35a7c5d8f71d5914255f3af35
2013-08-02 10:31:51 -07:00
Pavel Chupin
0a9c615a89
Fix stdint.h intptr_t/uintptr_t for x86_64/x32
...
Patch is required in NDK headers as well to be able to build multilib
GCC with libgomp support.
It's here: https://android-review.googlesource.com/#/c/62982
Change-Id: I2bec25d8cbca0e5ef1a0857008ececd92f4911be
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2013-08-02 19:23:37 +04:00
Robert Greenwalt
7e5d7485b7
am e6345f1a: Merge "Tell the dns resolver about our domains."
...
* commit 'e6345f1a1ec691690c69d5663ca8bb2b70240d93':
Tell the dns resolver about our domains.
2013-07-31 17:57:45 -07:00
Robert Greenwalt
e6345f1a1e
Merge "Tell the dns resolver about our domains."
2013-08-01 00:47:29 +00:00
Robert Greenwalt
e0805a94c5
Tell the dns resolver about our domains.
...
A refactor caused us to not tell the resolver about search domains
until after it had done the domain fanout.
bug:6799630
Change-Id: Ibabd8fa5bcc69b1490fc5e329e62eb0f2d1a5e63
2013-07-31 16:53:46 -07:00
The Android Automerger
1d1fe3bb69
merge in klp-release history after reset to master
2013-07-30 11:08:39 -07:00
Elliott Hughes
abf3638317
am 101b5e1f: Merge "Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way."
...
* commit '101b5e1f6cc4e24635760928b3d2c1e51c1e5774':
Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way.
2013-07-29 17:35:49 -07:00
Elliott Hughes
101b5e1f6c
Merge "Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way."
2013-07-30 00:29:58 +00:00
Elliott Hughes
c03e1e7439
Define PTHREAD_KEYS_MAX and _POSIX_THREAD_KEYS_MAX in a POSIX-compliant way.
...
Also make sysconf use PTHREAD_STACK_MIN rather than redefining its
own, different, constant.
Bug: 9997352
Change-Id: I9a8e7d2b18e691439abfb45533e82c36eee9e81d
2013-07-29 17:09:36 -07:00
synergydev
efddf44c8e
libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher
...
This is needed when passing -mcpu=cortex-a9 or higher on a modern
toolchain for prebuilt library compatibility
Change-Id: I73eb2393377914ae26216a8c2828ad973d1c1225
2013-07-29 16:55:08 -07:00
Elliott Hughes
326b52760d
am 9a73d08f: Merge "Bump the number of TLS slots to 128."
...
* commit '9a73d08f4c334c00fe06d583d37e038ebe063eba':
Bump the number of TLS slots to 128.
2013-07-25 17:04:18 -07:00
Elliott Hughes
9a73d08f4c
Merge "Bump the number of TLS slots to 128."
2013-07-25 21:51:05 +00:00
Elliott Hughes
838f01fdc7
Bump the number of TLS slots to 128.
...
Bug: 9997352
Change-Id: I7bde7228d803e9d4bb83309c5891d54a07e3b025
2013-07-25 14:14:22 -07:00
Elliott Hughes
478314a109
am a9feb5e3: Merge "Avoid sign extension of the mmap offset."
...
* commit 'a9feb5e33a5261f45fb25fd5e90a56792c6a437e':
Avoid sign extension of the mmap offset.
2013-07-25 10:51:00 -07:00
Elliott Hughes
a9feb5e33a
Merge "Avoid sign extension of the mmap offset."
2013-07-25 17:28:59 +00:00
Elliott Hughes
e320a8c780
Avoid sign extension of the mmap offset.
...
off_t is signed to support seeking backwards, but that's a liability
when using off_t to represent a subset of a file.
Change-Id: I2a3615166eb16212347eb47f1242e3bfb93c2022
2013-07-25 10:15:07 -07:00
The Android Automerger
48161c898b
merge in klp-release history after reset to master
2013-07-24 06:00:57 -07:00
Elliott Hughes
a59b7ed8c3
am bfba6aac: am a8d06766: Merge "[MIPS] __dso_handle.S and __dso_handle_so.S not needed."
...
* commit 'bfba6aac99115972fad3341aef595c0ca1f7258b':
[MIPS] __dso_handle.S and __dso_handle_so.S not needed.
2013-07-23 18:10:51 -07:00
Elliott Hughes
bfba6aac99
am a8d06766: Merge "[MIPS] __dso_handle.S and __dso_handle_so.S not needed."
...
* commit 'a8d06766c7674bbfde852e8bfee4200e75ad8f24':
[MIPS] __dso_handle.S and __dso_handle_so.S not needed.
2013-07-23 18:07:12 -07:00
Rom Lemarchand
c847f749fe
am c5749f1f: am 061246b6: Merge "Restore dlmalloc mmap threshold to 64k"
...
* commit 'c5749f1f4232e59e66737488036aba1f583867d5':
Restore dlmalloc mmap threshold to 64k
2013-07-23 13:58:12 -07:00
Rom Lemarchand
c5749f1f42
am 061246b6: Merge "Restore dlmalloc mmap threshold to 64k"
...
* commit '061246b600c16a80b246804221b9e3fa65e507d9':
Restore dlmalloc mmap threshold to 64k
2013-07-23 13:52:29 -07:00
The Android Automerger
58ccd60877
merge in klp-release history after reset to master
2013-07-22 06:00:33 -07:00
Elliott Hughes
aa9116f0ed
am c2902edf: am 6fe4a58f: Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."
...
* commit 'c2902edfc4aaa02977eef7154d05d5369bc48281':
Move stuff only needed by pthread-timers.c into pthread-timers.c.
2013-07-19 17:19:46 -07:00
Elliott Hughes
c2902edfc4
am 6fe4a58f: Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."
...
* commit '6fe4a58f84954523f17114f1f7cf060a3573c073':
Move stuff only needed by pthread-timers.c into pthread-timers.c.
2013-07-19 17:13:33 -07:00
Elliott Hughes
8b56ba8896
am 178c4185: am e8bd8c2e: Merge "Upgrade mktemp.c to the current upstream version."
...
* commit '178c41857321732259c3e22d73c86c22ae4359b5':
Upgrade mktemp.c to the current upstream version.
2013-07-19 16:43:07 -07:00
Elliott Hughes
178c418573
am e8bd8c2e: Merge "Upgrade mktemp.c to the current upstream version."
...
* commit 'e8bd8c2ed9c71c73682f29020456934c55f260e3':
Upgrade mktemp.c to the current upstream version.
2013-07-19 16:37:52 -07:00
Colin Cross
15d2784fc1
Merge "Kexec header generated from linux header 3.10"
2013-07-18 17:41:09 +00:00
The Android Automerger
00196d1a46
merge in klp-release history after reset to master
2013-07-18 06:00:28 -07:00
Elliott Hughes
3c212645a0
am 81b46980: am f8a66bb3: Merge "Remove some non-unused makefile generality."
...
* commit '81b4698059c37ac36aa74d1498bef5654580ad3f':
Remove some non-unused makefile generality.
2013-07-17 17:45:03 -07:00
Elliott Hughes
81b4698059
am f8a66bb3: Merge "Remove some non-unused makefile generality."
...
* commit 'f8a66bb31204b42f830c1865a795b5f3eb1e0147':
Remove some non-unused makefile generality.
2013-07-17 17:41:43 -07:00
Elliott Hughes
ac74b8565a
am b6b2375d: am 8fa9081f: Merge "[MIPS] Rewrite MIPS crtbegin* as C files."
...
* commit 'b6b2375df8ca63a5e349d8277d425ab58e16aeb1':
[MIPS] Rewrite MIPS crtbegin* as C files.
2013-07-17 17:40:46 -07:00
Elliott Hughes
b6b2375df8
am 8fa9081f: Merge "[MIPS] Rewrite MIPS crtbegin* as C files."
...
* commit '8fa9081f48c4861f83737d59bf2c2c8f21c7da3f':
[MIPS] Rewrite MIPS crtbegin* as C files.
2013-07-17 17:36:26 -07:00
Elliott Hughes
66f8452a14
am cbf07a25: am 2be511d4: Merge "Improve stack overflow diagnostics (take 2)."
...
* commit 'cbf07a25149cd924a348e4dc0395c5d08f86fd7f':
Improve stack overflow diagnostics (take 2).
2013-07-17 13:53:06 -07:00
Elliott Hughes
cbf07a2514
am 2be511d4: Merge "Improve stack overflow diagnostics (take 2)."
...
* commit '2be511d405d47eccc61a6e3c338d1877bf33b4fa':
Improve stack overflow diagnostics (take 2).
2013-07-17 13:50:15 -07:00
Elliott Hughes
4add6968be
resolved conflicts for merge of e35d6c28 to master
...
Change-Id: I237bfc35d872a2e2ff10984012f9811488a5cea7
2013-07-17 13:28:30 -07:00
Elliott Hughes
e35d6c28df
am 40e7a878: Merge "Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno."
...
* commit '40e7a87864fee75f7af2caf8e1972d0d764135cd':
Prevent the madvise(MADV_MERGEABLE) mmap hack from affecting errno.
2013-07-17 13:22:39 -07:00
Elliott Hughes
a5a3b3bdb1
resolved conflicts for merge of 4763ef2b to master
...
Change-Id: I4d424f9fb438c2ed845bca0bbcae69b4d0f5e3dc
2013-07-17 13:18:43 -07:00
Elliott Hughes
4763ef2b5b
am b7b36b81: Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"
...
* commit 'b7b36b819e8029a152859f3204ba2da38a0e2879':
mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
2013-07-17 13:05:13 -07:00
The Android Automerger
0976c97fe4
merge in klp-release history after reset to master
2013-07-17 06:00:13 -07:00
Guang Zhu
81b7df7315
am 6f08b865: am 2cf5a6f6: Merge "Revert "Improve stack overflow diagnostics.""
...
* commit '6f08b8659a3682b7e774af6ed68b1b613e147f1b':
Revert "Improve stack overflow diagnostics."
2013-07-16 20:23:42 -07:00
Guang Zhu
dd4eb67a48
am 849bfd58: am 8c1b9668: Merge "Revert "Clean up our alternate signal stacks.""
...
* commit '849bfd58118e8c8a4b1ad8a7c3de74bb3cd13863':
Revert "Clean up our alternate signal stacks."
2013-07-16 20:23:41 -07:00
Guang Zhu
6f08b8659a
am 2cf5a6f6: Merge "Revert "Improve stack overflow diagnostics.""
...
* commit '2cf5a6f6627549842c0c840ff3615ae942a90ea3':
Revert "Improve stack overflow diagnostics."
2013-07-16 20:18:57 -07:00
Guang Zhu
849bfd5811
am 8c1b9668: Merge "Revert "Clean up our alternate signal stacks.""
...
* commit '8c1b96681af91fda86a5493e7f7e4381ce489648':
Revert "Clean up our alternate signal stacks."
2013-07-16 20:18:57 -07:00
Christopher Ferris
66cb2edba5
am 7ff868a6: am f63c28f0: Merge "Fix assembler errors in generic arm strlen.c."
...
* commit '7ff868a6307f0d5e63555b5d320b8ad6e490e3c4':
Fix assembler errors in generic arm strlen.c.
2013-07-16 17:24:40 -07:00
Christopher Ferris
69205c5433
am b1d7fd49: am 6f4fed74: Merge "Add new optimized strlen for arm."
...
* commit 'b1d7fd4969fdd3d3402b500840561beb30962c1d':
Add new optimized strlen for arm.
2013-07-16 17:24:40 -07:00
Christopher Ferris
7ff868a630
am f63c28f0: Merge "Fix assembler errors in generic arm strlen.c."
...
* commit 'f63c28f0338fd647e88f1f9300b2220093af1aae':
Fix assembler errors in generic arm strlen.c.
2013-07-16 17:22:05 -07:00
Christopher Ferris
b1d7fd4969
am 6f4fed74: Merge "Add new optimized strlen for arm."
...
* commit '6f4fed74cb9405c0f5322307085d15afed6be764':
Add new optimized strlen for arm.
2013-07-16 17:21:55 -07:00
Elliott Hughes
152dcf3b3f
am 79dfb1af: am f35e0c14: Merge "Clean up our alternate signal stacks."
...
* commit '79dfb1afda16565a0dd378eca7f72bfe81fae205':
Clean up our alternate signal stacks.
2013-07-16 15:56:16 -07:00
Elliott Hughes
79dfb1afda
am f35e0c14: Merge "Clean up our alternate signal stacks."
...
* commit 'f35e0c149f1a6801a5af7c339f84d81ae05c3adf':
Clean up our alternate signal stacks.
2013-07-16 15:50:18 -07:00
Elliott Hughes
617a1e4977
am 10a954de: am 026867c7: Merge "Improve stack overflow diagnostics."
...
* commit '10a954dea6732232ed6cf56d3aa6ca38673dacbf':
Improve stack overflow diagnostics.
2013-07-16 15:36:12 -07:00
Elliott Hughes
f2f6b2bad3
am d2acf124: am 9562d38d: Merge "Clean up __builtin_expect usage."
...
* commit 'd2acf124ed7ad18f8adb5159544c92234cade90e':
Clean up __builtin_expect usage.
2013-07-16 15:36:12 -07:00
Elliott Hughes
62d6b7526a
am 2a18ea14: am f152e386: Merge "EABI syscall cleanup."
...
* commit '2a18ea1462cf65cc51bfcb1a1c46972ee5af1d01':
EABI syscall cleanup.
2013-07-16 15:36:11 -07:00
Elliott Hughes
10a954dea6
am 026867c7: Merge "Improve stack overflow diagnostics."
...
* commit '026867c7dcce7828212dcd4a61806146908e9039':
Improve stack overflow diagnostics.
2013-07-16 15:31:40 -07:00
Elliott Hughes
d2acf124ed
am 9562d38d: Merge "Clean up __builtin_expect usage."
...
* commit '9562d38df1e4aba941b3433cfd0922fee5ea258b':
Clean up __builtin_expect usage.
2013-07-16 15:31:39 -07:00
Elliott Hughes
2a18ea1462
am f152e386: Merge "EABI syscall cleanup."
...
* commit 'f152e386fcf477f3f5de9dc020c3660d4f9c4b81':
EABI syscall cleanup.
2013-07-16 15:31:39 -07:00
The Android Automerger
7256fbd9b2
merge in klp-release history after reset to master
2013-07-16 06:00:36 -07:00
Elliott Hughes
993ea1061b
am 5148661f: am 67750c85: Merge "Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize."
...
* commit '5148661f8d2be514d0e3c191bc1e489157ae1154':
Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize.
2013-07-15 16:45:54 -07:00
Elliott Hughes
5148661f8d
am 67750c85: Merge "Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize."
...
* commit '67750c8515573cba294b2f3840249dd7f7d817d5':
Fix pthread_getattr_np, pthread_attr_setguardsize, and pthread_attr_setstacksize.
2013-07-15 16:42:34 -07:00
Christopher Ferris
d8d10a8994
Fix assembler errors in generic arm strlen.c.
...
Tested using a static version of the strlen libc_test program
on a nexus7 that uses the generic code.
Change-Id: If04d15dcb6c0b18f27f2fefadca5510ed49016c5
2013-07-15 13:56:45 -07:00
Szymon Starzycki
674be7e0fc
Kexec header generated from linux header 3.10
...
Change-Id: Iac26fcc6e0e25905ab52dba91bec16a4fb479d43
2013-07-15 13:51:56 -07:00
Christopher Ferris
67e9f47476
Merge "Add new optimized strlen for arm."
2013-07-15 19:44:26 +00:00
Christopher Ferris
2fc0717977
Add new optimized strlen for arm.
...
This optimized version is primarily targeted at cortex-a15.
Tested on all nexus devices using the system/extras/libc_test strlen test.
Tested alignments from 1 to 32 that are powers of 2.
Tested that strlen does not cross page boundaries at all alignments.
Speed improvements listed below:
cortex-a15
- Sizes >= 32 bytes, ~75% improvement.
- Sizes >= 1024 bytes, ~250% improvement.
cortex-a9
- Sizes >= 32 bytes, ~75% improvement.
- Sizes >= 1024 bytes, ~85% improvement.
krait
- Sizes >= 32 bytes, ~95% improvement.
- Sizes >= 1024 bytes, ~160% improvement.
Change-Id: I361b1a36ed89ab991f2a8f0abbf0d7416d39c8f5
2013-07-15 12:37:51 -07:00
Elliott Hughes
fc2ada9741
am f384be3b: am 59ed029b: Merge "Upgrade to tzcode2013d."
...
* commit 'f384be3b5c2062e7ef4e7449b466bf2f24f7bcc8':
Upgrade to tzcode2013d.
2013-07-15 10:15:45 -07:00
Elliott Hughes
f384be3b5c
am 59ed029b: Merge "Upgrade to tzcode2013d."
...
* commit '59ed029b286a1564f635377296e4f088e0fd2afa':
Upgrade to tzcode2013d.
2013-07-15 10:11:04 -07:00
The Android Automerger
2d7d92e811
merge in klp-release history after reset to master
2013-07-15 06:00:50 -07:00
Elliott Hughes
d3522051ce
am 7e56f462: am 3db1f359: Merge "Add a trivial gmtime(3) test."
...
* commit '7e56f462ad19791d7b270e297fc994d18df43252':
Add a trivial gmtime(3) test.
2013-07-12 14:35:19 -07:00
Elliott Hughes
7e56f462ad
am 3db1f359: Merge "Add a trivial gmtime(3) test."
...
* commit '3db1f359e9f218f5f73a7a9f4d80e4be362a526e':
Add a trivial gmtime(3) test.
2013-07-12 14:28:40 -07:00
Elliott Hughes
47c7e33ccb
am ff20b911: am 8a363692: Merge "Add TCP_INFO state enum values."
...
* commit 'ff20b9110659e67433ce641a6224cdc9ccc01301':
Add TCP_INFO state enum values.
2013-07-11 18:57:42 -07:00
Nick Kralevich
4fa5d6a5db
am ef49e99d: am d30877ae: Merge "syslog.h: add __printflike to syslog functions"
...
* commit 'ef49e99d92597a4e9fddbba0e1e3feddc06fee53':
syslog.h: add __printflike to syslog functions
2013-07-11 18:57:41 -07:00
Elliott Hughes
ff20b91106
am 8a363692: Merge "Add TCP_INFO state enum values."
...
* commit '8a363692be45ed1b36e1f1f21707b6f35f5519c8':
Add TCP_INFO state enum values.
2013-07-11 18:52:22 -07:00
Nick Kralevich
ef49e99d92
am d30877ae: Merge "syslog.h: add __printflike to syslog functions"
...
* commit 'd30877ae28f3c308edf142c091b3a8acc4467c6d':
syslog.h: add __printflike to syslog functions
2013-07-11 18:52:01 -07:00
Geremy Condra
bb17967761
Merge "Add marking of DNS sockets for mark based routing"
2013-07-11 22:10:31 +00:00
Elliott Hughes
f9a1d1cf5f
am 09f561b3: am b7f49237: Merge "Fix MIPS build."
...
* commit '09f561b38b880e551097b807585d0e037fa36442':
Fix MIPS build.
2013-07-11 10:16:33 -07:00
Elliott Hughes
1087e0df4f
am 731f7c2d: am 9d476716: Merge "Add <sys/statvfs.h>."
...
* commit '731f7c2d0e531d5e0ecdd771d743053f8d093e16':
Add <sys/statvfs.h>.
2013-07-11 10:16:32 -07:00
Elliott Hughes
09f561b38b
am b7f49237: Merge "Fix MIPS build."
...
* commit 'b7f492375291306065472b67011eebb324de1022':
Fix MIPS build.
2013-07-09 14:21:50 -07:00
Elliott Hughes
731f7c2d0e
am 9d476716: Merge "Add <sys/statvfs.h>."
...
* commit '9d476716c2bd7bc5a018a71e121257c35e965058':
Add <sys/statvfs.h>.
2013-07-09 13:44:57 -07:00
Chad Brubaker
c39214e0ac
Add marking of DNS sockets for mark based routing
...
Adds an extra mark parameter to android_getaddrinfoforiface,
android_gethostbyaddrforiface and android_gethostbynameforiface that if set
will cause all packets sent by DNS requests to have that mark
Change-Id: I6f72390e4ce5bfc3cc73183f9b2fb3705a11685f
2013-07-09 13:16:22 -07:00
The Android Automerger
b89a334df8
merge in klp-release history after reset to master
2013-07-09 06:00:16 -07:00
Elliott Hughes
273df910b5
am f3f72e7f: am 4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."
...
* commit 'f3f72e7f277215e9fede7c6f6695654cf7aa0c63':
Remove <netinet/icmp6.h> ni_* macros.
2013-07-08 15:13:35 -07:00
Elliott Hughes
4df412cba6
am 74b06f8d: am ff145277: Merge "Upgrade to tzdata2013d."
...
* commit '74b06f8ddcaaa48c7bab418d15aacaf513423ac3':
Upgrade to tzdata2013d.
2013-07-08 15:09:57 -07:00
Elliott Hughes
f3f72e7f27
am 4fc8a0c1: Merge "Remove <netinet/icmp6.h> ni_* macros."
...
* commit '4fc8a0c1165537b693c900ac3e2c61470bd7e484':
Remove <netinet/icmp6.h> ni_* macros.
2013-07-08 15:09:07 -07:00
Elliott Hughes
74b06f8ddc
am ff145277: Merge "Upgrade to tzdata2013d."
...
* commit 'ff145277da9b7fe3d48a27839fc1d6f2ed11604b':
Upgrade to tzdata2013d.
2013-07-08 14:55:41 -07:00
Elliott Hughes
f33dce1ab6
am 233050b1: am e31c45c9: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
...
* commit '233050b15ec3ce0db534ec6cc24a6061559993d2':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
2013-07-08 11:27:53 -07:00
Elliott Hughes
233050b15e
am e31c45c9: Merge "Make bionic\'s <netinet/icmp6.h> standalone, like glibc\'s."
...
* commit 'e31c45c9fa5e0d2853941282e619b753550b82ae':
Make bionic's <netinet/icmp6.h> standalone, like glibc's.
2013-07-08 11:21:53 -07:00
Elliott Hughes
b1397f97f1
am 62bdd031: am 6b33f31b: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
...
* commit '62bdd03120286708d8c1562eadf5dda00e24911c':
Fix IPv6 filtering definitions in netinet/icmp6.h.
2013-07-08 10:38:41 -07:00
Elliott Hughes
62bdd03120
am 6b33f31b: Merge "Fix IPv6 filtering definitions in netinet/icmp6.h."
...
* commit '6b33f31b0994b8132bed8936685522e2e01754d8':
Fix IPv6 filtering definitions in netinet/icmp6.h.
2013-07-08 10:34:41 -07:00
Elliott Hughes
b611d36c3a
am 24400ac1: am e63ea6ac: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit '24400ac1e390615ebcb45deacc1c9213b00f75ff':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:17:38 -07:00
Elliott Hughes
24400ac1e3
am e63ea6ac: Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."
...
* commit 'e63ea6aca7d01ba9219b877ed5fab6de5c6037fb':
Clean up <sys/mount.h>/<linux/fs.h> duplication.
2013-07-08 10:12:32 -07:00
The Android Automerger
1456ec759c
merge in klp-release history after reset to master
2013-07-08 06:00:29 -07:00
Nick Kralevich
20cb10824b
am 601f968c: am 84983592: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '601f968cedf015c060de8dcf21e7e10bf596901f':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:33:22 -07:00
Nick Kralevich
601f968ced
am 84983592: Merge "bionic_atomic_arm.h: Remove < ARMv6 support"
...
* commit '84983592ade3ec7d72d082262fb6646849979bfc':
bionic_atomic_arm.h: Remove < ARMv6 support
2013-07-03 14:28:14 -07:00
Elliott Hughes
1f75ee8606
am a8b954c5: am de2781d9: Merge changes I01345c23,I3b57517c
...
* commit 'a8b954c51edd9ec8c09a5d1dccacaadf5869d78a':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:45:45 -07:00
Elliott Hughes
a8b954c51e
am de2781d9: Merge changes I01345c23,I3b57517c
...
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
2013-07-03 13:39:16 -07:00
Elliott Hughes
be438a4c40
am fac9199c: am ebc8ce1d: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit 'fac9199c7698481805dd9b1adaf89a2584719f4c':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-03 10:28:19 -07:00
Elliott Hughes
fac9199c76
am ebc8ce1d: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit 'ebc8ce1de68a83d772106af98c7cb98150bb5662':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-03 10:23:41 -07:00
Elliott Hughes
997368d60d
am 833dc584: am 87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
...
* commit '833dc584d4d02ab8e396b877b38a8a5ad8ba4882':
Expose dn_comp and dn_expand to system C code.
2013-07-02 16:05:34 -07:00
Elliott Hughes
833dc584d4
am 87b4286f: Merge "Expose dn_comp and dn_expand to system C code."
...
* commit '87b4286f092094a2e8069a06e20ef5036a258172':
Expose dn_comp and dn_expand to system C code.
2013-07-02 16:02:30 -07:00
Elliott Hughes
742aad3584
am 7c808b29: am feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
...
* commit '7c808b29d5cea61e5bda90a1b0f2f0e669ee135e':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
2013-07-02 15:50:36 -07:00
Elliott Hughes
7c808b29d5
am feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."
...
* commit 'feec97a7c7fbd032174fb4870a02422c2acd891a':
Fix inttypes.h PRI?PTR and SCN?PTR macros.
2013-07-02 15:44:48 -07:00
Nick Kralevich
e4723161d5
Merge "mmap: Don't call madvise if mmap fails"
2013-07-02 19:52:44 +00:00
Elliott Hughes
2aac0fcc20
am dcd237a8: am 1ba3a2c2: Merge "Update icmp6.h to current NetBSD."
...
* commit 'dcd237a89707357ead904a2476bb2210e251c173':
Update icmp6.h to current NetBSD.
2013-07-02 12:41:37 -07:00
Elliott Hughes
dcd237a897
am 1ba3a2c2: Merge "Update icmp6.h to current NetBSD."
...
* commit '1ba3a2c26937c68a4a0bd4fdffe95f5162077997':
Update icmp6.h to current NetBSD.
2013-07-02 12:34:36 -07:00
Nick Kralevich
553a5ec407
mmap: Don't call madvise if mmap fails
...
Fix improper check of return value from __mmap2. On a failed
mmap(), it returns MAP_FAILED, not 0. This ended up clobbering errno
when madvise subsequently failed.
Change-Id: I364fb2f158fe258c55a73e552195384b2c11c193
2013-07-02 12:31:07 -07:00
The Android Automerger
9db12e44af
merge in klp-release history after reset to master
2013-07-02 07:07:20 -07:00
Christopher Ferris
c6ac3ae269
am 269daac2: am 7c14d67b: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit '269daac2f1d76a478b83ba4cbb57d28b47eef5ec':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-01 10:39:08 -07:00
Christopher Ferris
269daac2f1
am 7c14d67b: Merge "libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings."
...
* commit '7c14d67bc1cc2679365a784e68518bf602b81dc7':
libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
2013-07-01 10:32:17 -07:00
Nick Kralevich
4b17283c98
am 28d298a6: am 413eef71: Merge "More FORTIFY_SOURCE functions under clang"
...
* commit '28d298a673da4367f27f428db5e12d7dad3d8e83':
More FORTIFY_SOURCE functions under clang
2013-07-01 10:04:18 -07:00
Nick Kralevich
28d298a673
am 413eef71: Merge "More FORTIFY_SOURCE functions under clang"
...
* commit '413eef716f822d5eb4f57618f6780c6af5036460':
More FORTIFY_SOURCE functions under clang
2013-07-01 10:00:09 -07:00
The Android Automerger
5da8df2840
merge in klp-release history after reset to master
2013-07-01 07:07:20 -07:00
Nick Kralevich
22570f51a5
am a289964b: am 227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
...
* commit 'a289964bca39c591b54e0c336da1a6730e85cd61':
resolv_private.h: remove #define b64_ntop and b64_pton
2013-06-28 13:37:08 -07:00
Nick Kralevich
a289964bca
am 227b47a4: Merge "resolv_private.h: remove #define b64_ntop and b64_pton"
...
* commit '227b47a461b27d746b373feb66001cdddc9ba1db':
resolv_private.h: remove #define b64_ntop and b64_pton
2013-06-28 13:32:43 -07:00
Nick Kralevich
fda0c06605
am 2018cfa8: am 394df35e: Merge "Reorganize FORTIFY_SOURCE tests."
...
* commit '2018cfa85d4c7f36316376f5b090be5f0d3d13dc':
Reorganize FORTIFY_SOURCE tests.
2013-06-28 13:15:39 -07:00
Nick Kralevich
2018cfa85d
am 394df35e: Merge "Reorganize FORTIFY_SOURCE tests."
...
* commit '394df35e641816a3b9f0e065840b673dec9c73e5':
Reorganize FORTIFY_SOURCE tests.
2013-06-28 13:11:14 -07:00
Nick Kralevich
9a268a10bb
am f9ef0106: am 78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
...
* commit 'f9ef0106da43d21e6cb68d87b86d806f63b215fd':
stdio.h: enable vs?printf clang FORTIFY_SOURCE
2013-06-27 10:18:17 -07:00
Nick Kralevich
f9ef0106da
am 78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"
...
* commit '78a7bf998d2d29592504984fcf419cd2701c6c54':
stdio.h: enable vs?printf clang FORTIFY_SOURCE
2013-06-27 10:15:31 -07:00
The Android Automerger
e4450b447e
merge in klp-release history after reset to master
2013-06-26 07:07:28 -07:00
Colin Cross
2f76830a01
am 146d79c2: am fbec57d4: Merge changes Ib496e818,I074204e9
...
* commit '146d79c22a70d772defc63acfa6ac6128102a15f':
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
2013-06-25 18:29:14 -07:00
Colin Cross
146d79c22a
am fbec57d4: Merge changes Ib496e818,I074204e9
...
* commit 'fbec57d46c42460b2381484d1610ff21922d162e':
bionic: add compatibility mode for properties
bionic: use the size of the file to determine property area size
2013-06-25 17:08:48 -07:00
Elliott Hughes
9145ae66d7
am db6dd600: am b116bf76: Merge "Switch to current upstream getopt_long."
...
* commit 'db6dd600d23eafb1742e5114bae7a4b8be4c04e1':
Switch to current upstream getopt_long.
2013-06-25 17:02:11 -07:00
Rom Lemarchand
6937468d37
am baa61864: am 995f17e6: Merge "libc: add swapon and swapoff syscalls"
...
* commit 'baa61864c515a56d4dbeac46b149b4317b01797b':
libc: add swapon and swapoff syscalls
2013-06-25 17:02:06 -07:00
Elliott Hughes
43508014c4
am 51371ee0: am c76550b3: Merge "Update x86 machine/endian.h from upstream"
...
* commit '51371ee0d897285b869aa2af670e153ead471e03':
Update x86 machine/endian.h from upstream
2013-06-25 17:01:53 -07:00
Elliott Hughes
d9643a3119
am d31287d6: am 7d624e9a: Merge "Kernel dso support for \'dl_iterate_phdr\' function"
...
* commit 'd31287d6017475209cfee2fea0532bdc8c0f4aac':
Kernel dso support for 'dl_iterate_phdr' function
2013-06-25 17:01:47 -07:00
Nick Kralevich
caad18c7d1
am 71802135: am bfacb603: Merge "libc: enable FORTIFY_SOURCE snprintf under clang"
...
* commit '7180213557f3120b391053b4f5861037eda6ebb6':
libc: enable FORTIFY_SOURCE snprintf under clang
2013-06-25 16:30:53 -07:00
Colin Cross
4fc4c9be84
am a99e29e6: (-s ours) am 1642edb5: Merge changes Ib074192d,I6df3afed,I69070455,Icbe31908,Id3fa4526,I038d451f
...
* commit 'a99e29e61090da9c21c17cae54211083a2268d6e':
bionic: store property names as variable-length strings
bionic: prevent root processes from calling __system_property_add
bionic: revert to a single (larger) property area
bionic: reimplement property area as hybrid trie/binary tree
bionic: add missing memory barriers to system properties
bionic: make property area expandable
2013-06-25 16:30:34 -07:00
Elliott Hughes
db6dd600d2
am b116bf76: Merge "Switch to current upstream getopt_long."
...
* commit 'b116bf76286178a7d552c4d0a72b79212c8c93d1':
Switch to current upstream getopt_long.
2013-06-25 15:58:53 -07:00
Rom Lemarchand
baa61864c5
am 995f17e6: Merge "libc: add swapon and swapoff syscalls"
...
* commit '995f17e6a9a9903f03f542192da9a83b1cabc684':
libc: add swapon and swapoff syscalls
2013-06-25 15:28:21 -07:00
Elliott Hughes
51371ee0d8
am c76550b3: Merge "Update x86 machine/endian.h from upstream"
...
* commit 'c76550b3377f50a2bc53536e2713e14edc8dbeac':
Update x86 machine/endian.h from upstream
2013-06-25 14:22:14 -07:00
Colin Cross
ad76c85b9c
bionic: add compatibility mode for properties
...
Allow a new bionic to work with an old init property area by supporting
the old format.
Change-Id: I9268214b2f8930e75e3b5c26afe94fa92068bf0b
2013-06-25 13:34:45 -07:00
Colin Cross
285b42a04c
bionic: use the size of the file to determine property area size
...
On the reader size, don't assume that the property size is PA_SIZE,
read it from the size of the file. Allows init to use a different
property size without recompiling statically linked executables.
Change-Id: I87fb0bf40c4724e3759a583fd9ea1f49492bc958
2013-06-25 13:34:45 -07:00
Greg Hackmann
4fe82929eb
bionic: store property names as variable-length strings
...
Names are immutable, so the fixed-sized arrays can be replaced with
variable-length ones to save memory (especially on internal tree nodes).
Change-Id: Iddf7856fba579b97f355e9ad4b3663a78767b96d
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-25 13:34:42 -07:00
Colin Cross
fc761f8cc0
bionic: prevent root processes from calling __system_property_add
...
If a root process other than init calls __system_property_add, which
it should never do, it will break the design assumption that there is
only one mutator.
Pass O_EXCL to open() in map_prop_region_rw to ensure that only one
process ever has the property pages open for write.
Change-Id: I8233bfe0beaa40a5003ad53b98c661536b15f6b7
2013-06-25 13:34:36 -07:00
Greg Hackmann
be30c7a78a
bionic: revert to a single (larger) property area
...
d329697 is too complicated. Change the multiple property pages back to
a single 128K property area that's mapped in entirely at initialization
(the memory will not get allocated until the pages are touched).
d329697 has other changes useful for testing (moving property area
initialization inside bionic and adding __system_property_set_filename)
so undo the change manually rather than with git revert.
Change-Id: Icd137669a4f8bc248e9dd2c1e8cc54e9193c9a6d
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-25 13:34:32 -07:00
Greg Hackmann
d5276422ca
bionic: add hierarchical properties test
...
Deliberately put items several levels deep in the trie hierarchy to test
the trie traversal
Change-Id: I995a1cdd3b5e74162fb5d25bc0f65140bdf2f719
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-25 13:34:29 -07:00
Greg Hackmann
4482d85139
bionic: reimplement property area as hybrid trie/binary tree
...
See the comments for an explanation of how properties are stored.
The trie structure is designed to scale better than the previous
array-based implementation. Searching an array with n properties
required average O(n) string compares of the entire key; searching the
trie requires average O(log n) string compares of each token (substrings
between '.' characters).
Change-Id: Ic28b3c5246004a3c502eb02d6e1c9b512884d872
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-25 13:34:24 -07:00
Elliott Hughes
d31287d601
am 7d624e9a: Merge "Kernel dso support for \'dl_iterate_phdr\' function"
...
* commit '7d624e9aff4c6addea7f2275fe58ff0815d95c70':
Kernel dso support for 'dl_iterate_phdr' function
2013-06-25 13:17:37 -07:00
Nick Kralevich
7180213557
am bfacb603: Merge "libc: enable FORTIFY_SOURCE snprintf under clang"
...
* commit 'bfacb603e417c1e2c25ce8482b5c6e31b4db8c9b':
libc: enable FORTIFY_SOURCE snprintf under clang
2013-06-25 10:34:20 -07:00
The Android Automerger
4261a08409
merge in klp-release history after reset to master
2013-06-25 07:07:12 -07:00
Nick Kralevich
5f7f7fca27
am 95448039: am 0ea1d5c0: Merge "libc: enable sprintf FORTIFY_SOURCE under clang"
...
* commit '954480393f4539f62cdc3f6cb83c562050ea4f51':
libc: enable sprintf FORTIFY_SOURCE under clang
2013-06-25 05:59:32 -07:00
Greg Hackmann
c79de97ccc
bionic: replace 4K property pages with 32K property pages
...
Fixes apps compiled statically against new libc but running with old
init
Bug: 9558625
Change-Id: I79e6f02575d278d4c7d8e8546d772ed0529bcaab
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 19:23:34 -07:00
Greg Hackmann
de76bafb21
bionic: replace 4K property pages with 32K property pages
...
Fixes apps compiled statically against new libc but running with old
init
Bug: 9558625
Change-Id: I79e6f02575d278d4c7d8e8546d772ed0529bcaab
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 18:41:46 -07:00
Greg Hackmann
44c273c293
Revert "bionic: reimplement property area as hybrid trie/binary tree"
...
This reverts commit 6ac8e6a46d .
2013-06-24 18:05:20 -07:00
Greg Hackmann
890aa0d937
Revert "bionic: add hierarchical properties test"
...
This reverts commit 0f76e2340c .
2013-06-24 18:05:18 -07:00
Greg Hackmann
fa8cc0629f
Revert "bionic: revert to a single (larger) property area"
...
This reverts commit 5f05348c18 .
2013-06-24 18:05:16 -07:00
Greg Hackmann
b938756eb3
Revert "bionic: prevent root processes from calling __system_property_add"
...
This reverts commit fb9b7b436f .
2013-06-24 18:05:14 -07:00
Greg Hackmann
982463d99b
Revert "bionic: store property names as variable-length strings"
...
This reverts commit 492ce95d9f .
2013-06-24 18:05:10 -07:00
Colin Cross
a99e29e610
am 1642edb5: Merge changes Ib074192d,I6df3afed,I69070455,Icbe31908,Id3fa4526,I038d451f
...
* commit '1642edb5208fe02ef64d5734fffaf7c4a724fd2f':
bionic: store property names as variable-length strings
bionic: prevent root processes from calling __system_property_add
bionic: revert to a single (larger) property area
bionic: reimplement property area as hybrid trie/binary tree
bionic: add missing memory barriers to system properties
bionic: make property area expandable
2013-06-24 17:10:16 -07:00
Greg Hackmann
492ce95d9f
bionic: store property names as variable-length strings
...
Names are immutable, so the fixed-sized arrays can be replaced with
variable-length ones to save memory (especially on internal tree nodes).
Change-Id: Iee77874b4b55b0f9c5e531d1334be7f7f40086d2
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 16:15:52 -07:00
Colin Cross
fb9b7b436f
bionic: prevent root processes from calling __system_property_add
...
If a root process other than init calls __system_property_add, which
it should never do, it will break the design assumption that there is
only one mutator.
Pass O_EXCL to open() in map_prop_region_rw to ensure that only one
process ever has the property pages open for write.
Change-Id: I6b7c118e5e2fd2b92a2b168b8454fe9707325462
2013-06-24 16:15:52 -07:00
Greg Hackmann
5f05348c18
bionic: revert to a single (larger) property area
...
d329697 is too complicated. Change the multiple property pages back to
a single 128K property area that's mapped in entirely at initialization
(the memory will not get allocated until the pages are touched).
d329697 has other changes useful for testing (moving property area
initialization inside bionic and adding __system_property_set_filename)
so undo the change manually rather than with git revert.
Change-Id: I0ecb27843404f93af5489f15bfe657d65175e4f0
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 16:15:52 -07:00
Nick Kralevich
954480393f
am 0ea1d5c0: Merge "libc: enable sprintf FORTIFY_SOURCE under clang"
...
* commit '0ea1d5c0ae94ee581c72451b20813c028f51090c':
libc: enable sprintf FORTIFY_SOURCE under clang
2013-06-24 15:20:39 -07:00
Greg Hackmann
0f76e2340c
bionic: add hierarchical properties test
...
Deliberately put items several levels deep in the trie hierarchy to test
the trie traversal
Change-Id: Id3cbd2e7d3500216b1ac8025eac70c0939622903
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 13:14:10 -07:00
Greg Hackmann
6ac8e6a46d
bionic: reimplement property area as hybrid trie/binary tree
...
See the comments for an explanation of how properties are stored.
The trie structure is designed to scale better than the previous
array-based implementation. Searching an array with n properties
required average O(n) string compares of the entire key; searching the
trie requires average O(log n) string compares of each token (substrings
between '.' characters).
Change-Id: I491305bc7aca59609abcd871a5f33d97f89ce714
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-24 13:14:09 -07:00
Greg Hackmann
a823883548
Merge "bionic: add missing memory barriers to system properties"
2013-06-24 17:15:43 +00:00
The Android Automerger
22476056b0
merge in klp-release history after reset to master
2013-06-24 09:44:30 -07:00
Nick Kralevich
ae9353387d
am 100d6784: am 53ddcc90: Merge "linker: Emit a warning on text relocations"
...
* commit '100d678438f222ad6ef8f3dc0646911b218c50a9':
linker: Emit a warning on text relocations
2013-06-21 16:01:02 -07:00
Nick Kralevich
100d678438
am 53ddcc90: Merge "linker: Emit a warning on text relocations"
...
* commit '53ddcc90701d86c7d809a84cf4710c651066e3c7':
linker: Emit a warning on text relocations
2013-06-21 15:39:21 -07:00
Nick Kralevich
cf3c9ce0f5
am cb25359a: am 68197731: Merge "libc_logging: don\'t keep file descriptors open forever"
...
* commit 'cb25359a2e20489a3a9f65795a2079abc8fe0b65':
libc_logging: don't keep file descriptors open forever
2013-06-21 15:15:22 -07:00
Nick Kralevich
cb25359a2e
am 68197731: Merge "libc_logging: don\'t keep file descriptors open forever"
...
* commit '6819773103495a6fd81f024dc6711771320ae4ec':
libc_logging: don't keep file descriptors open forever
2013-06-21 14:33:48 -07:00
Greg Hackmann
5bfa3ee8b3
bionic: add missing memory barriers to system properties
...
1) Reading the value must finish before checking whether it's intact
2) Setting the serial's dirty bit must visible before modifying the
value
3) The modified value must be visible before clearing the serial's dirty
bit
4) New properties and their TOC entries must be visible before updating
the property count
Change-Id: I26c680ec025fdb72362d5f618ec0d2b93d381233
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-20 14:41:58 -07:00
Nick Kralevich
33ae76abf3
am 5fed0eea: am 0ce28d20: Merge "libc: enable FORTIFY_SOURCE clang strlcpy"
...
* commit '5fed0eeabd88bfe241c416f2c2f44a14b6e447fa':
libc: enable FORTIFY_SOURCE clang strlcpy
2013-06-20 12:34:11 -07:00
Nick Kralevich
5fed0eeabd
am 0ce28d20: Merge "libc: enable FORTIFY_SOURCE clang strlcpy"
...
* commit '0ce28d20ea5fde250576f355004dbcd741b0b884':
libc: enable FORTIFY_SOURCE clang strlcpy
2013-06-20 12:29:38 -07:00
Elliott Hughes
cb4fd62762
am 33df38a0: am 4eed6509: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
...
* commit '33df38a04c31de0fca431c549469edb6d2de75e2':
stdint.h header is not fully compatible with C99(ISO9899:1999)
2013-06-19 12:57:39 -07:00
Elliott Hughes
33df38a04c
am 4eed6509: Merge "stdint.h header is not fully compatible with C99(ISO9899:1999)"
...
* commit '4eed65090b1f0d0d087f26bd7367da90a0cca92d':
stdint.h header is not fully compatible with C99(ISO9899:1999)
2013-06-19 12:46:40 -07:00
Greg Hackmann
d32969701b
bionic: make property area expandable
...
The property area is initially one 4K region, automatically expanding as
needed up to 64 regions.
To avoid duplicating code, __system_property_area_init() now allocates
and initializes the first region (previously it was allocated in init's
init_property_area() and initialized in bionic). For testing purposes,
__system_property_set_filename() may be used to override the file used
to map in regions.
Change-Id: Ibe00ef52464bfa590953c4699a6d98383b0142b1
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-19 11:02:15 -07:00
Nick Kralevich
373ea006ce
am 1d174a9c: am 02ca0e31: Merge "Fix FORTIFY_SOURCE unittests."
...
* commit '1d174a9c17f645a27d766a66e7477d797f955e90':
Fix FORTIFY_SOURCE unittests.
2013-06-19 10:40:46 -07:00
Nick Kralevich
1d174a9c17
am 02ca0e31: Merge "Fix FORTIFY_SOURCE unittests."
...
* commit '02ca0e314219a4c7205a180a414c509651043f13':
Fix FORTIFY_SOURCE unittests.
2013-06-19 10:36:55 -07:00
Colin Cross
700b548738
am f4250508: am 3225f498: Merge "bionic: add __system_property_foreach"
...
* commit 'f4250508d5de415e200888ffdf143f870dc0f829':
bionic: add __system_property_foreach
2013-06-19 10:31:11 -07:00
Colin Cross
f4250508d5
am 3225f498: Merge "bionic: add __system_property_foreach"
...
* commit '3225f4984837c4d9e6e9495d2154f2d9987cf457':
bionic: add __system_property_foreach
2013-06-19 10:27:23 -07:00
The Android Automerger
6e06d4b106
merge in klp-release history after reset to master
2013-06-19 07:40:48 -07:00
Greg Hackmann
577418403d
bionic: add __system_property_foreach
...
find_nth() will be inefficient on a trie. Since find_nth() is only used
internally and only for enumerating properties, we can add a foreach()
function to do this directly.
Change-Id: I66bde9926c193073d74b244cce9fffd52108fff8
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2013-06-18 15:38:31 -07:00
Geremy Condra
1791cb0001
Merge "Fix remove_uidiface_info failing on first entry"
2013-06-18 21:43:52 +00:00
Elliott Hughes
fb11350c81
am 13e23302: am c656d732: Merge "Always use v1 for MIPS TLS access."
...
* commit '13e23302c93fdd8b52c606277f32dec0627ddbbd':
Always use v1 for MIPS TLS access.
2013-06-18 14:00:59 -07:00
Elliott Hughes
13e23302c9
am c656d732: Merge "Always use v1 for MIPS TLS access."
...
* commit 'c656d732c7712b0f73d9c560ccf3cb5ae47d219d':
Always use v1 for MIPS TLS access.
2013-06-18 13:57:57 -07:00
Nick Kralevich
83476f0747
am d98d35c5: am 0846109c: Merge "libc: Rename fortify error functions."
...
* commit 'd98d35c5380ce398038d3062d40bc4fe082dce80':
libc: Rename fortify error functions.
2013-06-18 13:31:56 -07:00
Nick Kralevich
227079bb67
am 3bf62790: am dd0880fe: Merge "libc: add limited FORTIFY_SOURCE support for clang"
...
* commit '3bf6279034e6a92c3550fae31c5c136bec61344a':
libc: add limited FORTIFY_SOURCE support for clang
2013-06-18 13:31:56 -07:00
Elliott Hughes
6a87df87a2
am 45ef218b: am 6807af77: Merge "Make LD_PRELOAD failures just warnings."
...
* commit '45ef218bde353df455062aa3c9a9f84ffed769fc':
Make LD_PRELOAD failures just warnings.
2013-06-18 13:31:55 -07:00
Colin Cross
bf03f1b4d6
am e421bd71: am 02002443: Merge "bionic: fix deleting property arrays in property benchmark"
...
* commit 'e421bd71c32e35b8f39f2e51f2d534d2f21f139f':
bionic: fix deleting property arrays in property benchmark
2013-06-18 13:27:29 -07:00
Nick Kralevich
d98d35c538
am 0846109c: Merge "libc: Rename fortify error functions."
...
* commit '0846109c96d54a28e413893b0cd4b4acb3aa87fc':
libc: Rename fortify error functions.
2013-06-18 13:27:18 -07:00
Nick Kralevich
3bf6279034
am dd0880fe: Merge "libc: add limited FORTIFY_SOURCE support for clang"
...
* commit 'dd0880fec3bb8c998680e78aff9e2ddc2bcf6d7a':
libc: add limited FORTIFY_SOURCE support for clang
2013-06-18 13:27:17 -07:00
Elliott Hughes
45ef218bde
am 6807af77: Merge "Make LD_PRELOAD failures just warnings."
...
* commit '6807af773f862750efb6860e00402580a5f463f3':
Make LD_PRELOAD failures just warnings.
2013-06-18 13:27:16 -07:00
Colin Cross
e421bd71c3
am 02002443: Merge "bionic: fix deleting property arrays in property benchmark"
...
* commit '02002443d4b17de78418d51fc303b4c976ad071a':
bionic: fix deleting property arrays in property benchmark
2013-06-18 13:23:51 -07:00
Nick Kralevich
ce7c2f28c6
am ba6c021a: am e2fb05b4: Merge "libc: Introduce __errordecl()"
...
* commit 'ba6c021a53376c75993cc9866deb7c7ff6e1750d':
libc: Introduce __errordecl()
2013-06-18 13:21:00 -07:00
Nick Kralevich
ba6c021a53
am e2fb05b4: Merge "libc: Introduce __errordecl()"
...
* commit 'e2fb05b45b9af7b9af8df0ea15bfec63d331d882':
libc: Introduce __errordecl()
2013-06-18 13:17:35 -07:00
Colin Cross
3b599c1dde
am 1a38e063: am 0005b354: Merge "bionic: change properties benchmarks to read a single property"
...
* commit '1a38e063830924efb8a6d9d7a6135ef54460cb9b':
bionic: change properties benchmarks to read a single property
2013-06-18 13:07:58 -07:00
Colin Cross
1a38e06383
am 0005b354: Merge "bionic: change properties benchmarks to read a single property"
...
* commit '0005b3544be345e697592b4dc199ebaa37048559':
bionic: change properties benchmarks to read a single property
2013-06-18 13:04:10 -07:00
The Android Automerger
cb83bdfa6b
merge in master-release history after reset to master
2013-06-18 07:49:19 -07:00
Colin Cross
66a061c8b5
am f6e6e5e7: am 977a3313: Merge changes Iac00ce10,I192d3825
...
* commit 'f6e6e5e72774e302c461767ca0c194f25502108e':
bionic: add tests for properties
bionic: move system property writing from init to bionic
2013-06-17 18:33:50 -07:00
Colin Cross
f6e6e5e727
am 977a3313: Merge changes Iac00ce10,I192d3825
...
* commit '977a33137d2be0093f474055f839cf665b82b588':
bionic: add tests for properties
bionic: move system property writing from init to bionic
2013-06-17 18:21:37 -07:00
Elliott Hughes
9edf071a5d
am d2dbf163: am 5995bf88: Merge "don\'t hardcode register r0/v1 when reading the TLS"
...
* commit 'd2dbf16358bee4777a3e4937cf316fa8bb905559':
don't hardcode register r0/v1 when reading the TLS
2013-06-17 14:56:04 -07:00
Elliott Hughes
d2dbf16358
am 5995bf88: Merge "don\'t hardcode register r0/v1 when reading the TLS"
...
* commit '5995bf880e2a7fac249382f0a929b7271c843122':
don't hardcode register r0/v1 when reading the TLS
2013-06-17 14:53:12 -07:00
Colin Cross
37d9f75dde
bionic: add tests for properties
...
Change-Id: I09b212966f1c9624631653ef2c7a71de78bbbec1
2013-06-17 12:58:18 -07:00
Colin Cross
dc1038b790
bionic: move system property writing from init to bionic
...
Move the implementation of writing to the system property area
from init to bionic, next to the reader implementation. This
will allow full property testing to be added to bionic tests.
Add new accessor and waiting functions to hide the implementation
from watchprops and various bionic users.
Also hide some of the implementation details of the property area
from init by moving them into _system_properties.h, and other details
from everybody by moving them into system_properties.h.
Change-Id: I9026e604109e30546b2849b60cab2e7e5ff00ba5
2013-06-17 12:44:34 -07:00
Elliott Hughes
a658ed09e5
am afd4e299: am 657d0da7: Merge "Slight script cleanup; make gensyscalls work from any directory."
...
* commit 'afd4e2999c3e726498c407fcaf9cccdcd4d24637':
Slight script cleanup; make gensyscalls work from any directory.
2013-06-17 11:22:01 -07:00
Elliott Hughes
afd4e2999c
am 657d0da7: Merge "Slight script cleanup; make gensyscalls work from any directory."
...
* commit '657d0da7513e01b0eb104c8a8a522c28fdbc807d':
Slight script cleanup; make gensyscalls work from any directory.
2013-06-17 11:18:58 -07:00
The Android Automerger
31d61f13ab
merge in master-release history after reset to master
2013-06-17 07:49:47 -07:00
Chad Brubaker
638503b515
Fix remove_uidiface_info failing on first entry
...
Change-Id: Ic23506581ff835a6b679e1593eab550a84548056
2013-06-14 15:25:42 -07:00
Elliott Hughes
8f5440c486
am c1e4183c: am 560e9f7e: Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
...
* commit 'c1e4183c7ad6943f9cc44fe0b769884370a739cd':
Ensure that <stdint.h> defines SIZE_MAX and friends.
2013-06-13 18:04:19 -07:00
Elliott Hughes
c1e4183c7a
am 560e9f7e: Merge "Ensure that <stdint.h> defines SIZE_MAX and friends."
...
* commit '560e9f7e7a39e02aca96709043ca06f562f75d58':
Ensure that <stdint.h> defines SIZE_MAX and friends.
2013-06-13 16:21:55 -07:00
Elliott Hughes
fa3af2dd67
am af975b07: am c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
...
* commit 'af975b076f79b35cb115c0f77fc8fc0e5d3dba67':
Fix the qsort copyright notice (fixed upstream this afternoon).
2013-06-12 17:51:25 -07:00
Elliott Hughes
af975b076f
am c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
...
* commit 'c843a3e7b215bca5e896e1d56c2fa6332770ea83':
Fix the qsort copyright notice (fixed upstream this afternoon).
2013-06-12 17:46:57 -07:00
Elliott Hughes
050374836f
am ddbf561e: am c843d766: Merge "Handles spurious wake-ups in pthread_join()"
...
* commit 'ddbf561e5ee8f16fc15d26b085d19ce6abf7e4e0':
Handles spurious wake-ups in pthread_join()
2013-06-12 17:38:26 -07:00
Elliott Hughes
de1b73dd70
am 7ae23868: am 92e841d0: Merge "Take upstream libm changes."
...
* commit '7ae23868b4741f9b1af874ebbb13ec3ba930d679':
Take upstream libm changes.
2013-06-12 17:35:02 -07:00
Elliott Hughes
ddbf561e5e
am c843d766: Merge "Handles spurious wake-ups in pthread_join()"
...
* commit 'c843d7667ada205ecbaf773531067076ed4ad271':
Handles spurious wake-ups in pthread_join()
2013-06-12 17:34:17 -07:00
Elliott Hughes
7ae23868b4
am 92e841d0: Merge "Take upstream libm changes."
...
* commit '92e841d0aa8d118882a74e3c3fc4b6a6062dcc09':
Take upstream libm changes.
2013-06-12 17:30:59 -07:00
Elliott Hughes
b0cd876974
am 5065eef8: am 6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
...
* commit '5065eef801aa78a8a64a016fcf644a6ca91a8133':
Take some fixed upstream copyright headers and regenerate NOTICE.
2013-06-12 16:23:33 -07:00
Elliott Hughes
5065eef801
am 6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
...
* commit '6a44d2271f372d0c65b05a5d3377bd00ce92824e':
Take some fixed upstream copyright headers and regenerate NOTICE.
2013-06-12 16:16:09 -07:00
Elliott Hughes
3267163200
am 5f4d2df2: am 55189a0f: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
...
* commit '5f4d2df2fcddfe62f9e08d1607a8c4e029f01b3d':
Switch to current upstream stdio makebuf.c and setvbuf.c.
2013-06-12 16:03:49 -07:00
Elliott Hughes
5f4d2df2fc
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.
2013-06-12 15:58:41 -07:00
Elliott Hughes
460b70d063
am dc5f5f85: am f1867d47: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
...
* commit 'dc5f5f857c7bf218d33212044539eb73b3fab5f1':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
2013-06-12 15:26:46 -07:00
Elliott Hughes
dc5f5f857c
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."
2013-06-12 15:22:04 -07:00
Elliott Hughes
7e06ab5655
am b0a2262c: am 55c5ec64: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
...
* commit 'b0a2262c3f91085e79c3fd491379e45821254427':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
2013-06-12 15:11:12 -07:00
Elliott Hughes
b0a2262c3f
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.
2013-06-12 15:06:51 -07:00
Elliott Hughes
7ac852fb05
am 3da47942: am 944ea1a3: Merge "Clean up abort."
...
* commit '3da47942d3fdeb6f39cf84b03c75cfeb69f91449':
Clean up abort.
2013-06-12 15:02:34 -07:00
Elliott Hughes
3da47942d3
am 944ea1a3: Merge "Clean up abort."
...
* commit '944ea1a32018c44d6cb55c9454e670b0e152da6d':
Clean up abort.
2013-06-12 14:58:32 -07:00
Elliott Hughes
1e88a7abca
am 834f83de: am 5cde15eb: Merge "<stdint.h> should expose SIZE_MAX."
...
* commit '834f83de3f3363090385963eef1cd9a053a51a71':
<stdint.h> should expose SIZE_MAX.
2013-06-12 11:05:18 -07:00
Elliott Hughes
834f83de3f
am 5cde15eb: Merge "<stdint.h> should expose SIZE_MAX."
...
* commit '5cde15eb17f4ddc0949c0cbd38a46e6c0bad7019':
<stdint.h> should expose SIZE_MAX.
2013-06-12 10:58:23 -07:00
The Android Automerger
2df16acc42
merge in master-release history after reset to master
2013-06-12 07:49:39 -07:00
Nick Kralevich
6d88e4e96b
am 26cc1d68: am b6e88020: Merge "fix unittests."
...
* commit '26cc1d6838c0c4fd18abbf6ea5a38d24aea93893':
fix unittests.
2013-06-11 16:03:32 -07:00
Nick Kralevich
26cc1d6838
am b6e88020: Merge "fix unittests."
...
* commit 'b6e880200d1690c00cb843e59c6849a275dbfbb7':
fix unittests.
2013-06-11 15:56:42 -07:00
The Android Automerger
4a0c222bb1
merge in master-release history after reset to master
2013-06-11 07:49:16 -07:00
Ben Cheng
d20a04c5cf
am 77f90de7: am fc104f89: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
...
* commit '77f90de728b9fa60b83b7f12a45c1113f3189cb2':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
2013-06-10 17:28:46 -07:00
Ben Cheng
77f90de728
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.
2013-06-10 17:25:31 -07:00
Brian Carlstrom
b181747aa1
am d978d21d: am 8252b8e4: Merge "Honor p_vaddr if set"
...
* commit 'd978d21d195976fa3f257b8d17ec2fe18fb436a7':
Honor p_vaddr if set
2013-06-10 15:44:13 -07:00
Brian Carlstrom
d978d21d19
am 8252b8e4: Merge "Honor p_vaddr if set"
...
* commit '8252b8e4b730b13623f31dc66396e000586d1c58':
Honor p_vaddr if set
2013-06-10 15:41:19 -07:00
Geremy Condra
72254952e1
Merge "Add clearing of resolv uid and pid interface maps"
2013-06-10 18:45:01 +00:00
The Android Automerger
5074892e0a
merge in master-release history after reset to master
2013-06-10 09:52:26 -07:00
Elliott Hughes
efc78bbb9f
am 6bcf71c9: am 2fbc9dda: Merge "bionic/x86: Optimization for string routines"
...
* commit '6bcf71c9ac8395038ca243160d4367759be8dd80':
bionic/x86: Optimization for string routines
2013-06-07 17:52:16 -07:00
Elliott Hughes
1b14c72420
am fc6f5a08: am 157c4299: Merge "Revert "libc x86: Remove strcat.S""
...
* commit 'fc6f5a086557f81fce2542b7015268bff697d10c':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:48:53 -07:00
Elliott Hughes
6bcf71c9ac
am 2fbc9dda: Merge "bionic/x86: Optimization for string routines"
...
* commit '2fbc9dda345486005569be4ec586c6aae9d51650':
bionic/x86: Optimization for string routines
2013-06-07 17:47:33 -07:00
Elliott Hughes
fc6f5a0865
am 157c4299: Merge "Revert "libc x86: Remove strcat.S""
...
* commit '157c42997b7aa31b36cca63ad03dbb5a601ce347':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:44:20 -07:00
Christopher Ferris
b3a7db2dc2
am 83245ba4: am 9647f797: Merge "Implement malloc_usable_size for debug impls."
...
* commit '83245ba45facf0caff3beb18a27e6604df9094ba':
Implement malloc_usable_size for debug impls.
2013-06-07 17:36:50 -07:00
Christopher Ferris
83245ba45f
am 9647f797: Merge "Implement malloc_usable_size for debug impls."
...
* commit '9647f797d59222cd91507d4554bf62166ba88e0a':
Implement malloc_usable_size for debug impls.
2013-06-07 15:16:30 -07:00
Chad Brubaker
87594a32b8
Add clearing of resolv uid and pid interface maps
...
Cleanup uid interface map variable names
Change-Id: I712dd83276bb23b149af4180515ef33a1bade5ea
2013-06-07 13:03:23 -07:00
Christopher Ferris
3d594c2580
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
Change-Id: Ieba99b58c2228c88d80afd264501004a4dadd212
2013-06-07 12:56:09 -07:00
Geremy Condra
a24d14c05d
Merge "Add per UID interface support to resolv cache"
2013-06-06 20:48:44 +00:00
Chad Brubaker
0c9bb49a9d
Add per UID interface support to resolv cache
...
Add methods to attach/detach UID ranges to a specific dns cache/interface.
This mirrors the already existing code for attaching specific processes to
specific interfaces but will be used to push all processes from a given
user to a specific cache/interface.
Change-Id: Ic24391e92d3ca46fcb46cc4fc53e13984dec40b3
2013-06-06 12:31:16 -07:00
Elliott Hughes
b166e699dc
am e84cfbef: am b7b4f5b8: Merge "update signal.h to be C90 compatable"
...
* commit 'e84cfbefd82f552490c580d35a54db4f53b6e5fb':
update signal.h to be C90 compatable
2013-06-05 18:14:30 -07:00
Elliott Hughes
e51cd6f9c9
am 5a6a0a94: am 18af4503: Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."
...
* commit '5a6a0a9445d80bf2bd847088921f6d1d99315552':
Ensure header files using __BEGIN_DECLS include sys/cdefs.h.
2013-06-05 18:11:05 -07:00
Elliott Hughes
e84cfbefd8
am b7b4f5b8: Merge "update signal.h to be C90 compatable"
...
* commit 'b7b4f5b838cd41407c734af74e8211f5c7da0036':
update signal.h to be C90 compatable
2013-06-05 18:09:17 -07:00
Elliott Hughes
5a6a0a9445
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.
2013-06-05 18:06:04 -07:00
Elliott Hughes
0ecb96c3a2
am b9e2dae4: am c5bfb624: Merge "sys/personality.h: include <sys/cdefs.h>"
...
* commit 'b9e2dae427ef1e1cfdbb3faa1442d4a66a2d3bcd':
sys/personality.h: include <sys/cdefs.h>
2013-06-05 17:32:20 -07:00
Elliott Hughes
b9e2dae427
am c5bfb624: Merge "sys/personality.h: include <sys/cdefs.h>"
...
* commit 'c5bfb62433751579e86d5fd24cddf3ae28a49b43':
sys/personality.h: include <sys/cdefs.h>
2013-06-05 17:29:01 -07:00
Elliott Hughes
bedd8e3de1
am ce208f33: am 8d36050a: Merge "Clean up useless declaration in thread_private.h"
...
* commit 'ce208f3389769026df02f7aebd85c8f5d3e74c73':
Clean up useless declaration in thread_private.h
2013-06-05 17:06:50 -07:00
Elliott Hughes
ce208f3389
am 8d36050a: Merge "Clean up useless declaration in thread_private.h"
...
* commit '8d36050ac2bb1c4a6a04462e64c5440e3c23c9f0':
Clean up useless declaration in thread_private.h
2013-06-05 17:02:29 -07:00
The Android Automerger
a7b5635e60
merge in master-release history after reset to master
2013-06-05 07:49:30 -07:00
Elliott Hughes
8ed5aec934
am 4b47d9f9: am 4c001859: Merge "Fix declaration of malloc_usable_size()"
...
* commit '4b47d9f978296e5bb2eaabb8069960eb6f207c80':
Fix declaration of malloc_usable_size()
2013-06-04 19:02:21 -07:00
Elliott Hughes
4b47d9f978
am 4c001859: Merge "Fix declaration of malloc_usable_size()"
...
* commit '4c001859feeda27727917c5bd00338e90b801742':
Fix declaration of malloc_usable_size()
2013-06-04 19:00:03 -07:00
Nick Kralevich
f1b25d0788
am ae533cb1: am a24e81ef: Merge "Add tests for __strcpy_chk()"
...
* commit 'ae533cb1118be39a3a0587da46fa95bb4d8ee494':
Add tests for __strcpy_chk()
2013-06-04 12:14:19 -07:00
Nick Kralevich
ae533cb111
am a24e81ef: Merge "Add tests for __strcpy_chk()"
...
* commit 'a24e81efd30d106cdfa6a019acf7c77cd88b40cc':
Add tests for __strcpy_chk()
2013-06-04 12:07:16 -07:00
The Android Automerger
680e3f94a0
merge in master-release history after reset to master
2013-06-04 07:49:30 -07:00
Brian Carlstrom
20b0fec8ab
am 81bfade8: am 06713930: Merge "Small cleanup of soinfo_elf_lookup."
...
* commit '81bfade818f1b76cf822f0e7e0862fe61e7c580a':
Small cleanup of soinfo_elf_lookup.
2013-06-03 20:43:30 -07:00
Brian Carlstrom
81bfade818
am 06713930: Merge "Small cleanup of soinfo_elf_lookup."
...
* commit '0671393072a78e75a726c58aa3ca718e55eeac3e':
Small cleanup of soinfo_elf_lookup.
2013-06-03 20:21:04 -07:00
Rom Lemarchand
8ea08d3ff9
Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"
2013-06-03 19:40:21 +00:00
The Android Automerger
b472f50057
merge in master-release history after reset to master
2013-06-03 07:49:38 -07:00
Ben Cheng
7ca9057f53
am 72ce296f: am 404d491e: Merge "Use bl instead of blx to support interworking properly."
...
* commit '72ce296f282803cb026aff5ab180e8a43656612e':
Use bl instead of blx to support interworking properly.
2013-06-01 09:51:29 -07:00
Ben Cheng
72ce296f28
am 404d491e: Merge "Use bl instead of blx to support interworking properly."
...
* commit '404d491eb655839bf4260cc168bb79864473e129':
Use bl instead of blx to support interworking properly.
2013-06-01 08:19:07 -07:00
Ben Cheng
dc1782b156
Merge "Use bl instead of blx to support interworking properly."
2013-05-31 21:36:55 +00:00
Ben Cheng
9e1905794b
Use bl instead of blx to support interworking properly.
...
BUG: 9227177
Change-Id: I742c2f2ecbe332f9c9743e3f4bde8de791a1d289
2013-05-31 14:25:48 -07:00
Nick Kralevich
75c9e17682
am 027a8fae: am 8539961f: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
...
* commit '027a8fae7750855af2ec0f8dd655e4a48ebf9352':
FORTIFY_SOURCE: strcat / strncat optimize
2013-05-31 11:21:18 -07:00
Nick Kralevich
027a8fae77
am 8539961f: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
...
* commit '8539961ff299b05d8feac9be8b119698be22da03':
FORTIFY_SOURCE: strcat / strncat optimize
2013-05-31 11:14:56 -07:00
Rom Lemarchand
c702a90467
mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
...
Reinstate mmap calling madvise(MADV_MERGEABLE) removed in
635df850e5
Change-Id: I290bc5ac6bb32735a3f61dd21e2fce1dfb6dfd4b
Signed-off-by: Rom Lemarchand <romlem@google.com >
2013-05-31 10:05:50 -07:00
Nick Kralevich
b5aa654be6
am d9349abf: am 72f59c84: Merge "Add strncpy FORTIFY_SOURCE tests."
...
* commit 'd9349abf29506529790abf83cd239b77fa771038':
Add strncpy FORTIFY_SOURCE tests.
2013-05-30 17:02:01 -07:00
Nick Kralevich
9b7ae336ee
am 5630e54c: am d515f468: Merge "libc x86: Remove strcat.S"
...
* commit '5630e54c3b1a90ee741bbcff129d0c711160ba02':
libc x86: Remove strcat.S
2013-05-30 17:02:01 -07:00
Nick Kralevich
d9349abf29
am 72f59c84: Merge "Add strncpy FORTIFY_SOURCE tests."
...
* commit '72f59c84fd73a0a701ce6448d103e9021c1cb060':
Add strncpy FORTIFY_SOURCE tests.
2013-05-30 16:54:24 -07:00
Nick Kralevich
5630e54c3b
am d515f468: Merge "libc x86: Remove strcat.S"
...
* commit 'd515f46888cf381c1fbbc99a62be727174b30a23':
libc x86: Remove strcat.S
2013-05-30 16:54:18 -07:00
The Android Automerger
fe09748a5f
merge in master-release history after reset to master
2013-05-27 07:50:00 -07:00
Nick Kralevich
3010061a53
am cf342653: am 8d79fd1c: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
...
* commit 'cf342653388682c96b3c4eec6a5ed4dbcb6112ef':
libc x86: Remove index.S, strcpy.S, strchr.S
2013-05-24 13:02:11 -07:00
Nick Kralevich
af5d6029e5
am 080d2aa8: am 2317275f: Merge "libc: delete x86 memchr.S"
...
* commit '080d2aa8dc0ae318a12f7a424f9bca32b1216791':
libc: delete x86 memchr.S
2013-05-24 13:02:06 -07:00
Nick Kralevich
cf34265338
am 8d79fd1c: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
...
* commit '8d79fd1c94cb021b6852e6f44e27183ec83fe04c':
libc x86: Remove index.S, strcpy.S, strchr.S
2013-05-24 11:37:30 -07:00
Nick Kralevich
080d2aa8dc
am 2317275f: Merge "libc: delete x86 memchr.S"
...
* commit '2317275f859a685386889139855f2f3314337d53':
libc: delete x86 memchr.S
2013-05-24 10:43:58 -07:00
The Android Automerger
88cc328c17
merge in master-release history after reset to master
2013-05-22 07:49:33 -07:00
Brian Carlstrom
47b2e046cd
am 46bf467a: am f5f29de6: Merge "Fix bionic linker to support segments with zero p_filesz"
...
* commit '46bf467a151eafaf37f6e3578d8d9bad705b8e44':
Fix bionic linker to support segments with zero p_filesz
2013-05-21 17:28:40 -07:00
Brian Carlstrom
46bf467a15
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
2013-05-21 17:23:09 -07:00
The Android Automerger
33cf35317b
merge in master-release history after reset to master
2013-05-20 07:49:40 -07:00
Erik Gilling
d5234a3b08
am 4c8eba6f: am 2e317075: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '4c8eba6f2aaf351e29881ca4dc2ec47fc0246446':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:20:53 -07:00
Erik Gilling
4c8eba6f2a
am 2e317075: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '2e317075b044e94fc75e36d08bec8a7eb5fc31ae':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:19:07 -07:00
The Android Open Source Project
0ae3304f83
am 5b75f3bf: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5b75f3bfa1a8f380ce213a0088afec7a7901a25b':
2013-05-16 05:44:28 -07:00
The Android Open Source Project
5b75f3bfa1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc
2013-05-16 05:42:53 -07:00
The Android Automerger
231ea5a414
merge in master-release history after reset to master
2013-05-15 07:49:27 -07:00
Elliott Hughes
217c816480
am 0a7fe991: am 5217fb52: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
...
* commit '0a7fe991530308fbae9ca033c0045bfc27a7f4c1':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
2013-05-14 18:11:57 -07:00
Elliott Hughes
0a7fe99153
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.
2013-05-14 18:10:45 -07:00
Elliott Hughes
543f3f0ec4
am 975d4464: am 6f502bc7: Merge "Add more __restricts, clean up __format__ attributes."
...
* commit '975d4464cef774768cf99a68f3537cfc0678e3f7':
Add more __restricts, clean up __format__ attributes.
2013-05-14 16:59:34 -07:00
Elliott Hughes
975d4464ce
am 6f502bc7: Merge "Add more __restricts, clean up __format__ attributes."
...
* commit '6f502bc74374804766639e6b1515644875810bda':
Add more __restricts, clean up __format__ attributes.
2013-05-14 16:56:49 -07:00
Elliott Hughes
940e30cf34
am 20516923: am 349ef893: Merge "Pull upstream FreeBSD revision 249810."
...
* commit '20516923f59b859f8ca1bfdb3927bc23819ecdb3':
Pull upstream FreeBSD revision 249810.
2013-05-14 16:26:42 -07:00
Elliott Hughes
20516923f5
am 349ef893: Merge "Pull upstream FreeBSD revision 249810."
...
* commit '349ef893e82f37632a705f39efc47c0d440f63c7':
Pull upstream FreeBSD revision 249810.
2013-05-14 16:25:49 -07:00
Elliott Hughes
0128b2c752
am 01678789: am 5b7b2809: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
...
* commit '01678789bca18d1a4894ae7f987f847b5ae0ce62':
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
2013-05-14 15:01:33 -07:00
Elliott Hughes
7c7f098995
am 562804ff: am f0f4fa3f: Merge "libc: add timerfd calls"
...
* commit '562804ff878ede5d0ce0cb0c79ffb9b26777bf76':
libc: add timerfd calls
2013-05-14 15:01:32 -07:00
Elliott Hughes
d3d014da91
am 31366236: am e1c58ab5: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
...
* commit '3136623600a9488859ed7c1681b084ea8315ed50':
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
2013-05-14 15:01:32 -07:00
Elliott Hughes
47e46ed157
am 91cc8014: am 7cb82791: Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
...
* commit '91cc8014e8cbc5ebfa90708f77f4f319e553a904':
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
2013-05-14 15:01:31 -07:00
Elliott Hughes
01678789bc
am 5b7b2809: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
...
* commit '5b7b2809a2110dad1b2434f1070e13a08085d94b':
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
2013-05-14 14:59:16 -07:00
Elliott Hughes
562804ff87
am f0f4fa3f: Merge "libc: add timerfd calls"
...
* commit 'f0f4fa3fb1ea8623b1e1bc59f7967e0470c8e532':
libc: add timerfd calls
2013-05-14 14:59:16 -07:00
Elliott Hughes
3136623600
am e1c58ab5: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
...
* commit 'e1c58ab5bb6284b3e3a2d0e54c295a93780b3f70':
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
2013-05-14 14:59:15 -07:00
Elliott Hughes
91cc8014e8
am 7cb82791: Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
...
* commit '7cb82791cada0283648fedc316171cbffda79af7':
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
2013-05-14 14:59:15 -07:00
Elliott Hughes
ff5fb5cc4b
am 509fc806: am d8a9cccb: Merge "Fix all printf warnings in res_send.c."
...
* commit '509fc8069757aa6091e044f659f76da0bf59723c':
Fix all printf warnings in res_send.c.
2013-05-14 11:13:39 -07:00
Elliott Hughes
509fc80697
am d8a9cccb: Merge "Fix all printf warnings in res_send.c."
...
* commit 'd8a9cccb4d77eecc36425c9240a12bd305031ee3':
Fix all printf warnings in res_send.c.
2013-05-14 11:10:23 -07:00
The Android Automerger
46fa11a0ae
merge in master-release history after reset to master
2013-05-14 07:49:17 -07:00
Todd Poynor
d1ad4f6dab
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
...
Change-Id: I4a579fc4a74adaee57911b3974ec2f93d9321e8b
2013-05-13 12:06:36 -07:00
Todd Poynor
04c0ac14a4
libc: add timerfd calls
...
Change-Id: Id63b907266d5b87c7422a51d393a1430551ca33d
2013-05-13 12:06:15 -07:00
Todd Poynor
60e5144ca3
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
...
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, and CLOCK_MONOTONIC_COARSE
as supported by recent linux kernels.
Bug: 8895727
Change-Id: I3d415a2edbcf2928dd855e876337bf2239ac134a
2013-05-13 11:00:07 -07:00
Todd Poynor
b928bda83d
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
...
Change-Id: I3bf934ab207e39b435e6b41a5fbe7eb318496dc0
2013-05-13 11:00:06 -07:00
The Android Automerger
5ff2b9aafd
merge in master-release history after reset to master
2013-05-13 07:49:31 -07:00
The Android Automerger
d146e8e4e9
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-13 05:55:12 -07:00
Elliott Hughes
a28cb8bd35
am 30d7485d: am 738370d9: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
* commit '30d7485dd30a06e2fb7b8134b6e1a3ecb0ac7ba7':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-10 03:06:52 -07:00
Elliott Hughes
30d7485dd3
am 738370d9: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
* commit '738370d9387396922c10910edb61272e585be107':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 23:40:47 -07:00
Elliott Hughes
a74e6c21e7
am 58f3dbda: am 98f7659d: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
...
* commit '58f3dbdacd496838661affce358518e0b3a4f7f6':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 17:56:31 -07:00
Elliott Hughes
58f3dbdacd
am 98f7659d: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
...
* commit '98f7659d7e3a7d75c68a41299f6ee55d7d35c27b':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 17:53:38 -07:00
Elliott Hughes
738370d938
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug: 8825226
(cherry picked from commit 8147d3c284 )
Change-Id: Iad8e7e3743d1a5e6bd1d44ef40b1ab3499cb64f2
2013-05-09 15:53:30 -07:00
Ben Cheng
3c2ab6ffbb
am ca54ae44: am 262b7384: Adjust PC value in ARM stack trace.
...
* commit 'ca54ae44a4c8764028b3092f9f1cfdd619a94fa6':
Adjust PC value in ARM stack trace.
2013-05-09 09:41:18 -07:00
Ben Cheng
ca54ae44a4
am 262b7384: Adjust PC value in ARM stack trace.
...
* commit '262b7384e4e691d42070a57472ecc64cf668c480':
Adjust PC value in ARM stack trace.
2013-05-09 09:37:50 -07:00
The Android Automerger
0d4e9fe58a
merge in master-release history after reset to master
2013-05-09 07:49:16 -07:00
Ben Cheng
a078f9dcf0
am 49f6e970: am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."
...
* commit '49f6e9706202b5caef3a68690153a96baa14cab1':
Remove a spurious FIXME and unnecessary type cast.
2013-05-08 15:04:56 -07:00
Ben Cheng
77a2932836
am 3353e653: am b9256ada: Merge "Adjust PC value in ARM stack trace."
...
* commit '3353e6535a6964c92c280c36c99e1493befa9dc0':
Adjust PC value in ARM stack trace.
2013-05-08 15:04:56 -07:00
Nick Kralevich
f8867a5632
am 37cd8800: am d541ba17: Merge "Use restrict pointers for various libc functions."
...
* commit '37cd8800d532e5901cc3b332bc39d8580f2ba9ab':
Use restrict pointers for various libc functions.
2013-05-08 15:04:55 -07:00
Ben Cheng
49f6e97062
am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."
...
* commit 'ff220f70036178aa0d7dcf1cbc4825085a84441e':
Remove a spurious FIXME and unnecessary type cast.
2013-05-08 13:26:12 -07:00
Ben Cheng
3353e6535a
am b9256ada: Merge "Adjust PC value in ARM stack trace."
...
* commit 'b9256adab3aa7e7628d7bbd015132a511de7a43d':
Adjust PC value in ARM stack trace.
2013-05-08 13:26:11 -07:00
Nick Kralevich
37cd8800d5
am d541ba17: Merge "Use restrict pointers for various libc functions."
...
* commit 'd541ba17197fd3ef1f60462e51261c4340369218':
Use restrict pointers for various libc functions.
2013-05-08 13:26:11 -07:00
Ben Cheng
262b7384e4
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: Ie59351a0012c2267309f63f0462fdba4698846fe
2013-05-08 11:21:53 -07:00
The Android Automerger
237ac7be01
merge in master-release history after reset to master
2013-05-06 07:49:08 -07:00
Christopher Ferris
a14f7933f4
Merge "Tune the memcpy for krait."
2013-05-03 23:12:18 +00:00
The Android Automerger
e68c711e78
merge in master-release history after reset to master
2013-05-03 07:49:10 -07:00
Nick Kralevich
f0c9683e17
am c9757ac8: am b01f7afd: Merge "Use __predict_false on some fortify methods."
...
* commit 'c9757ac81eb48f9cfee0ba7833fed8a3363ecee2':
Use __predict_false on some fortify methods.
2013-05-02 15:00:41 -07:00
Nick Kralevich
c9757ac81e
am b01f7afd: Merge "Use __predict_false on some fortify methods."
...
* commit 'b01f7afd5fd5df5f8fe925b4fe493269191b62a2':
Use __predict_false on some fortify methods.
2013-05-02 14:56:37 -07:00
Nick Kralevich
137a9ad176
am 4f614a70: am e4ac8feb: Merge "libc: cleanup strchr"
...
* commit '4f614a7036b37480695884a4be3f3fe70188cd60':
libc: cleanup strchr
2013-05-02 14:28:18 -07:00
Nick Kralevich
4f614a7036
am e4ac8feb: Merge "libc: cleanup strchr"
...
* commit 'e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
libc: cleanup strchr
2013-05-02 14:25:42 -07:00
Christopher Ferris
4d8fe5177e
Tune the memcpy for krait.
...
Streamline the memcpy a bit removing some unnecessary instructions.
The biggest speed improvement comes from changing the size of
the preload. On krait, the sweet spot for the preload in the main
loop is twice the L1 cache line size.
In most cases, these small tweaks yield > 1000MB/s speed ups. As
the size of the memcpy approaches about 1MB, the speed improvement
disappears.
Change-Id: Ief79694d65324e2db41bee4707dae19b8c24be62
2013-05-02 14:04:31 -07:00
The Android Automerger
2a9966da82
merge in master-release history after reset to master
2013-05-02 07:49:13 -07:00
Nick Kralevich
240bc95be1
am 65fe3ea7: am 5e3b502b: Merge "keep test names consistent with other tests."
...
* commit '65fe3ea708bf16ebaa354080b90b6e6c83a24e70':
keep test names consistent with other tests.
2013-05-01 15:11:32 -07:00
Nick Kralevich
874ea191de
am b9aab3a4: am 8c00c91a: Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
...
* commit 'b9aab3a462efb79cdae83d9b819e299216f9cf5f':
add strrchr -D_FORTIFY_SOURCE=2 test.
2013-05-01 15:11:32 -07:00
Nick Kralevich
65fe3ea708
am 5e3b502b: Merge "keep test names consistent with other tests."
...
* commit '5e3b502b6b56634953ea152409363088974fa5e9':
keep test names consistent with other tests.
2013-05-01 15:10:07 -07:00
Nick Kralevich
b9aab3a462
am 8c00c91a: Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
...
* commit '8c00c91aa051f18e107466b5d8c9280a2e1fabc1':
add strrchr -D_FORTIFY_SOURCE=2 test.
2013-05-01 15:10:07 -07:00
The Android Automerger
33cd3f6848
merge in master-release history after reset to master
2013-05-01 07:49:28 -07:00
Nick Kralevich
6c6949fc00
am 8355ab55: am bee0ab16: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit '8355ab5524557da2737ea9084a8131c1015ae14f':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:30:20 -07:00
Nick Kralevich
8355ab5524
am bee0ab16: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit 'bee0ab16e47086d2f31f6f9ff41328066d5a7128':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:25:23 -07:00
Nick Kralevich
c9bf778112
am 2ff94a09: am c4687130: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit '2ff94a096427a5b5e729ae356c98463c9a9dabf1':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:57:22 -07:00
Nick Kralevich
2ff94a0964
am c4687130: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit 'c46871302e7bd099aaf54d91da93a2248acbf733':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:56:08 -07:00
The Android Automerger
3fa53b5978
merge in master-release history after reset to master
2013-04-30 10:23:01 -07:00
Nick Kralevich
d411fbd497
am aed0c3ac: am b94b2851: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
...
* commit 'aed0c3ac54fa944b1f8512938277e7dc6b6fa2ee':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
2013-04-30 08:54:30 -07:00
Nick Kralevich
90a293f7d3
am 56a1b492: am 382a7753: Merge "strncpy: implement _FORTIFY_SOURCE=2"
...
* commit '56a1b492c40b51204ad1b46a6b46819775c8912a':
strncpy: implement _FORTIFY_SOURCE=2
2013-04-30 08:54:28 -07:00
Nick Kralevich
780cf25bf4
am 89357dc7: am c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit '89357dc730f6bfd532c4aed80373c84904cc3319':
[NETFILTER]: Fix iptables ABI breakage
2013-04-30 08:46:47 -07:00
Nick Kralevich
aed0c3ac54
am b94b2851: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
...
* commit 'b94b2851d72187cc9095864a9c99429ee62d7786':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
2013-04-29 16:56:29 -07:00
Nick Kralevich
56a1b492c4
am 382a7753: Merge "strncpy: implement _FORTIFY_SOURCE=2"
...
* commit '382a7753786646483a8101f4e337f9e3a82ec852':
strncpy: implement _FORTIFY_SOURCE=2
2013-04-29 16:25:41 -07:00
Nick Kralevich
89357dc730
am c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit 'c6dc62f09c814b9688aee83e80dcfe80cb0ef604':
[NETFILTER]: Fix iptables ABI breakage
2013-04-29 12:51:35 -07:00
Andrew Hsieh
cfb0b8bd5e
am 83966db8: am f7153fd1: Merge "Remove redundant space within square brackets"
...
* commit '83966db80b9cccc3417db7566242d30a330cde29':
Remove redundant space within square brackets
2013-04-25 21:26:46 -07:00
Andrew Hsieh
83966db80b
am f7153fd1: Merge "Remove redundant space within square brackets"
...
* commit 'f7153fd13f469e9ba5aecbfa00fde42530ca2124':
Remove redundant space within square brackets
2013-04-25 21:22:26 -07:00
Elliott Hughes
b03dc7cfa3
am 9aa57e09: am 9ff1ffd8: Merge "Improve diagnostics in the face of bad tzdata."
...
* commit '9aa57e09ef7234b6d82ffa4a4889508e64e424b9':
Improve diagnostics in the face of bad tzdata.
2013-04-25 21:19:48 -07:00
Nick Kralevich
95a46909c7
am ed572aaa: am 5f28fde8: Merge "linker: only re-open std* for setuid programs."
...
* commit 'ed572aaa0d275eed753afd4b92e05991310e76ac':
linker: only re-open std* for setuid programs.
2013-04-25 21:19:48 -07:00
Elliott Hughes
9aa57e09ef
am 9ff1ffd8: Merge "Improve diagnostics in the face of bad tzdata."
...
* commit '9ff1ffd805b57160079f42d7eea051c63e0e2bca':
Improve diagnostics in the face of bad tzdata.
2013-04-25 17:01:42 -07:00
Nick Kralevich
ed572aaa0d
am 5f28fde8: Merge "linker: only re-open std* for setuid programs."
...
* commit '5f28fde8aeee047a70e344c9da937695dc51a3ba':
linker: only re-open std* for setuid programs.
2013-04-25 17:01:41 -07:00
The Android Automerger
59f27ec089
merge in master-release history after reset to master
2013-04-25 07:49:12 -07:00
The Android Automerger
46de17d26d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-25 05:55:12 -07:00
Elliott Hughes
baa836baa4
am eb22fc33: am 389b5c1e: Upgrade to tzdata2013c.
...
* commit 'eb22fc331ed1bff5ee146c252fb4b9fa7f198523':
Upgrade to tzdata2013c.
2013-04-24 14:28:10 -07:00
Elliott Hughes
eb22fc331e
am 389b5c1e: Upgrade to tzdata2013c.
...
* commit '389b5c1ee52cbf0de4dcdfe266832d251f55db62':
Upgrade to tzdata2013c.
2013-04-24 14:25:33 -07:00
Elliott Hughes
537e1aa9c6
am b6e895e8: am 87efcd2e: Merge "Don\'t avoid IPv6 when looking for new tzdata."
...
* commit 'b6e895e80f96301b3921a2ec7327c337ab988b41':
Don't avoid IPv6 when looking for new tzdata.
2013-04-24 11:01:28 -07:00
Elliott Hughes
b6e895e80f
am 87efcd2e: Merge "Don\'t avoid IPv6 when looking for new tzdata."
...
* commit '87efcd2e63c9f218f476ef88f21e660f9bce633f':
Don't avoid IPv6 when looking for new tzdata.
2013-04-24 10:58:37 -07:00
Elliott Hughes
389b5c1ee5
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.)
(cherry picked from commit 2379088a90 )
Change-Id: I77d0ceebdba3489da0069f5792e930adc5810d34
2013-04-23 18:22:31 -07:00
The Android Automerger
70ef50862c
merge in master-release history after reset to master
2013-04-23 07:49:08 -07:00
Elliott Hughes
14cbb15b99
am 41dcafc2: am c705daa0: Merge "Disable IPv6 when looking for tzdata updates."
...
* commit '41dcafc27627dbc79e492056799b3cde4056d412':
Disable IPv6 when looking for tzdata updates.
2013-04-22 16:57:46 -07:00
Elliott Hughes
41dcafc276
am c705daa0: Merge "Disable IPv6 when looking for tzdata updates."
...
* commit 'c705daa0a2684d31b8ddc9230e7aa5573880adef':
Disable IPv6 when looking for tzdata updates.
2013-04-22 16:55:59 -07:00
Elliott Hughes
dd15d3cb28
am dc7e8b89: am 2c60c18c: Merge "Upgrade to tzdata2013c."
...
* commit 'dc7e8b892db0e997c12a6574ee2468cb3f8a6a2c':
Upgrade to tzdata2013c.
2013-04-22 12:29:42 -07:00
Elliott Hughes
dc7e8b892d
am 2c60c18c: Merge "Upgrade to tzdata2013c."
...
* commit '2c60c18c505491631a07380f80438fafa80d39f0':
Upgrade to tzdata2013c.
2013-04-22 12:27:17 -07:00
Elliott Hughes
6180ab7850
am 4f89ab31: am bda2fb5e: Merge "Add signature checking to HTTP tzdata updates."
...
* commit '4f89ab3166586378d448ca8d5eb4688ab33bb28b':
Add signature checking to HTTP tzdata updates.
2013-04-22 12:14:04 -07:00
Elliott Hughes
4f89ab3166
am bda2fb5e: Merge "Add signature checking to HTTP tzdata updates."
...
* commit 'bda2fb5efab914e8442ec9c38961b7182ac5978c':
Add signature checking to HTTP tzdata updates.
2013-04-22 12:11:48 -07:00
Elliott Hughes
652c68c50e
am 9f10e6a9: am 70e0bd3a: Merge "Rename the tzdata update tool, and add HTTP support."
...
* commit '9f10e6a96afbe85239d18c1cffb560c4f6ae9b4d':
Rename the tzdata update tool, and add HTTP support.
2013-04-22 11:36:51 -07:00
Elliott Hughes
9f10e6a96a
am 70e0bd3a: Merge "Rename the tzdata update tool, and add HTTP support."
...
* commit '70e0bd3a448fc345d75d16caf40babf36463f0ec':
Rename the tzdata update tool, and add HTTP support.
2013-04-22 11:34:48 -07:00
The Android Automerger
c689ed1ef7
merge in master-release history after reset to master
2013-04-16 07:49:11 -07:00
Elliott Hughes
9a41d425ea
am d23a87d3: am 8c181aa8: Merge "Use hidden visibility for internal-use-only functions"
...
* commit 'd23a87d3b1c7269a4b55f082555790a3003ba228':
Use hidden visibility for internal-use-only functions
2013-04-15 11:26:47 -07:00
Elliott Hughes
d23a87d3b1
am 8c181aa8: Merge "Use hidden visibility for internal-use-only functions"
...
* commit '8c181aa8fe421c62a8e30f4c10e322aca968c27c':
Use hidden visibility for internal-use-only functions
2013-04-15 11:24:14 -07:00
The Android Automerger
94dcdb0352
merge in master-release history after reset to master
2013-04-15 07:49:20 -07:00
Christopher Ferris
5274339979
am 39e4ed96: am 516a8970: Merge "Rewrite memset for cortexa15 to use strd."
...
* commit '39e4ed969948fd738d7b670b099c0b2c25351d95':
Rewrite memset for cortexa15 to use strd.
2013-04-12 12:33:57 -07:00
Elliott Hughes
35a2a61d49
am cf4a5302: am b3c8c4d8: Merge "Switch to current FreeBSD qsort."
...
* commit 'cf4a53020d85b0017799c31dc41823f9e775a1c5':
Switch to current FreeBSD qsort.
2013-04-12 12:33:56 -07:00
Christopher Ferris
39e4ed9699
am 516a8970: Merge "Rewrite memset for cortexa15 to use strd."
...
* commit '516a89705378f43646678e75924529404e52b613':
Rewrite memset for cortexa15 to use strd.
2013-04-12 12:30:22 -07:00
Elliott Hughes
cf4a53020d
am b3c8c4d8: Merge "Switch to current FreeBSD qsort."
...
* commit 'b3c8c4d8654894cdc72d32bde84a520ccda4d8f3':
Switch to current FreeBSD qsort.
2013-04-12 12:30:22 -07:00
The Android Automerger
5703eb8007
merge in master-release history after reset to master
2013-04-12 07:49:26 -07:00
Elliott Hughes
a1826f6e59
am 5fe62e50: am ed36d95f: Merge "Start moving to current FreeBSD stdio."
...
* commit '5fe62e50f61b353657e1cd9cc6b1b1fc02870c9b':
Start moving to current FreeBSD stdio.
2013-04-11 14:58:37 -07:00
Elliott Hughes
5fe62e50f6
am ed36d95f: Merge "Start moving to current FreeBSD stdio."
...
* commit 'ed36d95fac5881f78a601e2932f51edfd27c6ba6':
Start moving to current FreeBSD stdio.
2013-04-11 14:24:37 -07:00
The Android Automerger
651b3e1f9e
merge in master-release history after reset to master
2013-04-11 09:22:10 -07:00
The Android Open Source Project
6c48aca345
am ab911a02: Reconcile with jb-mr2-release - do not merge
...
* commit 'ab911a02af2a5c3977b55cb0994f74635edc7c3a':
2013-04-11 07:47:08 -07:00
The Android Open Source Project
ab911a02af
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I15e9944781325d7a44f0d40ab078aec7723ce9ac
2013-04-11 07:44:55 -07:00
The Android Automerger
637d50e6c0
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:13 -07:00
Elliott Hughes
980d21745c
am 76db50dd: am b632857a: Merge "Add missing include and function prototype for sched_getaffinity."
...
* commit '76db50ddc948541d39bfc351666ba910bd8e6bab':
Add missing include and function prototype for sched_getaffinity.
2013-04-10 18:22:50 -07:00
Christopher Ferris
b9cfe21c6e
am 101dadf6: am fc76c7d3: Merge "Add missing branch in memcpy.S dst aligned case."
...
* commit '101dadf6a6a689b53f6db809578627448a14bff8':
Add missing branch in memcpy.S dst aligned case.
2013-04-10 18:22:48 -07:00
Elliott Hughes
76db50ddc9
am b632857a: Merge "Add missing include and function prototype for sched_getaffinity."
...
* commit 'b632857a50a1fd2b759316d07ace6c36f6f418cf':
Add missing include and function prototype for sched_getaffinity.
2013-04-10 17:56:22 -07:00
Christopher Ferris
dbc23ea51c
resolved conflicts for merge of 3fe5b109 to master
...
Change-Id: Ifeecc0f8b0935ee1df057e944fc135d5047e248d
2013-04-10 17:54:53 -07:00
Christopher Ferris
101dadf6a6
am fc76c7d3: Merge "Add missing branch in memcpy.S dst aligned case."
...
* commit 'fc76c7d394ebe0e585777955efadf7cc8ed86636':
Add missing branch in memcpy.S dst aligned case.
2013-04-10 17:37:49 -07:00
Christopher Ferris
3fe5b10948
am 68fd78ef: Merge "Update to latest cortexa15 memcpy code."
...
* commit '68fd78efa05fc61adfbdeadeb757caa45663570c':
Update to latest cortexa15 memcpy code.
2013-04-10 17:37:49 -07:00
Eric Laurent
61735a9069
am 55c015cd: am ccaa0fa6: sound: Add ALSA compressed API headers
...
* commit '55c015cddd4d8d14e58e7134ae077d637ff5388e':
sound: Add ALSA compressed API headers
2013-04-10 11:34:31 -07:00
Eric Laurent
55c015cddd
am ccaa0fa6: sound: Add ALSA compressed API headers
...
* commit 'ccaa0fa6e90421831fa589e60f4e7ef6df39bd04':
sound: Add ALSA compressed API headers
2013-04-10 11:31:08 -07:00
The Android Automerger
7b1d164a4e
merge in master-release history after reset to master
2013-04-10 07:49:16 -07:00
Christopher Ferris
e27483c788
Merge "Rewrite memset for cortexa15 to use strd."
2013-04-09 22:58:26 +00:00
Eric Laurent
ccaa0fa6e9
sound: Add ALSA compressed API headers
...
Added the following headers for ALSA compressed
user space API:
- sound/compress_offload.h
- sound/compress_params.h
Change-Id: I9584c12acdadf31546d2921393b93d491e54a8d3
2013-04-09 09:37:44 -07:00
Christopher Ferris
7ffad9c120
Rewrite memset for cortexa15 to use strd.
...
Change-Id: Iac3af55f7813bd2b40a41bd19403f2b4dca5224b
2013-04-08 18:48:46 -07:00
The Android Open Source Project
bc37bf00f8
am bb9842b6: Reconcile with jb-mr2-release - do not merge
...
* commit 'bb9842b61e188ed70cf9bfb0415f2ba8fb406937':
2013-04-08 13:40:28 -07:00
The Android Open Source Project
bb9842b61e
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I562a47cb4eb8222c26aff7652826752825b9a091
2013-04-08 13:35:31 -07:00
The Android Automerger
cad988dafb
merge in master-release history after reset to master
2013-04-08 07:49:30 -07:00
The Android Automerger
d4cc0b8a61
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:55:25 -07:00
Elliott Hughes
8bed98c3ce
am fe7f46c0: am 7b4d77e4: Make abort messages available to debuggerd.
...
* commit 'fe7f46c088f303ea2cb9f6b218cc0f46f5385d43':
Make abort messages available to debuggerd.
2013-04-05 16:07:15 -07:00
Elliott Hughes
fe7f46c088
am 7b4d77e4: Make abort messages available to debuggerd.
...
* commit '7b4d77e400d321ccc7cdadd1cd225ebb1a69d358':
Make abort messages available to debuggerd.
2013-04-05 16:04:13 -07:00
Elliott Hughes
7b4d77e400
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
(cherry picked from commit 0d787c1fa1 )
Change-Id: I5daeeaa36c1fc23f7f437d73a19808d9d558dd4d
2013-04-05 15:57:53 -07:00
Elliott Hughes
f89ce5b518
am 9c7b510a: am 240fb862: Merge "Make abort messages available to debuggerd."
...
* commit '9c7b510a408740b5b53f8d14b8f43bf2f2d36ae6':
Make abort messages available to debuggerd.
2013-04-05 11:47:00 -07:00
Elliott Hughes
9c7b510a40
am 240fb862: Merge "Make abort messages available to debuggerd."
...
* commit '240fb8623b1fe027d0d33a9d4c41d99ceb385b58':
Make abort messages available to debuggerd.
2013-04-05 11:43:37 -07:00
The Android Automerger
291f5c1e4b
merge in master-release history after reset to master
2013-04-04 07:49:14 -07:00
The Android Automerger
ddbe8a23a8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:55:10 -07:00
The Android Open Source Project
9207e5aed8
am cd6f4804: Reconcile with jb-mr2-release - do not merge
...
* commit 'cd6f4804d22a119c1aaf915d70a53924b1666777':
2013-04-03 18:05:26 -07:00
The Android Open Source Project
cd6f4804d2
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I716c266ad98beb8523f0e4a4a04bbc326388fe93
2013-04-03 16:43:02 -07:00
Elliott Hughes
fbfedc7a7c
am 13ab5591: am 014c75c7: Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a"
...
* commit '13ab55918a0a114ce1d5c67eeca9c94ce08803ee':
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
2013-04-03 12:40:33 -07:00
Elliott Hughes
acec23561e
am f5dc9086: am 14c840df: Merge "Fix the SYSCALLS.TXT documentation and remove a dead script."
...
* commit 'f5dc908695ad4e513504e1a29613d797b95adbf0':
Fix the SYSCALLS.TXT documentation and remove a dead script.
2013-04-03 12:40:33 -07:00
Kito Cheng
98ac1d64bd
am 4bc54686: am 9b84824d: Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
...
* commit '4bc546860ec36f7ed86ee1a6a7e2bf6db028f02a':
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
2013-04-03 12:40:32 -07:00
Elliott Hughes
f3810dbb0a
am 57148994: am a69103ff: Fix the SYSCALLS.TXT documentation and remove a dead script.
...
* commit '57148994df6c3ca0d3c60abe2e1e891e7e12b39c':
Fix the SYSCALLS.TXT documentation and remove a dead script.
2013-04-03 12:40:31 -07:00
Elliott Hughes
13ab55918a
am 014c75c7: Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a"
...
* commit '014c75c78bdcad8acde8d0abb2450aa1f78e1a1f':
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
2013-04-03 12:37:52 -07:00
Elliott Hughes
f5dc908695
am 14c840df: Merge "Fix the SYSCALLS.TXT documentation and remove a dead script."
...
* commit '14c840df90bb4fc9935f7e24350e3269b6bd7f17':
Fix the SYSCALLS.TXT documentation and remove a dead script.
2013-04-03 12:37:51 -07:00
Kito Cheng
4bc546860e
am 9b84824d: Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
...
* commit '9b84824dfd597d8137137fa33295faa26cc70ae0':
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a
2013-04-03 12:35:49 -07:00
Elliott Hughes
57148994df
am a69103ff: Fix the SYSCALLS.TXT documentation and remove a dead script.
...
* commit 'a69103ffe4b3d55f5bab7e7bfba36ccecddfa4da':
Fix the SYSCALLS.TXT documentation and remove a dead script.
2013-04-03 12:35:49 -07:00
Kito Cheng
9b84824dfd
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.
(cherry-pick of 8baa929d5d3bcf63381cf78ba76168c80c303f5e.)
Change-Id: Icd0eb0f4ce0511fb9ec00a504d491afd47d744d3
2013-04-03 11:14:20 -07:00
Elliott Hughes
a69103ffe4
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.
(cherry-pick of a51916b58b2d211bcf8ffdbe9cf7faa58e57382f.)
Change-Id: I4484acd946b1f548ac3d95327e58add9f98246ab
2013-04-03 11:13:31 -07:00
The Android Automerger
c099884c7c
merge in master-release history after reset to master
2013-04-03 07:49:14 -07:00
The Android Automerger
90e19c328f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:02:06 -07:00
Elliott Hughes
168486f073
am fe51d25e: am 162b4411: Merge "Stop using unreasonable numbers of map entries."
...
* commit 'fe51d25e83a8487386c653493e587aa1686503aa':
Stop using unreasonable numbers of map entries.
2013-04-02 19:25:21 -07:00
Elliott Hughes
a0340cf139
am 40147728: am 1fe11375: Stop using unreasonable numbers of map entries.
...
* commit '40147728d24a5a85b0ae0ee366b0a3cadb1ea65a':
Stop using unreasonable numbers of map entries.
2013-04-02 19:25:19 -07:00
Elliott Hughes
fe51d25e83
am 162b4411: Merge "Stop using unreasonable numbers of map entries."
...
* commit '162b4411fc79fe906020ebdf9e85883237fac8c3':
Stop using unreasonable numbers of map entries.
2013-04-02 18:05:25 -07:00
Elliott Hughes
40147728d2
am 1fe11375: Stop using unreasonable numbers of map entries.
...
* commit '1fe1137576a1b7faf2d9bede121cc6faeceb50ff':
Stop using unreasonable numbers of map entries.
2013-04-02 17:52:20 -07:00
Elliott Hughes
1fe1137576
Stop using unreasonable numbers of map entries.
...
(cherry-pick of 4ace92c62ada583b220836d76de2cfcb78d4d48d.)
Bug: 8460659
Change-Id: I1a9dc30cbf6a7a2c68cb3d8000921e9178eedb85
2013-04-02 17:48:35 -07:00
Kenny Root
4ea3580749
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/bionic
2013-04-02 11:06:24 -07:00
Christopher Ferris
5014f417ea
Merge "Add missing branch in memcpy.S dst aligned case."
2013-04-02 18:05:54 +00:00
The Android Open Source Project
6517d138fd
am cc91c517: Reconcile with jb-mr2-release - do not merge
...
* commit 'cc91c517bf00431f098b7ca371113dc108071a45':
2013-04-02 11:04:15 -07:00
Lorenzo Colitti
5a3cc2018c
am 9ef66e84: am 309e107f: Merge "Update getaddrinfo to RFC6724" into jb-mr2-dev
...
* commit '9ef66e842f28f58abfbc8458973a2511a055db0c':
Update getaddrinfo to RFC6724
2013-04-02 11:04:09 -07:00
Christopher Ferris
6ffaa931c3
Add missing branch in memcpy.S dst aligned case.
...
Change-Id: I0651e46dc5d9b49a997c0c6d099b75097eedb504
2013-04-02 09:19:00 -07:00
The Android Automerger
ea01edd2d4
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:18:11 -07:00
The Android Automerger
02dc65183b
merge in master-release history after reset to master
2013-04-02 09:17:13 -07:00
The Android Open Source Project
cc91c517bf
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id1d2ab018ca9bc14b36395ae84eb73a120b2befc
2013-04-02 08:39:18 -07:00
Lorenzo Colitti
9ef66e842f
am 309e107f: Merge "Update getaddrinfo to RFC6724" into jb-mr2-dev
...
* commit '309e107f01e13bbe90ba31f2eee5d526ff676222':
Update getaddrinfo to RFC6724
2013-04-02 08:24:30 -07:00
Christopher Ferris
50bc9395e4
Merge "Update to latest cortexa15 memcpy code."
2013-04-02 02:04:47 +00:00
Elliott Hughes
7506673f63
am 8dd195c5: am 7a29f404: Merge "Update getaddrinfo to RFC6724"
...
* commit '8dd195c509eed45d1e4b5ab91ddc2ef56fcb0737':
Update getaddrinfo to RFC6724
2013-04-01 18:21:58 -07:00
Elliott Hughes
8dd195c509
am 7a29f404: Merge "Update getaddrinfo to RFC6724"
...
* commit '7a29f404e11d3346e79154b8e8d72a3215febced':
Update getaddrinfo to RFC6724
2013-04-01 18:20:10 -07:00
Lorenzo Colitti
309e107f01
Merge "Update getaddrinfo to RFC6724" into jb-mr2-dev
2013-04-02 00:49:29 +00:00
The Android Automerger
1ec2cf5ba8
merge in master-release history after reset to master
2013-04-01 11:31:26 -07:00
The Android Automerger
a66f6570c1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-01 05:55:14 -07:00
Lorenzo Colitti
e919b116d3
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.
Bug: 8276725
Change-Id: I03c63abfcad9b2f3a3bab2718bd2fc6440531843
2013-04-01 19:15:43 +09:00
Christopher Ferris
21ede92d79
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
Change-Id: I700b2fab81941959d301ab1934c18fbd8ee3eee4
2013-03-30 14:32:49 -07:00
Elliott Hughes
c099b270c6
am e2bce303: am 96449b3d: Extra logging in pthread_create.
...
* commit 'e2bce30360a46fa3a235d1e9874d35891673826f':
Extra logging in pthread_create.
2013-03-29 17:58:38 -07:00
Nick Kralevich
62bb090f8e
resolved conflicts for merge of 5b661481 to master
...
Change-Id: Ifc68a87a95187b61f7f42a0217af43e14db6d4f8
2013-03-29 17:36:52 -07:00
Elliott Hughes
e2bce30360
am 96449b3d: Extra logging in pthread_create.
...
* commit '96449b3dc16d64ea91df83c9d7942f3e22e76b52':
Extra logging in pthread_create.
2013-03-29 17:00:51 -07:00
Elliott Hughes
96449b3dc1
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
(cherry picked from commit cfa089df23 )
Change-Id: Ibfc98a84c1817a931f9ae4c2b88762f0edfb6b79
2013-03-29 16:58:33 -07:00
Elliott Hughes
113054c4eb
am e59ecd32: am 6bb17dfa: Merge "Extra logging in pthread_create."
...
* commit 'e59ecd32798b08e59b4813b3ed8859e5dac5297c':
Extra logging in pthread_create.
2013-03-29 16:58:02 -07:00
Nick Kralevich
5b661481a8
am b24b6e14: Merge "resolv_cache: hide some libc private functions" into jb-mr2-dev
...
* commit 'b24b6e1419382146f85571cdda27d48fb348141d':
resolv_cache: hide some libc private functions
2013-03-29 16:55:20 -07:00
Nick Kralevich
b24b6e1419
Merge "resolv_cache: hide some libc private functions" into jb-mr2-dev
2013-03-29 23:53:40 +00:00
Elliott Hughes
e59ecd3279
am 6bb17dfa: Merge "Extra logging in pthread_create."
...
* commit '6bb17dfad36edda68da46c2bf68c4297a160ab8a':
Extra logging in pthread_create.
2013-03-29 16:53:02 -07:00
Nick Kralevich
c01274c4aa
resolv_cache: hide some libc private functions
...
Don't export unnecessary symbols to third party apps.
Bug: 8401049
Change-Id: Ide5abd6ed13e756a85bd1277d93da74d1419addb
2013-03-29 13:56:05 -07:00
The Android Open Source Project
2903a0bac3
am f9e4a6e9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'f9e4a6e93b2d0ca6f2fd01547a04b63a94257a29':
2013-03-29 09:50:35 -07:00
The Android Open Source Project
f9e4a6e93b
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie2c8eed6e2ee90bc1d1a59184a503f9dd0dcdc80
2013-03-29 09:48:32 -07:00
The Android Automerger
0f7607f372
merge in master-release history after reset to master
2013-03-28 11:32:29 -07:00
Jean-Baptiste Queru
a3ce0bb1ad
am a3de6b47: am d02dd19d: am 267290b3: am 74b324ac: Merge "Update processed linux/fs.h header file"
...
* commit 'a3de6b47bf444c6efbf386e01e70bc61f9c559de':
Update processed linux/fs.h header file
2013-03-28 09:02:06 -07:00
Jean-Baptiste Queru
a3de6b47bf
am d02dd19d: am 267290b3: am 74b324ac: Merge "Update processed linux/fs.h header file"
...
* commit 'd02dd19d51fd78c4cfea8be4eaba3df1668910c4':
Update processed linux/fs.h header file
2013-03-28 09:01:01 -07:00
Jean-Baptiste Queru
d02dd19d51
am 267290b3: am 74b324ac: Merge "Update processed linux/fs.h header file"
...
* commit '267290b340bee74e5ebbbc60f8c5a9b2a5453957':
Update processed linux/fs.h header file
2013-03-28 08:59:25 -07:00
Jean-Baptiste Queru
267290b340
am 74b324ac: Merge "Update processed linux/fs.h header file"
...
* commit '74b324ac09db35d29d16695e9b9c1f0601599812':
Update processed linux/fs.h header file
2013-03-28 08:57:23 -07:00
The Android Automerger
8398f82ddd
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:55:13 -07:00
Ken Sumrall
6ed55e06fd
am 024f418a: am 887049e4: Merge "Update processed linux/fs.h header file" into jb-mr2-dev
...
* commit '024f418af284d79e2d307489f33d67b6c564a112':
Update processed linux/fs.h header file
2013-03-27 14:18:37 -07:00
Ken Sumrall
024f418af2
am 887049e4: Merge "Update processed linux/fs.h header file" into jb-mr2-dev
...
* commit '887049e46bdd5c14cc00837f959a0195780118a9':
Update processed linux/fs.h header file
2013-03-27 14:16:47 -07:00
Ken Sumrall
887049e46b
Merge "Update processed linux/fs.h header file" into jb-mr2-dev
2013-03-27 21:15:29 +00:00
The Android Open Source Project
416d231f97
am fd59d4d3: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528':
2013-03-26 12:17:40 -07:00
The Android Open Source Project
fd59d4d3ea
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icad78517674982f0ed6f87a7cc72a4d5b74a519f
2013-03-26 10:49:00 -07:00
The Android Automerger
47a46646f0
merge in master-release history after reset to master
2013-03-26 07:49:18 -07:00
The Android Automerger
6147c2941e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:55:11 -07:00
Elliott Hughes
d74b3bb1cb
am c813182d: am da2c1586: am 8a6abe38: am bd014c2e: Merge "Remove some dead script code and fix a script comment."
...
* commit 'c813182d20fa853d944cb9b4dc5c3f1a4d1c7728':
Remove some dead script code and fix a script comment.
2013-03-25 21:40:33 +00:00
Elliott Hughes
c813182d20
am da2c1586: am 8a6abe38: am bd014c2e: Merge "Remove some dead script code and fix a script comment."
...
* commit 'da2c158645e10671de990bb71b307d90035320a4':
Remove some dead script code and fix a script comment.
2013-03-25 21:38:40 +00:00
Elliott Hughes
da2c158645
am 8a6abe38: am bd014c2e: Merge "Remove some dead script code and fix a script comment."
...
* commit '8a6abe380d2ba513bb714e54a74f4289089cbc18':
Remove some dead script code and fix a script comment.
2013-03-25 14:36:24 -07:00
Elliott Hughes
8a6abe380d
am bd014c2e: Merge "Remove some dead script code and fix a script comment."
...
* commit 'bd014c2e4246d6e64a6523c73b9a72f379255526':
Remove some dead script code and fix a script comment.
2013-03-25 14:34:06 -07:00
Elliott Hughes
69684aa312
am 94510371: am 999dff0e: am a850ad4c: am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit '94510371951bc28f97cdb55df74be26fcebdc1e4':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 21:12:59 +00:00
Elliott Hughes
9451037195
am 999dff0e: am a850ad4c: am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit '999dff0ef3d92c1e84d12d3b8d8324c5ef441b85':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 21:10:49 +00:00
Elliott Hughes
999dff0ef3
am a850ad4c: am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit 'a850ad4cf44e998e24f43df723b6928e42f8294d':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 14:05:54 -07:00
Elliott Hughes
a850ad4cf4
am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."
...
* commit 'e51d75a9acef86008f4d64cf482bbc65e24dc66c':
Clarify the dlmalloc USAGE_ERROR.
2013-03-25 14:03:38 -07:00
Dima Zavin
e24ec2ad4c
am bb06498d: am 369f9234: Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
...
* commit 'bb06498d89dd002a17bad6666276580c94da1749':
libc/arm: add cortex-a7 cpu variant
2013-03-25 19:44:54 +00:00
Dima Zavin
bb06498d89
am 369f9234: Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
...
* commit '369f92349fc784f6c14ad30f5806f708a8f2c7f7':
libc/arm: add cortex-a7 cpu variant
2013-03-25 19:43:41 +00:00
Dima Zavin
369f92349f
Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev
2013-03-25 19:42:28 +00:00
Elliott Hughes
7a7d39c3f0
am c538edc1: am c82b339a: am 3c1504d9: am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit 'c538edc1e85b7df35852cf9fbc472b29683fc4a3':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 17:31:28 +00:00
Elliott Hughes
263be8b1a0
am 053ceea1: am 9386a33e: am 93f3811b: am a4075118: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '053ceea1172a399b9fddf0ab010cff535c65be0e':
Unhide __set_errno for backwards compatibility.
2013-03-25 17:31:27 +00:00
Elliott Hughes
c538edc1e8
am c82b339a: am 3c1504d9: am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit 'c82b339a7da4dc36e644f5037c3868155fe454e4':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 17:29:11 +00:00
Elliott Hughes
053ceea117
am 9386a33e: am 93f3811b: am a4075118: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '9386a33ea005fc008ff7ce0558d24e5ac68a6430':
Unhide __set_errno for backwards compatibility.
2013-03-25 17:29:10 +00:00
Elliott Hughes
c82b339a7d
am 3c1504d9: am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit '3c1504d9d7d529b8281a447dc69af3ecf6b5ec83':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 10:24:42 -07:00
Elliott Hughes
9386a33ea0
am 93f3811b: am a4075118: Merge "Unhide __set_errno for backwards compatibility."
...
* commit '93f3811b744b2100d0f259916876965c242cd3d9':
Unhide __set_errno for backwards compatibility.
2013-03-25 10:24:42 -07:00
Elliott Hughes
3c1504d9d7
am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."
...
* commit '48f25cef45f8f68567d528a5d833ed45cb760bec':
Stop generating <sys/linux-syscalls.h>.
2013-03-25 10:22:43 -07:00
Elliott Hughes
93f3811b74
am a4075118: Merge "Unhide __set_errno for backwards compatibility."
...
* commit 'a40751185f3a7245f73afb45382c23f71dbbcfc3':
Unhide __set_errno for backwards compatibility.
2013-03-25 10:22:43 -07:00
The Android Automerger
a500fdb18e
merge in master-release history after reset to master
2013-03-25 07:49:24 -07:00
The Android Automerger
af66ca6b19
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:55:24 -07:00
Dima Zavin
0c973d7049
libc/arm: add cortex-a7 cpu variant
...
Change-Id: I541d665805ea69ca96bb6a5f4d50e56287f8c08c
Signed-off-by: Dima Zavin <dima@android.com >
2013-03-23 01:38:22 -07:00
Elliott Hughes
4584721b5a
am 9792b2d1: am ba61bb55: am a3fe475c: am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit '9792b2d16062c3fa334a47501a1cde9bfbedb5c2':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 22:13:44 +00:00
Elliott Hughes
9792b2d160
am ba61bb55: am a3fe475c: am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'ba61bb55c4f3d468dd93bedc3deb24a0ef28a948':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 22:12:16 +00:00
Elliott Hughes
ba61bb55c4
am a3fe475c: am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'a3fe475c9ff444f45eb3c4dd7fd462326dfdb13d':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 15:09:13 -07:00
Elliott Hughes
a3fe475c9f
am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'c019345a3a0f3ee8561e595917b75d6419ee4cc8':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 15:07:06 -07:00
Elliott Hughes
cf3fc45376
am dce1b3e2: am e0e5b2f6: am 65163750: am c37dd599: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'dce1b3e26a9f85fcc9a768cc69919299fcb2b5a5':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 18:26:45 +00:00
Elliott Hughes
dce1b3e26a
am e0e5b2f6: am 65163750: am c37dd599: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'e0e5b2f6e731c639107e29abec17db2e6eb498e8':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 18:24:53 +00:00
Elliott Hughes
e0e5b2f6e7
am 65163750: am c37dd599: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit '65163750b11c814d6a75940ab1ede1e907b14d81':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 11:20:22 -07:00
Elliott Hughes
65163750b1
am c37dd599: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'c37dd599561ac07a895bc435d818f000054a498d':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 11:18:26 -07:00
Elliott Hughes
749a9e022c
am fbb41988: am b826ebf4: am 85598626: am 34895c1b: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'fbb4198857374b816a6c444a52cb3209101e02c9':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 18:17:51 +00:00
Elliott Hughes
fbb4198857
am b826ebf4: am 85598626: am 34895c1b: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b826ebf41e701d0d73be2897cecd560606193bd2':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 18:15:47 +00:00
Elliott Hughes
b826ebf41e
am 85598626: am 34895c1b: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '85598626f4ca7914d996371ce0471ab154aa7585':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 11:11:34 -07:00
Elliott Hughes
85598626f4
am 34895c1b: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '34895c1bdfa5df48ee9a7b4368b6def403f24cf1':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 10:59:57 -07:00
Elliott Hughes
74c7d3ff03
am f30ff61e: am b44f9600: am b80a05fa: am 5c5f303e: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'f30ff61ef61f3d8b73257e89e4635fc1436f4bbc':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:47:49 +00:00
Elliott Hughes
90763e0aee
am f0fc7b9b: am a0dcecc5: am bc0d7f73: am e7cb795c: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'f0fc7b9bf93029e2e0e2a21ac037d14c7f4db7a2':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:47:48 +00:00
Elliott Hughes
f30ff61ef6
am b44f9600: am b80a05fa: am 5c5f303e: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b44f9600a38988749d9f893fc5d2e3b3a07e6938':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:45:18 +00:00
Elliott Hughes
f0fc7b9bf9
am a0dcecc5: am bc0d7f73: am e7cb795c: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'a0dcecc53e2f45939fdcb0f1ec1d592d91cf41c7':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:45:18 +00:00
Elliott Hughes
b44f9600a3
am b80a05fa: am 5c5f303e: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b80a05fa678b287f46dc596353d285a9a7d09fbc':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:43:28 -07:00
Elliott Hughes
a0dcecc53e
am bc0d7f73: am e7cb795c: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'bc0d7f736c2c66868844f2b5c9e6507d3e7a7982':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:43:28 -07:00
Elliott Hughes
b80a05fa67
am 5c5f303e: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '5c5f303e4c661a71ae8e4c7fd99fc7674360321e':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:41:46 -07:00
Elliott Hughes
bc0d7f736c
am e7cb795c: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'e7cb795cb639ef4e04b0417ebf4b16b12ea5dc4e':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:41:46 -07:00
The Android Automerger
847a62270f
merge in master-release history after reset to master
2013-03-22 07:49:16 -07:00
Ken Sumrall
d74a0ffba8
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-22 02:12:46 -07:00
Elliott Hughes
1d509cc043
am 472d7115: am ddda044a: am 5686bb30: am 3323628d: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '472d7115f1ec8968b645d72d18222687d39f189e':
The SYS_ constants should cover all __NR_ values.
2013-03-22 05:57:05 +00:00
Elliott Hughes
472d7115f1
am ddda044a: am 5686bb30: am 3323628d: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit 'ddda044a81b6be2ccdf351ad5c9a2b9800a60f5f':
The SYS_ constants should cover all __NR_ values.
2013-03-22 05:55:47 +00:00
Elliott Hughes
ddda044a81
am 5686bb30: am 3323628d: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '5686bb300304f5de0597f356c6da72b8a090a647':
The SYS_ constants should cover all __NR_ values.
2013-03-21 22:54:49 -07:00
Elliott Hughes
5686bb3003
am 3323628d: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '3323628d635d3973965ee458c1fee7d8ab45136f':
The SYS_ constants should cover all __NR_ values.
2013-03-21 22:53:44 -07:00
Elliott Hughes
731381ad5f
am dfde829f: am c8ded7c6: am a3167257: am babb72dc: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'dfde829fc1c97fe3fbdaf244d2444562b7c2fbfe':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-22 05:25:17 +00:00
Elliott Hughes
dfde829fc1
am c8ded7c6: am a3167257: am babb72dc: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'c8ded7c6b1b95ca530383b9698719892d13a4f9e':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-22 05:24:12 +00:00
Elliott Hughes
c8ded7c6b1
am a3167257: am babb72dc: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'a316725740ac123de65e225f5bfbf99450f66e6b':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-21 22:22:49 -07:00
Elliott Hughes
a316725740
am babb72dc: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'babb72dc292a567674f6d7d2ccf7f63edaf77b80':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-21 22:20:53 -07:00
Elliott Hughes
bd43b613b8
am 3a6178f8: am 1e40ace4: am a596aa6a: am 26c815c4: Merge "Drop magic number in strrchr and strchr"
...
* commit '3a6178f8b9498ece5383fac9feb692e8ed2d4ce0':
Drop magic number in strrchr and strchr
2013-03-22 03:03:15 +00:00
Elliott Hughes
06a06d5091
am 71afd315: am 17a0d191: am 01c0e19e: am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '71afd3153544a2795fcb74c86fd895df59aa5feb':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-22 03:03:15 +00:00
Elliott Hughes
3a6178f8b9
am 1e40ace4: am a596aa6a: am 26c815c4: Merge "Drop magic number in strrchr and strchr"
...
* commit '1e40ace49e25ee4c469ed4613fe09656d3c0a5d7':
Drop magic number in strrchr and strchr
2013-03-22 03:00:36 +00:00
Elliott Hughes
71afd31535
am 17a0d191: am 01c0e19e: am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '17a0d1915f871ad67608a582a4fb3352000cf719':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-22 03:00:35 +00:00
Elliott Hughes
1e40ace49e
am a596aa6a: am 26c815c4: Merge "Drop magic number in strrchr and strchr"
...
* commit 'a596aa6abfdd8ecdb4bcdd9bcad24a19adcf7525':
Drop magic number in strrchr and strchr
2013-03-21 19:58:23 -07:00
Elliott Hughes
17a0d1915f
am 01c0e19e: am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '01c0e19e426df5620c5ca822ab546907dbf1fa7d':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-21 19:58:22 -07:00
Elliott Hughes
a596aa6abf
am 26c815c4: Merge "Drop magic number in strrchr and strchr"
...
* commit '26c815c489197259e3692d4a1e35463989f7c7a3':
Drop magic number in strrchr and strchr
2013-03-21 19:56:39 -07:00
Elliott Hughes
01c0e19e42
am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '612333f671a59d98fad6f594f5bf657dbd6c9c4d':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-21 19:56:38 -07:00
Elliott Hughes
2810ec5464
am 5bed5501: am 3077d883: am c48968d2: am 4453c51c: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '5bed5501d7048acc77f5365e87fd8487b21ef1f6':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-22 02:43:23 +00:00
Elliott Hughes
5bed5501d7
am 3077d883: am c48968d2: am 4453c51c: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '3077d88347f4b120ee93e73efdbfb017e0e968ec':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-22 02:42:02 +00:00
Elliott Hughes
3077d88347
am c48968d2: am 4453c51c: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit 'c48968d268820ee64986f738e227910b29290eab':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-21 19:40:15 -07:00
Elliott Hughes
c48968d268
am 4453c51c: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '4453c51c8269457b337578f809670d0fdb755132':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-21 19:38:53 -07:00
Elliott Hughes
b11037a42a
am 455637f2: am 5c9a25cc: am f977d2dc: am 800ad824: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '455637f25180709f7baf261715873f4a0109583c':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-22 01:55:26 +00:00
Elliott Hughes
455637f251
am 5c9a25cc: am f977d2dc: am 800ad824: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '5c9a25cc2369846f7cf7f4fe1bdb32cf3dc8a469':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-22 01:54:20 +00:00
Elliott Hughes
5c9a25cc23
am f977d2dc: am 800ad824: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit 'f977d2dc1dce28a517329e8b4990ebee696faec1':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-21 18:51:51 -07:00
Elliott Hughes
f977d2dc1d
am 800ad824: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '800ad8249a398e94d039b6f6597e2a51558e41dd':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-21 18:49:24 -07:00
Elliott Hughes
a2e42c3798
am 6d460efe: am c9edc079: am 39e2a408: am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '6d460efed94e3d5825b5c842c112aa6b26357d93':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 23:25:38 +00:00
Elliott Hughes
6d460efed9
am c9edc079: am 39e2a408: am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit 'c9edc0797779187ad1b429e956820928051047ae':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 23:23:46 +00:00
Elliott Hughes
c9edc07977
am 39e2a408: am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '39e2a408a64bd24fb0fe7f5eb444b55af1160480':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 16:19:29 -07:00
Elliott Hughes
39e2a408a6
am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '6eb978c9bf02d2bcdece2826577cc65900030690':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 16:18:22 -07:00
The Android Automerger
3e036b0c99
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-21 05:55:07 -07:00
Christopher Ferris
e269711a1b
am 774266bf: am f46e1454: am 9088af19: am 86c31849: Merge "Create arch specific versions of strcmp."
...
* commit '774266bfa281880e16c2447555177c037575cdaf':
Create arch specific versions of strcmp.
2013-03-20 22:40:13 +00:00
Christopher Ferris
774266bfa2
am f46e1454: am 9088af19: am 86c31849: Merge "Create arch specific versions of strcmp."
...
* commit 'f46e14544b446e6dbc241aabb8090cd8e62c158d':
Create arch specific versions of strcmp.
2013-03-20 22:37:58 +00:00
Christopher Ferris
f46e14544b
am 9088af19: am 86c31849: Merge "Create arch specific versions of strcmp."
...
* commit '9088af19b45d1b7339b982c92ef9113337f5d2c6':
Create arch specific versions of strcmp.
2013-03-20 15:33:54 -07:00
Christopher Ferris
9088af19b4
am 86c31849: Merge "Create arch specific versions of strcmp."
...
* commit '86c318497270c80a3791b4cd9835367653636377':
Create arch specific versions of strcmp.
2013-03-20 15:29:06 -07:00
The Android Open Source Project
fd56f2a3cc
am bad0c4d8: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'bad0c4d8bb85d91affb7274022f671b40b0a9305':
am 2e7b8d63 : am f861bc5c : Merge "Don\'t search off the end of the index for bad Olson ids."
2013-03-20 16:42:00 +00:00
The Android Open Source Project
bad0c4d8bb
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I9358f7d5fb867340fa18195fbbd6394c4ad53fce
2013-03-20 09:32:10 -07:00
The Android Automerger
1565771b2a
merge in master-release history after reset to master
2013-03-18 07:49:11 -07:00
The Android Automerger
ed12f36a09
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-18 05:55:24 -07:00
Elliott Hughes
6380d21a05
am 92a197f3: am d7dc414a: am 987fc5a3: am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit '92a197f3051c5befd5e40ec7f23c0643999da259':
Hide various symbols that shouldn't be exposed.
2013-03-16 00:11:52 +00:00
Elliott Hughes
92a197f305
am d7dc414a: am 987fc5a3: am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit 'd7dc414afd1847e76ae317880bcedc9678953f9e':
Hide various symbols that shouldn't be exposed.
2013-03-16 00:10:24 +00:00
Elliott Hughes
d7dc414afd
am 987fc5a3: am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit '987fc5a3c4046831dc9e6c252e99a9c694bbd9ee':
Hide various symbols that shouldn't be exposed.
2013-03-15 17:09:17 -07:00
Elliott Hughes
987fc5a3c4
am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit 'adeec096292a3ad63767f13af04836249ecbc075':
Hide various symbols that shouldn't be exposed.
2013-03-15 17:07:45 -07:00
Elliott Hughes
90f7546c68
am cf23cbb1: am 12ea8005: am 5f829205: am c1416647: Merge "Clean up internal libc logging."
...
* commit 'cf23cbb1d4826ac579fae28e4fe796a6e4e1ddfd':
Clean up internal libc logging.
2013-03-15 23:43:01 +00:00
Elliott Hughes
cf23cbb1d4
am 12ea8005: am 5f829205: am c1416647: Merge "Clean up internal libc logging."
...
* commit '12ea8005665085ae82c1b233ae93d12855e04b8b':
Clean up internal libc logging.
2013-03-15 23:40:15 +00:00
Elliott Hughes
12ea800566
am 5f829205: am c1416647: Merge "Clean up internal libc logging."
...
* commit '5f8292050fc07f4bf9e70f37a807ad028e3cfc87':
Clean up internal libc logging.
2013-03-15 16:36:37 -07:00
Elliott Hughes
5f8292050f
am c1416647: Merge "Clean up internal libc logging."
...
* commit 'c14166477e7fd22693eab194d37624c2f7506ce4':
Clean up internal libc logging.
2013-03-15 16:34:05 -07:00
Elliott Hughes
744df77d47
am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit '2e7b8d6399fdea6e43dd07f353346324d2bf4ec4':
Don't search off the end of the index for bad Olson ids.
2013-03-15 12:56:32 -07:00
Elliott Hughes
cc71361ed6
am 270595f4: am e1b0db13: am 50d42294: am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
...
* commit '270595f4c976a86033ac099a283299c2ec53f24a':
Remove useless workaround for HTC RIL bugs.
2013-03-15 18:49:50 +00:00
Elliott Hughes
270595f4c9
am e1b0db13: am 50d42294: am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
...
* commit 'e1b0db1392050900e1f38b16ec2c8e213308e267':
Remove useless workaround for HTC RIL bugs.
2013-03-15 18:47:48 +00:00
Elliott Hughes
e1b0db1392
am 50d42294: am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
...
* commit '50d42294bdc983e05eca0fb0099bbb9f634fd5e3':
Remove useless workaround for HTC RIL bugs.
2013-03-15 11:46:05 -07:00
Elliott Hughes
50d42294bd
am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."
...
* commit 'e23ed8c6441389a79c6504295184f7249e01a197':
Remove useless workaround for HTC RIL bugs.
2013-03-15 11:43:50 -07:00
The Android Automerger
9d6a2c28a5
merge in master-release history after reset to master
2013-03-15 07:49:25 -07:00
Elliott Hughes
045e01caed
am c204b501: am 9ede4549: am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
...
* commit 'c204b501f44d7b08e2be06693322d5426b3f85ef':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
2013-03-15 00:45:09 +00:00
Elliott Hughes
c204b501f4
am 9ede4549: am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
...
* commit '9ede4549fe083e54cdf2f34b177fc32777f61fac':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
2013-03-15 00:44:05 +00:00
Elliott Hughes
9ede4549fe
am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
...
* commit 'f8d689bc56976f8bd37b306053154a0e9d17fb1d':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
2013-03-14 17:42:42 -07:00
Elliott Hughes
f8d689bc56
am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
...
* commit '4d696eb49d24590a6d6d25657b5bc0103e2d90ba':
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
2013-03-14 17:40:26 -07:00
Christopher Ferris
18fcfa79d3
am 8dcbb90d: am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."
...
* commit '8dcbb90dea22a876d9cc517f382bb82c98d87450':
Remove unused arm defines.
2013-03-14 23:43:26 +00:00
Christopher Ferris
8dcbb90dea
am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."
...
* commit 'f85fc022f5ad405a7e43ecb6f48bcc6e061e01b5':
Remove unused arm defines.
2013-03-14 23:40:36 +00:00
Christopher Ferris
f85fc022f5
am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."
...
* commit 'f694ed1cdbfd2d26cdc2a008b67bfd3451522c8f':
Remove unused arm defines.
2013-03-14 16:36:45 -07:00
Christopher Ferris
f694ed1cdb
am d30b9f09: Merge "Remove unused arm defines."
...
* commit 'd30b9f0912b4763f0d98bdee23064015223ec03f':
Remove unused arm defines.
2013-03-14 16:32:21 -07:00
Elliott Hughes
4982e345cf
am 2d48d0ea: am c9358706: am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit '2d48d0ea36395da9af4537195483b006900bf7bd':
Don't search off the end of the index for bad Olson ids.
2013-03-14 22:35:28 +00:00
Elliott Hughes
2d48d0ea36
am c9358706: am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit 'c9358706c6f48eb27f785f3bf15b2ab0d50ff7bc':
Don't search off the end of the index for bad Olson ids.
2013-03-14 22:33:35 +00:00
Elliott Hughes
c9358706c6
am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit '2e7b8d6399fdea6e43dd07f353346324d2bf4ec4':
Don't search off the end of the index for bad Olson ids.
2013-03-14 15:30:13 -07:00
Elliott Hughes
2e7b8d6399
am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit 'f861bc5cc3e17322e49f89deea61f278aaefbe76':
Don't search off the end of the index for bad Olson ids.
2013-03-14 15:17:09 -07:00
Christopher Ferris
65461bbe25
Merge "Create arch specific versions of strcmp."
2013-03-14 21:18:20 +00:00
The Android Automerger
e450d655ba
merge in master-release history after reset to master
2013-03-13 07:49:07 -07:00
The Android Automerger
45508566d1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-13 05:55:08 -07:00
Elliott Hughes
a00988312b
am 76ade2ed: am f557e90b: am 2f44c05b: am ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit '76ade2ed6077fec0a4978ef7e7e2a99578512c39':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-13 01:00:12 +00:00
Elliott Hughes
76ade2ed60
am f557e90b: am 2f44c05b: am ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit 'f557e90b348d9a3294391076bcd6604a13c803b6':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-13 00:58:27 +00:00
Elliott Hughes
f557e90b34
am 2f44c05b: am ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit '2f44c05bc54073aa6decfc5d933b7e77e7ce5768':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:55:54 -07:00
Elliott Hughes
2f44c05bc5
am ec706c24: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit 'ec706c24acb4d1db6a583a57b76adfb9250d39eb':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:54:00 -07:00
Christopher Ferris
f0cd52305a
am 8cca0154: am b0b974c1: am 2a66ccf1: am 980508b0: Merge "Break bionic implementations into arch versions."
...
* commit '8cca015403f2f021d557fc81a0423a04a551448a':
Break bionic implementations into arch versions.
2013-03-12 22:45:21 +00:00
Christopher Ferris
8cca015403
am b0b974c1: am 2a66ccf1: am 980508b0: Merge "Break bionic implementations into arch versions."
...
* commit 'b0b974c10ce3494fe58be1a3f419656f95c54331':
Break bionic implementations into arch versions.
2013-03-12 22:43:05 +00:00
Christopher Ferris
b0b974c10c
am 2a66ccf1: am 980508b0: Merge "Break bionic implementations into arch versions."
...
* commit '2a66ccf1bb4dd0183b65264cb8107ba70748f626':
Break bionic implementations into arch versions.
2013-03-12 15:40:22 -07:00
Christopher Ferris
2a66ccf1bb
am 980508b0: Merge "Break bionic implementations into arch versions."
...
* commit '980508b0ead3ee01e99e93635c57eb76d1aba62d':
Break bionic implementations into arch versions.
2013-03-12 15:39:38 -07:00
Elliott Hughes
4f73423c68
am 0052a618: am b4d6f28c: am a3214c65: am 94a34010: Merge "Support large errno values on ARM."
...
* commit '0052a6188ba20c3a9ea99f974bce0c143bd379cb':
Support large errno values on ARM.
2013-03-12 19:24:10 +00:00
Elliott Hughes
0052a6188b
am b4d6f28c: am a3214c65: am 94a34010: Merge "Support large errno values on ARM."
...
* commit 'b4d6f28cc33f438f9859d6ab5f91e7f2ee1d6d33':
Support large errno values on ARM.
2013-03-12 19:22:50 +00:00
Elliott Hughes
b4d6f28cc3
am a3214c65: am 94a34010: Merge "Support large errno values on ARM."
...
* commit 'a3214c65620827628a87849a5fbad5a4ef97eeb1':
Support large errno values on ARM.
2013-03-12 12:18:49 -07:00
Elliott Hughes
a3214c6562
am 94a34010: Merge "Support large errno values on ARM."
...
* commit '94a34010c1f989032c0a4dc7a7a68d069ca23b1e':
Support large errno values on ARM.
2013-03-12 12:17:15 -07:00
Elliott Hughes
6734451334
am 60414ba1: am 746f1286: am 5d998b4a: am f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit '60414ba165da87e427aef45b651ec7d4f26b084f':
Use more types than just 'unsigned' in the linker.
2013-03-12 19:07:18 +00:00
Elliott Hughes
60414ba165
am 746f1286: am 5d998b4a: am f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit '746f128602772997b57e24fc8546473d01d6f955':
Use more types than just 'unsigned' in the linker.
2013-03-12 19:05:53 +00:00
Elliott Hughes
746f128602
am 5d998b4a: am f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit '5d998b4a21aab09da750e8e43cb608f5ee6b1f3d':
Use more types than just 'unsigned' in the linker.
2013-03-12 12:03:06 -07:00
Elliott Hughes
5d998b4a21
am f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit 'f21aa3b61ebc6b1a7c34265699f40bd9b5af7952':
Use more types than just 'unsigned' in the linker.
2013-03-12 12:00:55 -07:00
Elliott Hughes
947695bd9b
am 5487ecb5: am e9cdce33: am 3c9afb5e: am 6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit '5487ecb52a328906b81635f8c8018f48031c19a1':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 17:43:55 +00:00
Elliott Hughes
5487ecb52a
am e9cdce33: am 3c9afb5e: am 6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit 'e9cdce33f398e43952d11ef38027e2d255f16531':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 17:42:37 +00:00
Elliott Hughes
e9cdce33f3
am 3c9afb5e: am 6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit '3c9afb5e17eaa2ed5a12d71a1a09fe85f06fcb48':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 10:40:56 -07:00
Elliott Hughes
3c9afb5e17
am 6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit '6b4c77f854c079138d552608b9df5fa3035f0fcc':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 10:38:46 -07:00
Christopher Ferris
a9a5870d16
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
Change-Id: I5f3dc02b48afba2cb9c13332ab45c828ff171a1c
2013-03-12 10:25:11 -07:00
The Android Automerger
1a6e73d0ac
merge in master-release history after reset to master
2013-03-12 07:49:24 -07:00
The Android Open Source Project
70d97ae3d0
am 7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '7c8af2252a5814a34f30922ac7d5d63bd891e525':
2013-03-12 14:16:36 +00:00
The Android Open Source Project
7c8af2252a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia0c7d98294053c4dfab78608959f2f3f53c8e2a0
2013-03-12 07:14:11 -07:00
The Android Automerger
24ec903cd8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-12 05:55:15 -07:00
Elliott Hughes
3284773891
am 03e71235: am 8c73f69c: am 36cb88b7: am 53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '03e712357d1f4de204ac9ad5cbef53acba48db9d':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-12 01:50:53 +00:00
Elliott Hughes
03e712357d
am 8c73f69c: am 36cb88b7: am 53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '8c73f69cf42d78f37b9b82bf0cc62d2cd1985fcc':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-12 01:48:34 +00:00
Elliott Hughes
8c73f69cf4
am 36cb88b7: am 53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '36cb88b70c39e507e9017f0bd7121da57e568744':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-11 18:46:23 -07:00
Elliott Hughes
36cb88b70c
am 53630c0e: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '53630c0e5bb6f845ba633e8dedc08b827f7b5d0c':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-11 18:44:19 -07:00
Jean-Baptiste Queru
23167e7556
am 1467dfa5: (-s ours) am a60f3818: am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24':
2013-03-11 19:51:51 +00:00
Jean-Baptiste Queru
1467dfa5cd
am a60f3818: am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a60f38181465d5f5a37ea8f9ad34326ea2e21ef0':
2013-03-11 19:41:34 +00:00
Elliott Hughes
3d0bf2b30c
am 9969b48d: am 60ac09bd: am 6d6f5e61: am 4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '9969b48d235e71f87be67549fdd274c8e82f3f6f':
Let bionic use the correct definition of ssize_t.
2013-03-11 19:41:19 +00:00
Jean-Baptiste Queru
a60f381814
am b2525ba8: am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b2525ba8a0f91594df17e893d036c416a109b012':
2013-03-11 12:35:36 -07:00
Elliott Hughes
9969b48d23
am 60ac09bd: am 6d6f5e61: am 4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '60ac09bdb2ddc4076f78a91f260cd5a1e179c82b':
Let bionic use the correct definition of ssize_t.
2013-03-11 19:34:11 +00:00
Jean-Baptiste Queru
b2525ba8a0
am 7915b22e: am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7915b22e8f70b80a9fc2c41f9734194c58b546fc':
2013-03-11 12:30:58 -07:00
Jean-Baptiste Queru
7915b22e8f
am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
2013-03-11 12:28:17 -07:00
Elliott Hughes
60ac09bdb2
am 6d6f5e61: am 4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '6d6f5e618e054e79d80a02f2c3f76ce0fd73bb2a':
Let bionic use the correct definition of ssize_t.
2013-03-11 12:27:58 -07:00
Jean-Baptiste Queru
a4b20d712b
am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':
2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru
b8e1033c5b
am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e5412a9a9597433ae2540b390269c514c46402f1':
2013-03-11 12:19:03 -07:00
Jean-Baptiste Queru
e5412a9a95
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:15:11 -07:00
Elliott Hughes
cd9c4cfae3
am 022d7c50: am bf32ffcf: am 0b765862: am 62c5cd07: Merge "Upgrade to tzdata2013b."
...
* commit '022d7c50db28fbf90e197f0c88b23b7e3a74a07b':
Upgrade to tzdata2013b.
2013-03-11 18:39:13 +00:00
Elliott Hughes
022d7c50db
am bf32ffcf: am 0b765862: am 62c5cd07: Merge "Upgrade to tzdata2013b."
...
* commit 'bf32ffcf027d0089e84fafb0114f6b40825f84ac':
Upgrade to tzdata2013b.
2013-03-11 18:33:57 +00:00
Elliott Hughes
bf32ffcf02
am 0b765862: am 62c5cd07: Merge "Upgrade to tzdata2013b."
...
* commit '0b765862e134e87174ddf9bdfa32528392f85e96':
Upgrade to tzdata2013b.
2013-03-11 11:29:24 -07:00
Elliott Hughes
6d6f5e618e
am 4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '4b032ee9b94137e41ee54e9bb3bcf0ba5ad43cbc':
Let bionic use the correct definition of ssize_t.
2013-03-11 11:07:29 -07:00
Elliott Hughes
0b765862e1
am 62c5cd07: Merge "Upgrade to tzdata2013b."
...
* commit '62c5cd0781e95c1c50b63c37a9a87bc158e64d38':
Upgrade to tzdata2013b.
2013-03-11 09:57:53 -07:00
The Android Automerger
e767b0f555
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-11 05:55:24 -07:00
The Android Automerger
568eb7bd76
merge in master-release history after reset to master
2013-03-08 07:49:16 -08:00
Elliott Hughes
5bb64976a0
am 7a9749ec: am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev
...
* commit '7a9749eca06816ba3b63e55660bc1c2b7285dc52':
Regenerate NOTICE files.
2013-03-07 21:25:35 +00:00
Elliott Hughes
7a9749eca0
am 8a015722: resolved conflicts for merge of 4706606c to jb-mr2-dev
...
* commit '8a0157227242eeb7917f064e0d81014bcda6d8f7':
Regenerate NOTICE files.
2013-03-07 21:23:22 +00:00
Elliott Hughes
8a01572272
resolved conflicts for merge of 4706606c to jb-mr2-dev
...
Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c
2013-03-07 13:19:20 -08:00
Elliott Hughes
4706606c88
am 809eed1d: Merge "Regenerate NOTICE files."
...
* commit '809eed1dedb833af1aba56c6a1d059123b43049a':
Regenerate NOTICE files.
2013-03-07 12:02:00 -08:00
The Android Automerger
a7a3bcef75
merge in master-release history after reset to master
2013-03-07 07:49:10 -08:00
The Android Automerger
a312b02e85
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-07 05:55:07 -08:00
Elliott Hughes
30be06bc7a
am 0f644ccf: am 0a2ee475: am ad7c275e: am c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit '0f644ccf6dfb4f00473fc90f369d842e09ab13df':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:09:36 +00:00
Elliott Hughes
0f644ccf6d
am 0a2ee475: am ad7c275e: am c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit '0a2ee4750ac4e9e5949dbf97fbad68065e83b632':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:07:08 +00:00
Elliott Hughes
0a2ee4750a
am ad7c275e: am c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'ad7c275e45088e1f13656b97dabbe911fff83664':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:04:52 +00:00
Elliott Hughes
ad7c275e45
am c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'c9f80814259a81dce12ba35d1750fa2b23fef48d':
Upgrade to current NetBSD popen/pclose.
2013-03-06 17:03:28 -08:00
Brian Carlstrom
4bf33991b2
am 6b89c634: am c7b9f954: am 91392116: am 33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit '6b89c6341f2d805b7d9913d69ef6038b60b2af7b':
Fix typo of DT_NEEDED for DT_NULL
2013-03-07 00:18:45 +00:00
Brian Carlstrom
6b89c6341f
am c7b9f954: am 91392116: am 33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit 'c7b9f954a5278115333516a40c0d2839648a6877':
Fix typo of DT_NEEDED for DT_NULL
2013-03-07 00:15:48 +00:00
Brian Carlstrom
c7b9f954a5
am 91392116: am 33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit '91392116ff859b2e7656ded729b8c758107241aa':
Fix typo of DT_NEEDED for DT_NULL
2013-03-07 00:12:13 +00:00
Brian Carlstrom
91392116ff
am 33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
...
* commit '33031fed84e24fb7791f123df45abc1a3812ac59':
Fix typo of DT_NEEDED for DT_NULL
2013-03-06 16:11:07 -08:00
Elliott Hughes
85598b9668
am 165825e3: am 9c0c056b: am 6b1aa1b1: am db794197: Merge "Fix debug malloc."
...
* commit '165825e3e83fb2ae43b60b1b5ef44cbc55f7979f':
Fix debug malloc.
2013-03-06 23:29:12 +00:00
Elliott Hughes
165825e3e8
am 9c0c056b: am 6b1aa1b1: am db794197: Merge "Fix debug malloc."
...
* commit '9c0c056beddf8c4100769ad01404311a6d70efae':
Fix debug malloc.
2013-03-06 23:27:40 +00:00
Elliott Hughes
9c0c056bed
am 6b1aa1b1: am db794197: Merge "Fix debug malloc."
...
* commit '6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c':
Fix debug malloc.
2013-03-06 23:24:59 +00:00
Elliott Hughes
6b1aa1b16b
am db794197: Merge "Fix debug malloc."
...
* commit 'db794197cc880e3805bcefbea780476a359066c2':
Fix debug malloc.
2013-03-06 15:22:24 -08:00
Elliott Hughes
6646adeac0
am bbef1f57: am bac72aba: am 50a2cd86: am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit 'bbef1f57509504ca11f26968beafd4aa0cfd4643':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 17:52:39 +00:00
Elliott Hughes
bbef1f5750
am bac72aba: am 50a2cd86: am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit 'bac72abae4578bf2df9227a9c3d2c7233c83a06b':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 17:47:07 +00:00
Elliott Hughes
bac72abae4
am 50a2cd86: am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit '50a2cd865e7cc8c72d926548ed5d64e269003055':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 17:44:43 +00:00
Elliott Hughes
50a2cd865e
am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
...
* commit '0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
2013-03-06 09:41:56 -08:00
Brian Carlstrom
01b5c0f126
am 8f4880e2: am 2527a8b5: am 9043202b: am 20958207: Merge "Fix MIPS linker build"
...
* commit '8f4880e2c66d60283d443f6c9b5ef4136d2c6621':
Fix MIPS linker build
2013-03-06 16:53:22 +00:00
Elliott Hughes
0864ade9de
am 5673f9f7: am c1a5d20d: am 9a0b658c: am c41dcad0: Merge "More linker cleanup."
...
* commit '5673f9f73b545c8b4801c1494600ff2220bf8dca':
More linker cleanup.
2013-03-06 16:53:22 +00:00
Brian Carlstrom
8f4880e2c6
am 2527a8b5: am 9043202b: am 20958207: Merge "Fix MIPS linker build"
...
* commit '2527a8b5a652d7f88b662fe3788e29b6bc2bbe78':
Fix MIPS linker build
2013-03-06 16:48:18 +00:00
Elliott Hughes
5673f9f73b
am c1a5d20d: am 9a0b658c: am c41dcad0: Merge "More linker cleanup."
...
* commit 'c1a5d20d08118bb778f99b14ca74d6654e4f4eba':
More linker cleanup.
2013-03-06 16:48:05 +00:00
The Android Automerger
bc08713ba4
merge in master-release history after reset to master
2013-03-06 07:49:13 -08:00
The Android Automerger
f5fc5d467c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-06 05:55:11 -08:00
Brian Carlstrom
2527a8b5a6
am 9043202b: am 20958207: Merge "Fix MIPS linker build"
...
* commit '9043202b5bb8e0725b0302e9da9d3a57c837e798':
Fix MIPS linker build
2013-03-06 09:18:59 +00:00
Brian Carlstrom
9043202b5b
am 20958207: Merge "Fix MIPS linker build"
...
* commit '20958207d5f9d36cc6f6b3edc4ff899c73b72b02':
Fix MIPS linker build
2013-03-06 01:17:27 -08:00
Elliott Hughes
c1a5d20d08
am 9a0b658c: am c41dcad0: Merge "More linker cleanup."
...
* commit '9a0b658c9c1f8f4492f61a75909e5ca2f05c3ac1':
More linker cleanup.
2013-03-06 06:44:06 +00:00
Elliott Hughes
9a0b658c9c
am c41dcad0: Merge "More linker cleanup."
...
* commit 'c41dcad040ede2975ea63e383a8a3d36e3642d56':
More linker cleanup.
2013-03-05 22:42:33 -08:00
Brian Carlstrom
d18e5bb412
am a2cfd1a2: am 8c65a1e4: am a2517de3: am 036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit 'a2cfd1a27fe552a42d668c708d98ca3f8bee90b9':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-06 01:27:56 +00:00
Brian Carlstrom
a2cfd1a27f
am 8c65a1e4: am a2517de3: am 036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit '8c65a1e466dae62217700065256921ba86290faa':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-06 01:25:09 +00:00
Brian Carlstrom
8c65a1e466
am a2517de3: am 036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit 'a2517de3844d95b5f00a4666b8dae00ef893ac24':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-06 01:22:25 +00:00
Brian Carlstrom
a2517de384
am 036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
...
* commit '036f909720fd0d56dbd04b9a761fb1d0714980b0':
Minor linker cleanup, primarily to use Elf32_Dyn
2013-03-05 17:20:35 -08:00
Elliott Hughes
074a94c01e
am b3b00378: am 97a8217a: am 3f7b1cd3: am be21fe7a: Merge "Upgrade to tzdata2013a."
...
* commit 'b3b0037884e9b0bcba787e84448815f2a4b4dccd':
Upgrade to tzdata2013a.
2013-03-05 22:29:17 +00:00
Elliott Hughes
b3b0037884
am 97a8217a: am 3f7b1cd3: am be21fe7a: Merge "Upgrade to tzdata2013a."
...
* commit '97a8217ae1a23a808f7bb3af2f492040e7080549':
Upgrade to tzdata2013a.
2013-03-05 22:25:39 +00:00
Elliott Hughes
97a8217ae1
am 3f7b1cd3: am be21fe7a: Merge "Upgrade to tzdata2013a."
...
* commit '3f7b1cd3acf9990efea9f75559b2f873ab3838fe':
Upgrade to tzdata2013a.
2013-03-05 22:23:45 +00:00
Elliott Hughes
3f7b1cd3ac
am be21fe7a: Merge "Upgrade to tzdata2013a."
...
* commit 'be21fe7a5947e24f9f0db90f8e16c54766d1237a':
Upgrade to tzdata2013a.
2013-03-05 14:22:01 -08:00
Ben Cheng
fbb281b15d
am 7eaed030: am 6ad68558: am e5e6e17c: am 133d97e4: Merge "Add stack unwinding directives to memcpy."
...
* commit '7eaed030deacb14a6fe628e229af6c9a3a620f3c':
Add stack unwinding directives to memcpy.
2013-03-05 21:24:43 +00:00
Ben Cheng
7eaed030de
am 6ad68558: am e5e6e17c: am 133d97e4: Merge "Add stack unwinding directives to memcpy."
...
* commit '6ad68558ed4429f7ab0dbad9a5bbf18aacde8362':
Add stack unwinding directives to memcpy.
2013-03-05 21:22:49 +00:00
Ben Cheng
6ad68558ed
am e5e6e17c: am 133d97e4: Merge "Add stack unwinding directives to memcpy."
...
* commit 'e5e6e17c5bd06e097c5bb4da9a23b5e293309ab9':
Add stack unwinding directives to memcpy.
2013-03-05 21:20:42 +00:00
Ben Cheng
e5e6e17c5b
am 133d97e4: Merge "Add stack unwinding directives to memcpy."
...
* commit '133d97e4b07a733787fb85692ad8427fdc3d1d22':
Add stack unwinding directives to memcpy.
2013-03-05 13:17:23 -08:00
Elliott Hughes
c6ef78e83e
am 136e00d6: am c96ad9bc: am 7b69ac53: am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit '136e00d6e9bc19617e49a6b7bf81f749ff8a48e3':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 21:14:04 +00:00
Elliott Hughes
136e00d6e9
am c96ad9bc: am 7b69ac53: am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit 'c96ad9bcd28fcd2b34040a2a696262057a11470b':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 21:05:24 +00:00
Elliott Hughes
c96ad9bcd2
am 7b69ac53: am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit '7b69ac535abca0e7867524e68f5a3581cc367de8':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 20:28:28 +00:00
Elliott Hughes
7b69ac535a
am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit 'cf9a9604adb27600c79ca236578a8be89168202f':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 12:27:09 -08:00
The Android Open Source Project
69a278f679
am adff4e86: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'adff4e8630e8d468253255b521caecfbb161dbbe':
2013-03-05 15:58:51 +00:00
The Android Open Source Project
adff4e8630
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I2635d0c79d4adc135c7f0b6345547ed5e3114158
2013-03-05 07:53:05 -08:00
The Android Automerger
ee84789761
merge in master-release history after reset to master
2013-03-05 07:49:15 -08:00
The Android Automerger
5b5aa0317c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-05 05:55:15 -08:00
Elliott Hughes
3f794facd3
am 7ef3ccb7: am 81e0f35a: am 2125c155: am d392e044: Merge "Move realpath.c to upstream-freebsd."
...
* commit '7ef3ccb7bb5f334e4ca8911a5d0eca7dd0da6b92':
Move realpath.c to upstream-freebsd.
2013-03-04 23:59:47 +00:00
Elliott Hughes
7ef3ccb7bb
am 81e0f35a: am 2125c155: am d392e044: Merge "Move realpath.c to upstream-freebsd."
...
* commit '81e0f35acc41cfafccc6d28a9122f115ca6e4a16':
Move realpath.c to upstream-freebsd.
2013-03-04 23:58:16 +00:00
Elliott Hughes
81e0f35acc
am 2125c155: am d392e044: Merge "Move realpath.c to upstream-freebsd."
...
* commit '2125c15506cbe9e4062d72ebb723d164e9c01c1f':
Move realpath.c to upstream-freebsd.
2013-03-04 23:56:56 +00:00
The Android Open Source Project
781c4b19f4
am 98650e04: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '98650e04e6d87e0b2c82151eacbe483ac15949d9':
Avoid changing the C++ ABI with ssize_t.
2013-03-04 19:10:07 +00:00
The Android Open Source Project
98650e04e6
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I92fd2ef799f358dd022234bc5fa7e6693f0619f0
2013-03-04 11:06:25 -08:00
Elliott Hughes
2125c15506
am d392e044: Merge "Move realpath.c to upstream-freebsd."
...
* commit 'd392e044c7a03ff1c0903c3512d00955bc7de473':
Move realpath.c to upstream-freebsd.
2013-03-04 08:25:58 -08:00
The Android Automerger
e290a7e348
merge in master-release history after reset to master
2013-03-04 07:49:05 -08:00
The Android Automerger
2ec68f6833
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-04 05:55:08 -08:00
Christopher Ferris
0a1ab287ff
am 29cc4946: (-s ours) Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev
...
* commit '29cc4946ac8ac89fa0c49e5da8b5b328065d4b2c':
Remove unused arm defines. DO NOT MERGE
2013-03-02 01:19:47 +00:00
Christopher Ferris
29cc4946ac
Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev
2013-03-02 01:16:00 +00:00
Christopher Ferris
947b3ab02b
Remove unused arm defines. DO NOT MERGE
...
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
(cherry picked from commit 6e1a5cf31b )
Change-Id: I69654d47db1458136782b5504290f620e924ee75
2013-03-01 16:54:56 -08:00
Ben Cheng
f85e173616
am b9ef7f4e: am 52b3aed7: am c5c6cb3f: am 66273ac2: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit 'b9ef7f4e122bee55110ac703f391ab961484f3d8':
Adding strcmp tuned for Cortex-A15.
2013-03-01 18:34:45 +00:00
Ben Cheng
89d7f5e482
am ae280bcd: am 55fc93a9: am 8f149da0: am b3b1ab62: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit 'ae280bcdbee8d31096c1b332b20fa32f941ef12f':
Adding memcpy tuned for Cortex-A15.
2013-03-01 18:34:45 +00:00
Nick Kralevich
1f415124ec
am 04190c53: am cc646773: am 305a9995: am 8fa924e5: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '04190c53e3ac2958322a603d7bfb9b07b92d595e':
unistd.h: don't include sys/capability.h
2013-03-01 18:34:44 +00:00
Ben Cheng
b9ef7f4e12
am 52b3aed7: am c5c6cb3f: am 66273ac2: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '52b3aed7982e9d68aad0652f54d5ee180ddf1c5a':
Adding strcmp tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Ben Cheng
ae280bcdbe
am 55fc93a9: am 8f149da0: am b3b1ab62: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '55fc93a90961022e38ef0bb63bcb81d2b4e5aef6':
Adding memcpy tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Nick Kralevich
04190c53e3
am cc646773: am 305a9995: am 8fa924e5: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit 'cc64677342209d38f88138c03d3ded0e1d61637c':
unistd.h: don't include sys/capability.h
2013-03-01 18:28:24 +00:00
Ben Cheng
52b3aed798
am c5c6cb3f: am 66273ac2: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit 'c5c6cb3f13642386e08acf687b4bc39f568bad0c':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Ben Cheng
55fc93a909
am 8f149da0: am b3b1ab62: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '8f149da08dc3125824e168f8d29613be80b2085c':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Nick Kralevich
cc64677342
am 305a9995: am 8fa924e5: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '305a999589a8dfde077589106853522d483d24d2':
unistd.h: don't include sys/capability.h
2013-03-01 10:26:51 -08:00
The Android Automerger
424f21b6a7
merge in master-release history after reset to master
2013-03-01 07:49:10 -08:00
Christopher Ferris
c7f9669226
am 7c83a1ed: (-s ours) Break bionic implementations into arch versions. DO NOT MERGE
...
* commit '7c83a1ed81a15f3e75836c1ac7d500a952f02e10':
Break bionic implementations into arch versions. DO NOT MERGE
2013-03-01 02:36:41 +00:00
Christopher Ferris
7c83a1ed81
Break bionic implementations into arch versions. DO NOT MERGE
...
Move arch specific code for arm, mips, x86 into separate
makefiles.
In addition, add different arm cpu versions of memcpy/memset.
Bug: 8005082
(cherry picked from commit acdde8c1cf )
Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-28 17:45:16 -08:00
Elliott Hughes
730da15840
Avoid changing the C++ ABI with ssize_t.
...
Bug: 8253769
Change-Id: Ia325003ed6e59da553e2bdde7c43515bc191b8ba
2013-02-28 15:21:51 -08:00
Elliott Hughes
bfc25aa33c
am 04766565: am 9c102ccf: am 7fe8229b: am 9c1912c4: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '04766565d3743d70f679ca180d7fcc35321143b8':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 22:38:45 +00:00
Elliott Hughes
04766565d3
am 9c102ccf: am 7fe8229b: am 9c1912c4: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '9c102ccf9517637f9d293b4e52f9a40573d8fc1d':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 19:46:19 +00:00
Elliott Hughes
9c102ccf95
am 7fe8229b: am 9c1912c4: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '7fe8229b49ea091d769b63052247ca12280975eb':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 11:44:20 -08:00
Sasha Levitskiy
fbae9f3c30
Bionic: Libc: Resolv: Stricter function signatures, unitialized return bug fix.
...
Stricter input parameters help avoid ugly casting when passing
pointers to immutable protobuf data.
While at it: an int return was dropped from 2 functions whose users
never used the result; one of the return paths was returning an
uninitialized value.
Size_t for portablity and warning supression, misc warnings addressed.
Change-Id: I2d5cbdaf0c9b6c4621a7d397772da13da5dc0943
2013-02-28 18:46:54 +00:00
The Android Automerger
de8481bcf7
merge in master-release history after reset to master
2013-02-28 07:49:07 -08:00
Christopher Ferris
6e1a5cf31b
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
Change-Id: I14e0368c5bb4c3a80e72520f7cfd97e359918cce
2013-02-27 16:26:41 -08:00
The Android Automerger
e9ca2d80ed
merge in master-release history after reset to master
2013-02-27 07:49:09 -08:00
Christopher Ferris
acdde8c1cf
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
Change-Id: I04f3d0715104fab618e1abf7cf8f7eec9bec79df
2013-02-26 16:04:34 -08:00
Nick Kralevich
30f1622a34
am 82f4cc5d: am 58b997c8: am f5f906c1: Merge "libc: create sys/capability.h"
...
* commit '82f4cc5de495c6cc3d3736ab075ccd05285beabc':
libc: create sys/capability.h
2013-02-26 21:55:28 +00:00
Nick Kralevich
82f4cc5de4
am 58b997c8: am f5f906c1: Merge "libc: create sys/capability.h"
...
* commit '58b997c8121455ecb9aa1b80d7c796115149ec2a':
libc: create sys/capability.h
2013-02-26 13:51:26 -08:00
The Android Automerger
c453d42e20
merge in master-release history after reset to master
2013-02-26 07:49:08 -08:00
Elliott Hughes
aa13eaa934
am d9cb6988: am 406968b2: am c0e9ddd0: Merge "Reimplement scandir(3)."
...
* commit 'd9cb69881a062c615a8009be0a70270c70eb35da':
Reimplement scandir(3).
2013-02-25 22:58:44 +00:00
Elliott Hughes
d9cb69881a
am 406968b2: am c0e9ddd0: Merge "Reimplement scandir(3)."
...
* commit '406968b2444bf29e449acebdfb7ff174abd1e0ad':
Reimplement scandir(3).
2013-02-25 14:56:51 -08:00
The Android Automerger
a6cef2de96
merge in master-release history after reset to master
2013-02-25 07:49:15 -08:00
Elliott Hughes
92ce5cc4bc
am ed1068c8: am 7b8bf681: am f6bb5bf4: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit 'ed1068c86ea0380e4b4909252367ffacc812ad57':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:09:30 -08:00
Elliott Hughes
ed1068c86e
am 7b8bf681: am f6bb5bf4: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit '7b8bf68133cda6c5ff9207248b563c2f6297e22a':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:06:12 -08:00
Elliott Hughes
726642cfa5
am dd843914: am 440bc83d: am 7b2c6385: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit 'dd8439141aeac6dc3a64e25f313d08833e1d85f5':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:16:14 -08:00
Elliott Hughes
dd8439141a
am 440bc83d: am 7b2c6385: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit '440bc83d924fa616614b4b426da66c2893048887':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:12:45 -08:00
Nick Kralevich
bcedca25d3
am 41fb968c: am cadc8583: am bc0e7ee1: Merge "libc: add sys/signal.h for compatibility"
...
* commit '41fb968c4268d080b0be4493876672efc4a71e16':
libc: add sys/signal.h for compatibility
2013-02-22 11:59:38 -08:00
Nick Kralevich
41fb968c42
am cadc8583: am bc0e7ee1: Merge "libc: add sys/signal.h for compatibility"
...
* commit 'cadc858329a5929911eff5f9a208229112e36a93':
libc: add sys/signal.h for compatibility
2013-02-22 11:56:39 -08:00
Nick Kralevich
5d36baee95
Merge "gethostbyname: fix crash"
2013-02-22 19:32:37 +00:00
The Android Automerger
d2a3e69c26
merge in master-release history after reset to master
2013-02-22 07:49:20 -08:00
Nick Kralevich
bfe0640e41
Don't pass pid to dnsproxyd
...
dnsproxyd can already determine our pid by looking at our
socket connection. It's dangerous (and unneeded) to pass it
ourselves.
Change-Id: I2596d02e361b302259ddb084be2fb75be59889c5
2013-02-21 21:34:11 -08:00
Nick Kralevich
a6b24b7afb
gethostbyname: fix crash
...
When an app doesn't have the internet permission, android_open_proxy
returns NULL, causing a segfault when calling fprintf. Fixed.
Change-Id: I598855350ed0db3cc88e5ae3b400145418a3a615
2013-02-21 20:12:42 -08:00
Elliott Hughes
7dfc6a3cd1
am e974e951: am 2a5b57db: am 580a7073: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit 'e974e951606d2efbad4bafe5edbd09c13d875f6a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 18:01:17 -08:00
Elliott Hughes
e974e95160
am 2a5b57db: am 580a7073: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit '2a5b57db8c711b6f33581a68cfb7b82298ad988c':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 17:57:53 -08:00
Nick Kralevich
d470955eb5
am 72e983d6: am 398f46dd: am a0259b42: Merge "libc: remove bcmp prototype"
...
* commit '72e983d62828e1db5049800b7edef5a1b0cbbcbd':
libc: remove bcmp prototype
2013-02-21 17:45:27 -08:00
Nick Kralevich
72e983d628
am 398f46dd: am a0259b42: Merge "libc: remove bcmp prototype"
...
* commit '398f46dd92fbb72e2a275cddccffdfde384bb3b4':
libc: remove bcmp prototype
2013-02-21 17:42:07 -08:00
Elliott Hughes
448f1f08c2
am caeb0bf5: am 719d46f8: am a9ff09d1: Merge "Fix raise(3) so it works in signal handlers."
...
* commit 'caeb0bf53c8299d53f246573392fd688cae8a625':
Fix raise(3) so it works in signal handlers.
2013-02-21 15:19:55 -08:00
Elliott Hughes
caeb0bf53c
am 719d46f8: am a9ff09d1: Merge "Fix raise(3) so it works in signal handlers."
...
* commit '719d46f8ac4f2af89f8e8927db8c460b91622417':
Fix raise(3) so it works in signal handlers.
2013-02-21 14:21:13 -08:00
The Android Automerger
8f8bc0664a
merge in master-release history after reset to master
2013-02-21 08:30:27 -08:00
Jean-Baptiste Queru
55779c4316
am aa96db5b: (-s ours) am 818b1423: (-s ours) Fix mako builds. Do not merge.
...
* commit 'aa96db5ba0a39d8fac0925871632031d21e1ab3e':
Fix mako builds. Do not merge.
2013-02-20 14:03:19 -08:00
Jean-Baptiste Queru
aa96db5ba0
am 818b1423: (-s ours) Fix mako builds. Do not merge.
...
* commit '818b1423d228e478245a1b0d2fe687606ea1741c':
Fix mako builds. Do not merge.
2013-02-20 14:00:43 -08:00
Ed Heyl
37d6d8e933
Merge remote-tracking branch 'goog/jb-mr2-release'
2013-02-20 13:47:20 -08:00
The Android Automerger
44f8f7b86a
merge in jb-mr2-release history after reset to master
2013-02-20 05:55:13 -08:00
Elliott Hughes
cae2173952
am ccd40316: Merge "use architecture-specific ssize_t definition"
...
* commit 'ccd403161cdcc88a0ffcaecd1bc707e2d4c88a1c':
use architecture-specific ssize_t definition
2013-02-19 14:37:19 -08:00
Elliott Hughes
77272874f8
am 593abb7b: Merge "stdlib: atexit: include <sys/cdefs.h>"
...
* commit '593abb7b593a34d501c90512953a7368add6d185':
stdlib: atexit: include <sys/cdefs.h>
2013-02-19 14:19:33 -08:00
Elliott Hughes
5593d50c72
am eeecff72: Merge "Fix pthreads functions that should return ESRCH."
...
* commit 'eeecff7293efd6becf3b07b8d24cada3d820c894':
Fix pthreads functions that should return ESRCH.
2013-02-19 13:46:37 -08:00
Elliott Hughes
6f55284103
am b5862d4d: Merge "Update linker README."
...
* commit 'b5862d4d8a1246dc1e21695cf3bacafefedf0428':
Update linker README.
2013-02-19 11:39:40 -08:00
The Android Automerger
82232f0e6b
merge in jb-mr2-release history after reset to master
2013-02-19 09:50:40 -08:00
Elliott Hughes
4174337525
am 7f67f78a: Merge "dalvik is big enough and ugly enough to handle System.arraycopy itself."
...
* commit '7f67f78ad5c3da689997edd8fbb5afb6e5fc6355':
dalvik is big enough and ugly enough to handle System.arraycopy itself.
2013-02-15 17:00:58 -08:00
Elliott Hughes
6af19237b7
am 39804dcd: Merge "Fix the pthread_setname_np test."
...
* commit '39804dcde6c1c596285432b28cdb09382ce59663':
Fix the pthread_setname_np test.
2013-02-15 14:48:05 -08:00
Elliott Hughes
15c401d4ac
am 3e3b239d: Merge "Fix the stack protector death test."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3e3b239d2be0c5a92e91385f4f10b8f7da8d2837':
Fix the stack protector death test.
2013-02-14 18:22:16 -08:00
Elliott Hughes
56a007c157
am 0a2cb815: Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a2cb815974ea96af664fa966079966a08916722':
Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.
2013-02-14 15:59:15 -08:00
Nick Kralevich
f93de61e7b
am b128f49f: Merge "bionic: Add securebits.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b128f49fd58beecc5287ddff6366a97e5aa2e468':
bionic: Add securebits.h
2013-02-14 15:05:22 -08:00
Elliott Hughes
7331af73f2
am c2d26ce7: Merge "Turn on -Werror for ssp.cpp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c2d26ce7452e69b9492cd28b7c0271866798658b':
Turn on -Werror for ssp.cpp.
2013-02-14 11:23:48 -08:00
Nick Kralevich
dfa1e59b7d
am fe33fc79: Merge "fix compiler warning."
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fe33fc790a16d85ce4109a4575d6fdcd88d42023':
fix compiler warning.
2013-02-14 09:59:09 -08:00
The Android Automerger
8561261b5e
merge in jb-mr2-release history after reset to master
2013-02-14 05:55:17 -08:00
Elliott Hughes
2346559cb4
am 6b97c7dc: Merge "ffs was not being built for x86."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '6b97c7dc0376577276abbdacc52e5cc11cf8a7fd':
ffs was not being built for x86.
2013-02-13 17:08:07 -08:00
Elliott Hughes
4c897b692d
am 97f2ec50: Merge "Stop using the local gcc."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '97f2ec50a7993d2db7ef4511a251e6823f5dba10':
Stop using the local gcc.
2013-02-13 17:08:07 -08:00
Elliott Hughes
5ca3e4a349
am 95b1ea1b: Merge "Add a bunch more missing ENDs to assembler routines."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '95b1ea1bb3c93369d96045420b91b7617992d8bd':
Add a bunch more missing ENDs to assembler routines.
2013-02-13 15:27:11 -08:00
Elliott Hughes
a7603ff87a
am 2fee0340: Merge "Everyone has CLZ."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2fee0340a93637507de6a860914dc3e14d44ee94':
Everyone has CLZ.
2013-02-13 15:27:10 -08:00
Elliott Hughes
8ca1da6e71
resolved conflicts for merge of 62727429 to master
...
Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e
2013-02-13 13:51:54 -08:00
Elliott Hughes
6aca0ce367
am f659b3c9: Merge "Add a test that getaddrinfo works when hints are NULL."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f659b3c90d8b55a44945af807364a5df0475bd0e':
Add a test that getaddrinfo works when hints are NULL.
2013-02-13 09:18:45 -08:00
Elliott Hughes
2db16ea38e
am 3002d64b: Merge "Everyone has a TLS register."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3002d64bcd4644456803dd0547d20b39e14be02c':
Everyone has a TLS register.
2013-02-13 08:11:24 -08:00
Elliott Hughes
32a2340067
am 9cbe1e63: Merge "Fix __pthread_clone and __bionic_clone error handling on x86."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9cbe1e63ddf8b61b8ded3d357a30c3d6ed67906f':
Fix __pthread_clone and __bionic_clone error handling on x86.
2013-02-13 08:11:23 -08:00
The Android Automerger
d41c26e2d8
merge in jb-mr2-release history after reset to master
2013-02-13 05:55:21 -08:00
Elliott Hughes
a244e4eb61
am baf2c09f: Merge "Put the right number of Ls after 64-bit constants."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'baf2c09f3f47a35b195eb83cc7acffeaf4b6d4e9':
Put the right number of Ls after 64-bit constants.
2013-02-12 20:38:05 -08:00
Elliott Hughes
761b344bff
am 59aeff94: Merge "Use ENTRY/END in custom x86 assembler too."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59aeff94178e03c908791695f6dd4c9bd8c7115b':
Use ENTRY/END in custom x86 assembler too.
2013-02-12 20:17:26 -08:00
Elliott Hughes
bc35693e6b
am 07f7e62a: Merge "Clean up pthread_create."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '07f7e62a259d13208d6186670d3748e339690127':
Clean up pthread_create.
2013-02-12 18:20:10 -08:00
Elliott Hughes
d8ceaf5afa
am 899d6528: Merge "Give up trying to build the pthread_setname_np tests for glibc."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '899d65283db0c78537ed27aa3a6c019000ec05da':
Give up trying to build the pthread_setname_np tests for glibc.
2013-02-12 18:20:09 -08:00
Elliott Hughes
dde1d876b1
am 991ee7d8: Merge "Simplify pthread_create, using more public API."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '991ee7d89574e8d04c8863a2850613073a2f96b3':
Simplify pthread_create, using more public API.
2013-02-12 16:52:26 -08:00
Elliott Hughes
f4e258c22e
am 4912782c: Merge "Really set errno if __pthread_clone fails."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4912782c6af7169686acc9553fb0bb33251b0d0d':
Really set errno if __pthread_clone fails.
2013-02-12 16:23:25 -08:00
Elliott Hughes
78715fca0b
am 558a8b1d: Merge "Revert "Revert "More pthreads cleanup."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '558a8b1d3b31300941af78232f2f7f4cb4e933b9':
Revert "Revert "More pthreads cleanup.""
2013-02-12 16:23:24 -08:00
Dima Zavin
ac480b422a
am 3fa67465: Merge "add factory property file definition"
...
# By Andrew Boie
# Via Andrew Boie (1) and Gerrit Code Review (1)
* commit '3fa67465365baf87f751bea09847e32f01005788':
add factory property file definition
2013-02-12 11:12:49 -08:00
The Android Automerger
1bb43b02ad
merge in jb-mr2-release history after reset to master
2013-02-12 07:10:11 -08:00
Elliott Hughes
191f880bdf
am bfa199ab: am fcaf4e9f: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bfa199ab4019a7de9b95cd3db86c4d7176438803':
Revert "More pthreads cleanup."
2013-02-11 22:20:39 -08:00
Elliott Hughes
23731e841a
am a2a9817f: am 85f491f9: Merge "More pthreads cleanup."
...
# Via Android Git Automerger (1) and others
* commit 'a2a9817f4c08d1f56d90f02ed13f531e8093f8e8':
More pthreads cleanup.
2013-02-11 18:39:32 -08:00
Elliott Hughes
13478d856a
am 605cc293: am 83bf28e6: Merge "Fix MIPS build."
...
# Via Android Git Automerger (1) and others
* commit '605cc29358c9a6d575d097fd4b78a483c9dbf89e':
Fix MIPS build.
2013-02-11 18:23:17 -08:00
Elliott Hughes
0f6882f43d
am 8e2b28cb: am c56be54a: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Android Git Automerger (1) and others
* commit '8e2b28cb6c16d8a5671ccb333965bb56b2990d7a':
Use ENTRY/END in ARM __get_sp.
2013-02-11 18:15:13 -08:00
Elliott Hughes
a2b8b833d2
am c440d244: am cae7b2cf: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Android Git Automerger (1) and others
* commit 'c440d2442361b78196d2935469ecf78d5c3470e5':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 18:15:07 -08:00
Elliott Hughes
b940711587
am 03798dd2: am 1fea0f25: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Android Git Automerger (1) and others
* commit '03798dd23cd3d1dc1ee4c4b0472c75369aa1e10f':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 18:15:04 -08:00
Elliott Hughes
5bb4f54b4d
am 6b73d13f: am 2d3e7233: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Android Git Automerger (1) and others
* commit '6b73d13fa414afeecba6718bf724e8ac922bac39':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 17:34:32 -08:00
Elliott Hughes
1b21249d5a
am e4b08318: am 8397cdba: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'e4b08318c13fac774b233a5459427563d2983f79':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 17:34:30 -08:00
Elliott Hughes
376bce0097
am 024246ec: am 09e89c3c: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Android Git Automerger (1) and others
* commit '024246ec274e30bb4a24468d8319620534e13b34':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 17:34:29 -08:00
The Android Automerger
c087b7a80f
merge in jb-mr2-release history after reset to master
2013-02-11 07:10:25 -08:00
Elliott Hughes
63358ae068
am 8f509e8b: am 9a9bb243: Merge "Switch to using AT_RANDOM for the stack guards."
...
# Via Android Git Automerger (1) and others
* commit '8f509e8be11876023d4bcb3e827ca096f22fc0c5':
Switch to using AT_RANDOM for the stack guards.
2013-02-08 11:43:09 -08:00
Elliott Hughes
01cf1678e7
am 636d21f3: am 03579da2: Merge "Add a few more missing libm long double stubs."
...
# Via Android Git Automerger (1) and others
* commit '636d21f32b8aa9cd3ef7c91c729179e53daddc3a':
Add a few more missing libm long double stubs.
2013-02-07 20:29:44 -08:00
Nick Kralevich
5eef90699d
am f156b901: am fa75fce5: Merge "update xattr.h"
...
# Via Android Git Automerger (1) and others
* commit 'f156b901b1e51971192c573444b5b7f63e6bc22a':
update xattr.h
2013-02-07 20:29:43 -08:00
Elliott Hughes
7d2bc92717
am 86e4e234: am 964886af: Merge "Remove dead code from gensyscalls.py."
...
# Via Android Git Automerger (1) and others
* commit '86e4e23408c157176d20b4baca00eb4d2f7566dc':
Remove dead code from gensyscalls.py.
2013-02-07 20:29:42 -08:00
Elliott Hughes
8c372fc77e
am 5bb67760: am f6afd3b6: Merge "Fix x86 build, remove void* arithmetic."
...
# Via Android Git Automerger (1) and others
* commit '5bb67760f0baddd815334bf87be79f0e7fd9fafe':
Fix x86 build, remove void* arithmetic.
2013-02-07 14:45:28 -08:00
Elliott Hughes
dd698ec89a
am 8ddef40d: am 59e9a496: Merge "__progname should be const char*, not char*."
...
# Via Android Git Automerger (1) and others
* commit '8ddef40dad42372ac5596d48f327f162745d7bb8':
__progname should be const char*, not char*.
2013-02-07 14:45:27 -08:00
Elliott Hughes
389ebfa16f
am 6f67cd22: am 2f41531f: Merge "Clean up the argc/argv/envp/auxv handling."
...
# Via Android Git Automerger (1) and others
* commit '6f67cd224e6ffdfa2619849eb4b9b2ff6c1e2c59':
Clean up the argc/argv/envp/auxv handling.
2013-02-07 14:45:24 -08:00
Robert Greenwalt
a7d9b655e5
Merge "dns cache per interface iteration 2"
2013-02-07 19:02:16 +00:00
Mattias Falk
c63e59039d
dns cache per interface iteration 2
...
name server addresses are read from the dns
cache associated wih the interface on which
the request shall be done.
processes which has requested to issue dns request
using specific interface are now proxied to netd.
added methods to attach/detach a process to a specific
dns cache/interface.
added getaddrinfoforinface method which takes an
interface as an argument.
bug:4815099
bug:5465296
Change-Id: I7a8fe1980cdf99d4d296ddc5c6411f0c72162263
2013-02-07 09:40:16 -08:00
Elliott Hughes
ffc807fdb6
am 4e9d9e4d: am d4187efd: Merge "Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs."
...
# Via Android Git Automerger (1) and others
* commit '4e9d9e4df8309493e65c5ca15513644361fda314':
Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs.
2013-02-07 09:17:14 -08:00
The Android Automerger
a3e0f95fba
merge in jb-mr2-release history after reset to master
2013-02-07 07:10:16 -08:00
Elliott Hughes
001437e861
am 09559dd0: am d32fdbaf: Merge "Add a missing logbl stub."
...
# Via Android Git Automerger (1) and others
* commit '09559dd04604dae062a2a50ce8dc78fd7d0e4a2f':
Add a missing logbl stub.
2013-02-06 19:45:01 -08:00
Elliott Hughes
5dc29e97a6
am d2a6d8d7: am c9ab32e4: Merge "Improve benchmarking tool, add a few math benchmarks."
...
# Via Android Git Automerger (1) and others
* commit 'd2a6d8d77d1052b2cef7c0296d1396da5d3f7736':
Improve benchmarking tool, add a few math benchmarks.
2013-02-06 19:44:53 -08:00
Elliott Hughes
4b9ed9e153
am 5fe28661: am d10a5a02: Merge "Remove the currently-unused i387 assembler to make way for the new."
...
# Via Android Git Automerger (1) and others
* commit '5fe286618ffea7cb8872a74501bf36d5036ca2a9':
Remove the currently-unused i387 assembler to make way for the new.
2013-02-06 12:27:59 -08:00
Elliott Hughes
1c3039301b
am 0e51a861: am 4fc2a74b: Merge "Remove partial implementation of MIPS non-PIC support."
...
# Via Android Git Automerger (1) and others
* commit '0e51a861241ea49455c519890b34e80eccfd4709':
Remove partial implementation of MIPS non-PIC support.
2013-02-06 11:55:06 -08:00
The Android Automerger
a9ebf6c951
merge in jb-mr2-release history after reset to master
2013-02-06 07:10:08 -08:00
Elliott Hughes
6dd470d4d0
am df8c72e5: am d7ff139f: Merge "Remove bogus extra alignment from sbrk."
...
# Via Android Git Automerger (1) and others
* commit 'df8c72e510ae9d0a9970a31555ea51ea0c8f19ca':
Remove bogus extra alignment from sbrk.
2013-02-05 17:14:50 -08:00
The Android Automerger
d418c2bd0a
merge in jb-mr2-release history after reset to master
2013-02-05 07:10:12 -08:00
Elliott Hughes
303339e8d1
am 3cbcb87b: am a4f88fdc: Merge "Document the mallinfo struct, add missing attributes."
...
# Via Android Git Automerger (1) and others
* commit '3cbcb87bd1e86bd2bdb218fd324648e5bc7e8260':
Document the mallinfo struct, add missing attributes.
2013-02-04 17:19:44 -08:00
Elliott Hughes
d1f2fafb72
am 384bdb37: am a3120aaf: Merge "Add basic tests for posix_memalign."
...
# Via Android Git Automerger (1) and others
* commit '384bdb3776bedaf22e8f1a3dfe7c6118b4bcefa4':
Add basic tests for posix_memalign.
2013-02-04 17:19:34 -08:00
Elliott Hughes
b72952171b
am ada6de67: (-s ours) am a1821f01: Merge "Regenerate msm_ion.h."
...
# Via Android Git Automerger (1) and others
* commit 'ada6de673be2a66bcfa822e0bb895219391c22a8':
Regenerate msm_ion.h.
2013-02-04 17:00:26 -08:00
Elliott Hughes
54a2587446
am 16444e0f: am 3dc6b57c: Merge "Don\'t claim there were no leaks if we weren\'t even checking."
...
# Via Android Git Automerger (1) and others
* commit '16444e0f85585508e74d6166b8bbb4acb19738a0':
Don't claim there were no leaks if we weren't even checking.
2013-02-04 11:29:33 -08:00
Elliott Hughes
46b3f0bb97
am 33e4365d: am 1bf83555: Merge "Make sincosl call sinl and cosl."
...
# Via Android Git Automerger (1) and others
* commit '33e4365d87364d8d9c8c4427255050b5e9b8cffe':
Make sincosl call sinl and cosl.
2013-02-04 11:29:26 -08:00
Elliott Hughes
9cdd76954d
am 422c400d: am ae70b946: Merge "Update the libm/NOTICE file after the upgrade."
...
# Via Android Git Automerger (1) and others
* commit '422c400dd3f6f2fdf096dc33da5b7033b6a58a10':
Update the libm/NOTICE file after the upgrade.
2013-02-04 11:29:25 -08:00
Elliott Hughes
96a5819afb
am 704d9c5b: am a9dd3670: Merge "Restore bionic\'s <linux/elf-em.h>."
...
# Via Android Git Automerger (1) and others
* commit '704d9c5b45515cc2421bfe3b37c93117da0a1334':
Restore bionic's <linux/elf-em.h>.
2013-02-04 11:29:24 -08:00
Elliott Hughes
fb7a4850b8
am ff26e25b: am 44badc70: Merge "Upgrade libm."
...
# Via Android Git Automerger (1) and others
* commit 'ff26e25b51eb672a4c8244946e0f2b4328786f55':
Upgrade libm.
2013-02-04 11:29:22 -08:00
The Android Automerger
37247ae63c
merge in jb-mr2-release history after reset to master
2013-02-04 07:10:06 -08:00
Brian Muramatsu
322c7edba3
Remove MSM headers
...
Bug 7115545
These headers will be moved to hardware/qcom/msm8960 project.
Change-Id: Idb970c196be239e186e0a406d19135aa27225aca
2013-02-01 16:28:40 -08:00
The Android Automerger
3c72524611
merge in jb-mr2-release history after reset to master
2013-01-31 07:10:09 -08:00
Elliott Hughes
8db7a4cb20
am 9743d7fb: am fb55511e: am e1a124e5: Merge "Say explicitly if there were no leaks."
...
# Via Android Git Automerger (2) and others
* commit '9743d7fb60836229fde0fbdbd9fb87c78eaa00b7':
Say explicitly if there were no leaks.
2013-01-30 12:27:12 -08:00
Elliott Hughes
0243962d20
am 9d43c079: am 4e882503: am a990cf5b: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Android Git Automerger (2) and others
* commit '9d43c079875ebd2540daccb180e9d6d0fa06061d':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:33:52 -08:00
The Android Automerger
4c59597089
merge in jb-mr2-release history after reset to master
2013-01-30 07:10:15 -08:00
Elliott Hughes
8dfe0daf6f
am 5821e11d: am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."
...
# Via Android Git Automerger (2) and others
* commit '5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8':
Fix valgrind build.
2013-01-29 18:11:34 -08:00
Elliott Hughes
278c059663
am 9d995d67: am 1cc09402: am f6721978: Merge "Fix x86 build to use <elf.h>."
...
# Via Android Git Automerger (2) and others
* commit '9d995d67217e44e022c9e5d0767634fa81f87b78':
Fix x86 build to use <elf.h>.
2013-01-29 17:09:13 -08:00
Elliott Hughes
d9397a7c5e
am 0a383883: am be11de2b: am 5fb409b7: Merge "Bring the NOTICE files back up to date."
...
# Via Android Git Automerger (2) and others
* commit '0a383883fa3d358ff4af6b653a0918f4cd01ef7e':
Bring the NOTICE files back up to date.
2013-01-29 17:09:12 -08:00
Elliott Hughes
a1b8c145cb
am a7f44b5a: am 172e038f: am f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
...
# Via Android Git Automerger (2) and others
* commit 'a7f44b5afe64199eeee715e613c7d42d2724232c':
Use the NetBSD <sys/exec_elf.h>.
2013-01-29 17:09:11 -08:00
Elliott Hughes
3638641014
am f5d6238c: am 3f20ecc2: am 3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
...
# Via Android Git Automerger (2) and others
* commit 'f5d6238c4b6433f193c6d06c1dd89110b497e449':
Don't collect useless stack frames; do demangle C++ symbols.
2013-01-29 12:09:31 -08:00
The Android Automerger
2a523d1a06
merge in jb-mr2-release history after reset to master
2013-01-29 07:10:09 -08:00
Elliott Hughes
62228694a0
am 2218b89c: am d383ac15: am a0151cbf: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (2) and others
* commit '2218b89ca7017e3f1cdb0641528787cd9985501a':
Unit tests for formatting code, fix %%.
2013-01-28 14:14:44 -08:00
The Android Automerger
8482fbb691
merge in jb-mr2-release history after reset to master
2013-01-28 07:10:05 -08:00
Elliott Hughes
609ca692a9
am d265d367: am f07db754: am 0a91b11d: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (2) and others
* commit 'd265d3674937651d23a0252e6aad0ee09b02492a':
More debug malloc fixes.
2013-01-25 18:11:55 -08:00
Iliyan Malchev
ac10757e2a
Merge "bionic: update processed msm_vidc_enc.h"
2013-01-26 01:41:55 +00:00
Elliott Hughes
98ce9888b1
am 88af7232: am 7ae99845: am 6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (2) and others
* commit '88af723267e86c7b2a685f97c6e442d3766ad9a9':
arm syscall : for eabi call_default don't use stack
2013-01-25 17:11:52 -08:00
Nick Kralevich
85e76a3652
am 2ebcd19c: am 27818d2a: am b871e5d6: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (2) and others
* commit '2ebcd19cbc42c5edce189df630a48feb9ffec16d':
system_properties: do more checking of file
2013-01-25 17:11:51 -08:00
Iliyan Malchev
3eaa03df03
bionic: update processed msm_vidc_enc.h
...
Change-Id: If9aeec6f43b8b2951d1372042c884cd0e01f0a5a
Signed-off-by: Iliyan Malchev <malchev@google.com >
2013-01-25 11:26:53 -08:00
The Android Automerger
0f01df7fc9
merge in jb-mr2-release history after reset to master
2013-01-25 07:10:05 -08:00
Nick Kralevich
ddbb728eff
am 151e91e6: am da2d2c61: am 82ef8296: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (2) and others
* commit '151e91e66c95a7e415903b87b8157a9bc422df45':
prctl.h: include sys/cdefs.h
2013-01-24 16:15:39 -08:00
Nick Kralevich
472fdc95a6
am b8726037: am e7d937b5: am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'b8726037ee1100e2704e90d0a54ea2313bf96b00':
libc: use more secure system properties if available
2013-01-23 16:16:06 -08:00
Nick Kralevich
f5b111df06
am b8726037: am e7d937b5: am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'b8726037ee1100e2704e90d0a54ea2313bf96b00':
libc: use more secure system properties if available
2013-01-23 11:12:07 -08:00
The Android Automerger
d72183aa16
merge in jb-mr2-release history after reset to master
2013-01-23 07:10:07 -08:00
Elliott Hughes
828aaaac5e
am c08ab018: am 40107623: am 778a68e1: Merge "Don\'t free anything when reporting leaks."
...
* commit 'c08ab018ad133a4e177013d79be547fd55968eac':
Don't free anything when reporting leaks.
2013-01-22 22:16:11 -08:00
Elliott Hughes
9d28f5bf4a
am ce8732b1: am 552e02fa: am 5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit 'ce8732b188d96f4c313d20e6be17362a508f572d':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:16:10 -08:00
Elliott Hughes
28fa8e109e
am a8e0f2b9: am b16ec162: am 28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'a8e0f2b956b5a31311d778b478e63093bc2cac7a':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:31:20 -08:00
Elliott Hughes
7f0976ef0e
am 5f79f75b: am 57edf36c: am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '5f79f75ba6241ca9cab42e69a68d66d1ca28e031':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:36:26 -08:00
Elliott Hughes
774cef56ee
am ad551eaa: am 5f7b6b83: am 547eba0a: Merge "Avoid overflow in memccpy."
...
* commit 'ad551eaa0429bf5085f2901c5d367e8a54b7ed16':
Avoid overflow in memccpy.
2013-01-22 15:23:53 -08:00
Elliott Hughes
bdd209561e
am 1029364e: am e8e1f34a: am 85597e2b: Merge "Clean up debuggerd-related logging."
...
* commit '1029364ec5710755164ec9a7f0fe625cc184bb60':
Clean up debuggerd-related logging.
2013-01-22 15:23:49 -08:00
Elliott Hughes
0b9b068b3f
am 0dfb2eca: am 0609c0fe: am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0dfb2ecaab681e27fa81462daec9882ebcf36edc':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 15:23:48 -08:00
Nick Kralevich
f27874740f
Revert "libc: make system properties more secure."
...
This reverts commit f10c5a2215 .
Bug: 8045561
2013-01-22 15:21:01 -08:00
Nick Kralevich
0acf4069e9
am 98ae1a85: am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '98ae1a85b057f6534bee7e52897a80694ba8b2e1':
bionic_auxv.h: fix #define conflict
2013-01-22 13:46:31 -08:00
Nick Kralevich
25e3f4a90d
Merge "Revert "libc: make system properties more secure.""
2013-01-22 21:26:18 +00:00
Nick Kralevich
8897a9565a
Revert "libc: make system properties more secure."
...
This reverts commit f10c5a2215 .
Bug: 8045561
2013-01-22 12:44:11 -08:00
Elliott Hughes
f669fdf11e
am 04afcd25: am 8ef83bc4: am 02f96b9d: Merge "Add missing extern "C"."
...
* commit '04afcd25a3758090009d3261f4c573b8ed73e03a':
Add missing extern "C".
2013-01-22 11:35:50 -08:00
Elliott Hughes
16f7b78fd1
am 4cd5703b: am 75b64a1b: am ca483765: Merge "Fix the duplication in the debugging code."
...
* commit '4cd5703b9eef30a32271819503808576666e1601':
Fix the duplication in the debugging code.
2013-01-22 10:05:19 -08:00
The Android Automerger
5f0de35c3e
merge in jb-mr2-release history after reset to master
2013-01-21 07:10:08 -08:00
Robert Greenwalt
1136b7d821
Merge "Revert "dns cache per interface iteration 2""
2013-01-19 00:40:38 +00:00
Robert Greenwalt
b002a2ff77
Revert "dns cache per interface iteration 2"
...
This reverts commit f1464ff956
Change-Id: I3496b9a8cb54614fe3eea016d1391c8a89f3db38
2013-01-19 00:40:24 +00:00
Geremy Condra
b1d1a7682f
Merge "libc: make system properties more secure."
2013-01-19 00:26:23 +00:00
Nick Kralevich
f10c5a2215
libc: make system properties more secure.
...
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.
Related to bug: 8029617
Change-Id: I5717e51f20f9e4339ed0a1fdf2fc797e52670fbb
2013-01-18 14:30:07 -08:00
Nick Kralevich
c82bc4f472
am 9468ee53: am f246ae98: am 5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit '9468ee53ac01a86255bd00976d8aa5a1a4141020':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 14:01:54 -08:00
The Android Automerger
f73a885f53
merge in jb-mr2-release history after reset to master
2013-01-18 07:10:09 -08:00
Guang Zhu
bf1d225593
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-17 23:25:24 -08:00
Nick Kralevich
c5c99adeed
am 8e833972: am 0a0c2321: am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
...
* commit '8e833972c2506267024136a0f609bdbb26dcc498':
FORTIFY_SOURCE: optimize
2013-01-17 17:08:21 -08:00
Elliott Hughes
e230306135
am a4723742: am 261e9d08: am e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit 'a4723742c1ee0daa2ec17a148334c548b5edf3a8':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:53:57 -08:00
Nick Kralevich
dbcf3ed458
am 36c4eb18: am 3a72fe58: am f3fe1945: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit '36c4eb188c6594db877bd7b9f46c55264180dc3f':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 11:34:20 -08:00
Robert Greenwalt
89f9b30e4d
Merge "dns cache per interface iteration 2"
2013-01-17 16:14:52 +00:00
The Android Automerger
ff1c00a29e
merge in jb-mr2-release history after reset to master
2013-01-17 07:10:10 -08:00
Nick Kralevich
927d904d52
am 91bc5865: am 8d01c055: am 1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '91bc5865a333212e7cac934b0a2ac7c522911d58':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:58:04 -08:00
Nick Kralevich
bcd18c0485
am 27ff1ae4: am de666485: am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit '27ff1ae414915789b27d0a485ff6d856ae742aad':
stack protector: use AT_RANDOM
2013-01-16 13:34:46 -08:00
Nick Kralevich
dde6b88a9f
am 079e4356: am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '079e4356550030e8bacec86b8aa058ade2b7142c':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 13:34:45 -08:00
Elliott Hughes
31ecd0c342
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.""
2013-01-16 13:31:35 -08:00
The Android Automerger
b3aff045b2
merge in jb-mr2-release history after reset to master
2013-01-16 10:08:57 -08:00
Elliott Hughes
1a18895ebc
am e05709b1: am e611fad0: am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit 'e05709b1df7dba98c37e83f84dcbd2ad8429bcfc':
Fix signalfd for MIPS.
2013-01-16 09:50:42 -08:00
The Android Automerger
27b8421a15
merge in master-release history after reset to master
2013-01-16 07:49:04 -08:00
Elliott Hughes
7cfe0d2602
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.""
2013-01-15 13:40:39 -08:00
Nick Kralevich
0112ee2190
am d29c9fc1: am b59e358b: Merge "fix strerror_r test"
...
* commit 'd29c9fc18860a41f59d390b4aab937b61dd63ea1':
fix strerror_r test
2013-01-15 11:20:23 -08:00
The Android Automerger
e7cc7957ac
merge in master-release history after reset to master
2013-01-15 07:49:22 -08:00
Ben Cheng
6405103a32
am 4130af46: am b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
...
* commit '4130af46bf120ac82ed61453215c7a692d84c1dd':
Add __aeabi_idiv to the dummy reference list.
2013-01-14 18:01:35 -08:00
Nick Kralevich
9e22af2363
am 1519690c: am 29fe857e: Merge "headers: update auxvec.h from Linux kernel"
...
* commit '1519690cfb27af79627a8d39bf158a1feca953e3':
headers: update auxvec.h from Linux kernel
2013-01-14 14:38:36 -08:00
Ben Cheng
86050b9e92
Merge "Add __aeabi_idiv to the dummy reference list."
2013-01-14 13:36:33 -08:00
Ben Cheng
a4e964d200
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
2013-01-14 11:27:29 -08:00
Ian Rogers
7f7f232f4a
am 763d4bb3: am 68fa57f0: Merge "Name anonymous mmap mallocs."
...
* commit '763d4bb345b2e8882dd39d0656ee9f23ca1d0512':
Name anonymous mmap mallocs.
2013-01-14 11:22:56 -08:00
Nick Kralevich
1165da8390
am 13bd3716: am bb897fa9: Merge "libc_init_static: apply relro earlier."
...
* commit '13bd37160ee340ddcf7e1fb57251b124e0ec69c1':
libc_init_static: apply relro earlier.
2013-01-14 10:34:45 -08:00
Elliott Hughes
32cefdbc7a
am 375db86a: am 09d13c39: Merge "Fix my git mistake."
...
* commit '375db86aeaedfe716b69a62f81a2484ee446d5e5':
Fix my git mistake.
2013-01-14 10:34:44 -08:00
Elliott Hughes
14ab1a63d6
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
2013-01-14 09:50:50 -08:00
The Android Automerger
76c8c61517
merge in master-release history after reset to master
2013-01-14 07:49:05 -08:00
Nick Kralevich
8ffe08c86b
am fdd6dfa8: am 2c5153b0: libc: add getauxval()
...
* commit 'fdd6dfa863ea73251b5d59990e239854c31ecee3':
libc: add getauxval()
2013-01-11 17:04:04 -08:00
Mattias Falk
f1464ff956
dns cache per interface iteration 2
...
name server addresses are read from the dns
cache associated wih the interface on which
the request shall be done.
processes which has requested to issue dns request
using specific interface are now proxied to netd.
added methods to attach/detach a process to a specific
dns cache/interface.
added getaddrinfoforinface method which takes an
interface as an argument.
Change-Id: I851ec8ab8ce3112626ad2a729078b91d013f32fd
bug:4815099
bug:5465296
2013-01-11 15:47:27 -08:00
Nick Kralevich
0529a52c60
am d0f81466: am 69c89942: Merge "Add stack canaries / strcpy tests."
...
* commit 'd0f81466e4e8e4179054a484cf6145efedfd7cb5':
Add stack canaries / strcpy tests.
2013-01-11 11:31:07 -08:00
Wink Saville
8deebb34d3
am 801aeefe: am a12c5445: Fix unused warnings in pthread.c
...
* commit '801aeefe2d77a957172c3994f1c20cd0ac8d9bd8':
Fix unused warnings in pthread.c
2013-01-11 10:54:50 -08:00
Elliott Hughes
376889ad71
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).
2013-01-11 10:54:43 -08:00
Elliott Hughes
73dd37d8fe
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.
2013-01-11 10:54:25 -08:00
Elliott Hughes
7e29f81163
am 4ff6fa97: am 2bbb8fac: Merge "Add signalfd call to bionic"
...
* commit '4ff6fa97e7cf247e17600cf0d64911c1579df841':
Add signalfd call to bionic
2013-01-11 10:54:02 -08:00
The Android Automerger
ef06105819
merge in master-release history after reset to master
2013-01-11 07:49:08 -08:00
Robert Greenwalt
d09bdc7148
Merge "Cache negative DNS results."
2013-01-10 14:30:37 -08:00
Elliott Hughes
19dd1567a0
Revert "Add signalfd call to bionic"
...
This reverts commit 0c11611c11
Change-Id: I1a2beae7ed66ec995fdf6c96c53c35598ac6cde0
2013-01-10 10:47:58 -08:00
Rom Lemarchand
0c11611c11
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
2013-01-10 10:25:42 -08:00
Robert Greenwalt
78851f10d1
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
2013-01-09 16:36:33 -08:00
The Android Automerger
8868be3a9f
merge in master-release history after reset to master
2013-01-09 07:49:04 -08:00
Elliott Hughes
5043c376c9
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.
2013-01-08 10:27:20 -08:00
Elliott Hughes
76187899a6
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.
2013-01-08 10:27:15 -08:00
Elliott Hughes
375e10f739
am 2458d06f: am 26c5b2d4: Merge "[MIPS] Rewrite fenv.h for Android"
...
* commit '2458d06fc17ade76a8e2ae980a1e38f36350c6ee':
[MIPS] Rewrite fenv.h for Android
2013-01-08 10:27:14 -08:00
The Android Automerger
326cb73c58
merge in master-release history after reset to master
2013-01-04 07:49:06 -08:00
Elliott Hughes
00ab4eb0db
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).
2013-01-03 17:05:12 -08:00
Elliott Hughes
8dd63f31ba
am 81508de3: am f0036944: Merge "Fix debug malloc."
...
* commit '81508de3d277db2ef3c8aa55b57ce3ce0a142e48':
Fix debug malloc.
2013-01-03 16:47:22 -08:00
Elliott Hughes
27a7a5c138
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)...
2013-01-03 12:10:17 -08:00
The Android Automerger
5c532dc8ee
merge in master-release history after reset to master
2013-01-03 07:49:09 -08:00
Elliott Hughes
e9d6575e10
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).
2013-01-02 16:35:08 -08:00
The Android Automerger
803bd660b6
merge in master-release history after reset to master
2012-12-31 07:49:13 -08:00
Elliott Hughes
36a9f354c0
am c0c05ff8: am 918d776f: Merge "Support System.loadLibrary for libraries with transitive dependencies."
...
* commit 'c0c05ff8ecfe5f27aedcd6315e191245aa7b4824':
Support System.loadLibrary for libraries with transitive dependencies.
2012-12-28 09:48:19 -08:00
Elliott Hughes
0ce87c8984
am df5c77c9: am f6524f8b: Merge "Fix format_number."
...
* commit 'df5c77c91a276a79d05f58241df3695b56422d54':
Fix format_number.
2012-12-28 09:46:53 -08:00
The Android Automerger
2937d9ab54
merge in master-release history after reset to master
2012-12-20 07:49:12 -08:00
Elliott Hughes
d020802e37
am 5fd31f68: am 4b582142: Merge "Fix x86 dynamic linker build."
...
* commit '5fd31f6891a6e0b5db84c4c7992d0a4b08f3dddd':
Fix x86 dynamic linker build.
2012-12-19 09:51:36 -08:00
The Android Automerger
efe3ca7b48
merge in master-release history after reset to master
2012-12-19 07:49:06 -08:00
Elliott Hughes
05ab167cf7
am a0edecf3: am a4ebdcf5: Merge "Check for unknown flags passed to dlopen(3)."
...
* commit 'a0edecf3438d036ee2353076d171ee68939c2a5e':
Check for unknown flags passed to dlopen(3).
2012-12-18 19:44:10 -08:00
The Android Automerger
b9cb7ee082
merge in master-release history after reset to master
2012-12-12 07:49:10 -08:00
Elliott Hughes
78b90c744d
am 607bd477: am 4c4b08a3: Merge "Fix <endian.h> and <sys/endian.h>."
...
* commit '607bd47707680db36f377c5e8fc330953fd407e7':
Fix <endian.h> and <sys/endian.h>.
2012-12-11 17:29:17 -08:00
The Android Automerger
f096529317
merge in master-release history after reset to master
2012-12-11 07:49:16 -08:00
Elliott Hughes
42d7a26d23
am f822e7f6: am 0521ff82: Merge "Use pthread_kill() in raise()"
...
* commit 'f822e7f68eec30bb175ccb46cd379f4a060b6c74':
Use pthread_kill() in raise()
2012-12-10 11:42:06 -08:00
The Android Automerger
d08e76cd35
merge in master-release history after reset to master
2012-12-10 07:49:11 -08:00
Geremy Condra
edb53b3e9d
am 28996f80: am 6fcf1770: Merge "Added audit.h from the kernel."
...
* commit '28996f80064579566d5a2ec5c69a00ef159a7e32':
Added audit.h from the kernel.
2012-12-07 14:34:12 -08:00
Nick Kralevich
a710682db3
am 080210c1: am c8354f50: Merge "FORTIFY_SOURCE: remove memcpy overlap checks"
...
* commit '080210c16a3c233dacf26dda168932a475fdd40b':
FORTIFY_SOURCE: remove memcpy overlap checks
2012-12-07 12:24:08 -08:00
Nick Kralevich
5e6213af54
am 79e1a01e: am 5dfdb701: Merge "FORTIFY_SOURCE: fix up previous commit"
...
* commit '79e1a01e9e994d88e17f6d11819dcfd35cfa5e19':
FORTIFY_SOURCE: fix up previous commit
2012-12-07 12:24:07 -08:00
The Android Automerger
439bc8d540
merge in master-release history after reset to master
2012-12-06 07:49:14 -08:00
Nick Kralevich
1c88362021
am 8717c3db: am 7a34ed2b: Merge "clean up FORTIFY_SOURCE handling."
...
* commit '8717c3db2f864226bb68c7e26ad73fcff1212b31':
clean up FORTIFY_SOURCE handling.
2012-12-05 08:25:37 -08:00
The Android Automerger
c3d031ee91
merge in master-release history after reset to master
2012-12-05 07:49:06 -08:00
Nick Kralevich
babe7e16a1
am ded6e3bf: am db79e827: Merge "FORTIFY_SOURCE: fortify strrchr"
...
* commit 'ded6e3bfca3010350d58d93f5f0f5cea256a4f73':
FORTIFY_SOURCE: fortify strrchr
2012-12-04 11:45:28 -08:00
The Android Automerger
49dd0409e0
merge in master-release history after reset to master
2012-12-04 07:49:13 -08:00
Elliott Hughes
a03b2b075f
am 3960fb60: am 60fb6833: Merge "mmap: Remove madvise() workaround"
...
* commit '3960fb602ce0346aecae7eede0f5d2bc1f7463ed':
mmap: Remove madvise() workaround
2012-12-03 09:38:44 -08:00
Elliott Hughes
db11fdef1a
am 43701d68: am 46d64ed2: Merge "Add argument checking to sigemptyset(3) and friends."
...
* commit '43701d68a90b161c64aa354a7d3e4ad9234a3174':
Add argument checking to sigemptyset(3) and friends.
2012-12-03 07:55:38 -08:00
The Android Automerger
ae7af291e6
merge in master-release history after reset to master
2012-12-03 07:49:12 -08:00
Nick Kralevich
59b8677562
am 4140d90c: am 3acc908c: Merge "FORTIFY_SOURCE: fortify strchr"
...
* commit '4140d90c60e0a9b5b2f1b8ad3d17e169f7288ae9':
FORTIFY_SOURCE: fortify strchr
2012-11-30 18:47:06 -08:00
Elliott Hughes
dcb8209409
am 7beaa502: am 16c61f08: Merge "Reduce the exposure of the __set_errno implementation detail."
...
* commit '7beaa5024f083431ca74ee73b01f5ad1e5b4198f':
Reduce the exposure of the __set_errno implementation detail.
2012-11-30 14:46:50 -08:00
Elliott Hughes
2e51dc444f
am 4835e6ef: am 97b70b2b: Merge "Replace .S version of x86 crtfiles with .c version"
...
* commit '4835e6ef519fc941651bbc13909cff971a6ec81b':
Replace .S version of x86 crtfiles with .c version
2012-11-30 10:16:06 -08:00
The Android Automerger
3fa99562ea
merge in master-release history after reset to master
2012-11-30 07:49:20 -08:00
Elliott Hughes
4ef6bc2e62
am 55210f74: am 07c0b73a: Merge "Remove (near-)duplicate definitions of size_t and ssize_t."
...
* commit '55210f74c71899b16f068bf30d7c9c5e647c490d':
Remove (near-)duplicate definitions of size_t and ssize_t.
2012-11-29 19:45:27 -08:00
Elliott Hughes
4ad0910774
am c5861c09: am 50e62e40: Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"
...
* commit 'c5861c09d5be632c2d42a8dcbd3eba97bdf80e0d':
Bug: __WINT_TYPE__ and wint_t reference to different types
2012-11-29 15:59:48 -08:00
The Android Open Source Project
e12a238d41
am d6d5cbb0: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'd6d5cbb02a263bb8b5ae9e3721b3ee80575c110a':
msm_mdp: Update header for 4 layer support
2012-11-29 15:42:37 -08:00
Elliott Hughes
e8be11969f
am 9ea86011: am 99ea84b1: Merge "[MIPS] Fix the MIPS getsid system call"
...
* commit '9ea86011a2c379b58df8c5b92efddf6764a57084':
[MIPS] Fix the MIPS getsid system call
2012-11-29 15:15:33 -08:00
Elliott Hughes
7492875448
am 852935b6: am 5d4b8421: Merge "Verify architecture neutral syscall numbers"
...
* commit '852935b68f8b516f9f3f9cdff410b6a4b0cefc28':
Verify architecture neutral syscall numbers
2012-11-29 15:15:33 -08:00
Elliott Hughes
3b48de92c7
am 56eb0bfe: am 78114220: Merge "Define DEFFILEMODE and friends"
...
* commit '56eb0bfedb5747407f1db5145f571695450c178d':
Define DEFFILEMODE and friends
2012-11-29 15:15:27 -08:00
Naseer Ahmed
80a161db5c
am ef7eea55: am 940e4c9d: am f61e5020: msm_mdp: Update header for 4 layer support
...
* commit 'ef7eea5538308d4a6d40cf964a6676409e890c24':
msm_mdp: Update header for 4 layer support
2012-11-29 15:12:33 -08:00
The Android Automerger
d8366eae3b
merge in master-release history after reset to master
2012-11-28 07:49:16 -08:00
Elliott Hughes
321b545ad9
am dea13da3: Merge "Clean up _BYTE_ORDER definitions for better x86 portability."
...
* commit 'dea13da3407873e4f3fec9ba1a04b4fdacea07f4':
Clean up _BYTE_ORDER definitions for better x86 portability.
2012-11-27 18:44:17 -08:00
The Android Automerger
947f74dc95
merge in master-release history after reset to master
2012-11-27 07:49:30 -08:00
Elliott Hughes
4867b00666
am f2de6b0f: Merge "Do not include \'\0\' when writing error messages to stderr"
...
* commit 'f2de6b0f6e873f9cb28682b8fc6764b0ab41c6ee':
Do not include '\0' when writing error messages to stderr
2012-11-26 16:04:19 -08:00
Elliott Hughes
03ff63cee0
am 429b05a1: Merge "Upgrade to tzdata2012j."
...
* commit '429b05a1dfa71c6085590d60e0bdfa09beb50844':
Upgrade to tzdata2012j.
2012-11-26 15:12:30 -08:00
The Android Automerger
72f43a929f
merge in master-release history after reset to master
2012-11-20 07:49:04 -08:00
Nick Kralevich
c16ea16134
am 8784709a: Merge "We should use load_bias. This patch fixes MIPS NDK device exception test failures."
...
* commit '8784709a2cfe6d32b5fff2c6b826b8d9cbf73d7b':
We should use load_bias. This patch fixes MIPS NDK device exception test failures.
2012-11-19 11:08:49 -08:00
The Android Automerger
8dd20fcd88
merge in master-release history after reset to master
2012-11-19 07:49:16 -08:00
Robert Greenwalt
3269d63772
Merge "Add search domain to dns interface data."
2012-11-16 12:21:33 -08:00
Nick Kralevich
3a681c8db1
am fe07ca04: Merge "Support GNU_RELRO for static executables."
...
* commit 'fe07ca04e4af6c43d068df0e23dc83431053fc22':
Support GNU_RELRO for static executables.
2012-11-16 11:27:30 -08:00
Nick Kralevich
aec9a254a2
am 170168cd: Merge "Temporarily address gcc 4.7 breakage."
...
* commit '170168cdf37111b45b15817fab9e3df54cbc27b7':
Temporarily address gcc 4.7 breakage.
2012-11-16 10:42:55 -08:00
Robert Greenwalt
6f3222ea42
Add search domain to dns interface data.
...
This doesn't currently use this info - it's still using the system
property based data-passing. That change is comming.
bug:6799630
Change-Id: I725463209855447cd04bf1457281f3084fffd692
2012-11-13 11:50:57 -08:00
The Android Automerger
5b3aa025f3
merge in master-release history after reset to master
2012-11-12 07:49:10 -08:00
Elliott Hughes
da273a17e7
am c079dfe4: am 6542ac03: Merge "Add a memmove(3) benchmark."
...
* commit 'c079dfe4153941e6da881be9a143b41a1112c2ac':
Add a memmove(3) benchmark.
2012-11-09 22:44:35 -08:00
Elliott Hughes
02a6ca7ef5
am d86d713b: am b62e2770: Merge "Add optimized version of memset for Cortex A9"
...
* commit 'd86d713b6345ac9c030aeb0eedee11fc17d2fba1':
Add optimized version of memset for Cortex A9
2012-11-09 22:44:17 -08:00
The Android Automerger
6aa473274c
merge in master-release history after reset to master
2012-11-09 07:49:12 -08:00
Elliott Hughes
b3dc5c60aa
am 0b25791a: am 49677dec: Merge "Add optimized version of memcpy for Cortex A9"
...
* commit '0b25791a2819e01b28f777901facd5db03ba6961':
Add optimized version of memcpy for Cortex A9
2012-11-08 18:18:35 -08:00
Elliott Hughes
aad391b8a6
am 6181aead: am c2132915: Merge "Add optimized version of memcmp for Cortex A9"
...
* commit '6181aead7b052503518d3c4ee836b7e9ddeca157':
Add optimized version of memcmp for Cortex A9
2012-11-08 18:11:55 -08:00
Elliott Hughes
1233104f5e
am 66eada96: am 7aca3103: Merge "Simple google3-compatible benchmarking."
...
* commit '66eada963290104e56a3c1785ff8a08ee5d800b5':
Simple google3-compatible benchmarking.
2012-11-08 18:11:54 -08:00
Elliott Hughes
dfaf06ac03
am 70827cc8: am d460f3f1: Merge "Tests for string routines."
...
* commit '70827cc85ad8f7085131ff9c8d1e69bc80f9a9f3':
Tests for string routines.
2012-11-08 09:33:57 -08:00
The Android Automerger
930a507786
merge in master-release history after reset to master
2012-11-08 07:49:11 -08:00
Elliott Hughes
2c9590664f
am e4180f85: am 5408ac3c: Merge "Fix dlopen_library_with_only_gnu_hash_Test."
...
* commit 'e4180f85b717a4aec8024babda394221ba177c26':
Fix dlopen_library_with_only_gnu_hash_Test.
2012-11-07 18:36:34 -08:00
The Android Automerger
bace2c47d3
merge in master-release history after reset to master
2012-11-07 07:49:17 -08:00
The Android Open Source Project
d15c8737ce
am 92b7fbf8: (-s ours) am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '92b7fbf8725fed5bfa3cae7c26d09e813b3ae920':
2012-11-06 11:18:49 -08:00
Elliott Hughes
d052eb6b47
am 8baaf6ff: am 604a163e: Merge "Rewrite <fenv.h> for ARM."
...
* commit '8baaf6ff9617ea5d0e49ca4a954c1b01cc306cbc':
Rewrite <fenv.h> for ARM.
2012-11-05 16:57:23 -08:00
Elliott Hughes
dc20297f8d
am 06224085: am bb91e9fb: Merge "Upgrade to tzdata2012i."
...
* commit '062240853d75a795db956965cacd4ab09a959ce7':
Upgrade to tzdata2012i.
2012-11-05 11:34:20 -08:00
Elliott Hughes
da71c7d9a3
am ce876beb: am a41e6426: Merge "Tone down some of the overly-verbose linker logging."
...
* commit 'ce876bebf250d386a06ebc1145c6959e30bf413c':
Tone down some of the overly-verbose linker logging.
2012-11-05 09:21:57 -08:00
The Android Automerger
5793235ec4
merge in master-release history after reset to master
2012-11-05 07:49:21 -08:00
Elliott Hughes
f1566fd692
am bc35807f: am 9df2e000: Merge "Cleaning the linker environment as we initialize it requires less API."
...
* commit 'bc35807fc6c5f11b6d057b20250d41ebc419da62':
Cleaning the linker environment as we initialize it requires less API.
2012-11-02 13:58:48 -07:00
Elliott Hughes
d752fc0286
am cfb47daf: am 01271b18: Merge "Make dynamic linker debugging always available."
...
* commit 'cfb47daf4eb4741ac462c7350c73ad1cf96cf83f':
Make dynamic linker debugging always available.
2012-11-02 13:58:47 -07:00
Elliott Hughes
1d0129b1b2
am cdc5a17c: am ed537239: Merge "Adjust symbol lookup for DT_SYMBOLIC case"
...
* commit 'cdc5a17cef00c49086e1bfe4c3715d2ebd61addb':
Adjust symbol lookup for DT_SYMBOLIC case
2012-11-02 11:39:02 -07:00
The Android Automerger
80bcf54766
merge in master-release history after reset to master
2012-11-02 07:49:13 -07:00
Elliott Hughes
eb15e1d485
am e109930e: am dc77a228: Merge "Allow dlopen("egl/blah.so")."
...
* commit 'e109930e9fd0922280e6f74b3df270093ee95fa6':
Allow dlopen("egl/blah.so").
2012-11-01 23:10:56 -07:00
Elliott Hughes
ceda36fa12
am 7f7ac8cd: am e3c7b519: Merge "Don\'t corrupt the thread list if the main thread exits."
...
* commit '7f7ac8cd19f1a7fc61aa640505747dee9036fa61':
Don't corrupt the thread list if the main thread exits.
2012-11-01 17:39:12 -07:00
Elliott Hughes
d781dfdb09
am 6db8f5bb: am d30116cf: Merge "Keep the dynamic linker\'s soinfo pools mostly read-only."
...
* commit '6db8f5bb75bb79e0b4873e6d293aa25e2c9f090b':
Keep the dynamic linker's soinfo pools mostly read-only.
2012-11-01 17:02:23 -07:00
Elliott Hughes
02c3513e5f
am 65ba5b62: am 064f862d: Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
...
* commit '65ba5b62c5a59181317b86f772d9ebb756d4741f':
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.
2012-11-01 14:15:11 -07:00
Elliott Hughes
00fe4a20d7
am 3bb62578: am 0be1819b: Merge "Dynamically allocate soinfo-structs in linker"
...
* commit '3bb62578beb36a35d3b1d2fbe18bd34a9d4ecca4':
Dynamically allocate soinfo-structs in linker
2012-11-01 11:47:31 -07:00
The Android Automerger
7a6ae1d667
merge in master-release history after reset to master
2012-11-01 07:49:21 -07:00
Elliott Hughes
e892414bd3
am 1de3af51: am c0ac7eba: Merge "Reject .so files with no sysv hash table."
...
* commit '1de3af51d459c2ced602f10e4f7e7fe704400cdc':
Reject .so files with no sysv hash table.
2012-10-31 15:15:45 -07:00
Elliott Hughes
a4242290a1
am f510fc78: am b46530bd: Merge "Start cleaning up libm."
...
* commit 'f510fc789a67344080543b9ae06d0ff3322561d5':
Start cleaning up libm.
2012-10-31 13:54:18 -07:00
The Android Open Source Project
b5b52e73e9
am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '089111a80a6a167de827bf32ae2d2a935ff5874f':
2012-10-31 09:19:14 -07:00
The Android Automerger
a9b0cd68de
merge in master-release history after reset to master
2012-10-31 07:49:21 -07:00
Elliott Hughes
8478dbc85f
am 3cd7a165: am 084be591: Merge "linker: handle R_ARM_COPY relocations in a proper way"
...
* commit '3cd7a1653aa579213cb68a666bd9949e2b8fff95':
linker: handle R_ARM_COPY relocations in a proper way
2012-10-30 17:20:01 -07:00
Elliott Hughes
864d48917a
am 914112ea: am 155e8d1d: Merge "More dynamic linker cleanup."
...
* commit '914112ea21a62c7658dc4b094a369358009be6a9':
More dynamic linker cleanup.
2012-10-30 16:59:17 -07:00
Elliott Hughes
08c4e30e23
am b0ac82e9: Merge commit \'bd8ee3d3\' into mm
...
* commit 'b0ac82e9baf969236be1174b49784500b33e6f48':
Upgrade to tzdata2012h.
2012-10-30 15:24:37 -07:00
Elliott Hughes
4d2ea14288
am 4569ab97: am 06b59610: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
...
* commit '4569ab9773efb1c984bde146002975e7a3753f11':
Fix bug in pthread_join, pthread_exit, pthread_detach
2012-10-30 13:06:47 -07:00
Elliott Hughes
c7358ee57c
am 743a273e: am 1f21ece4: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '743a273e40e49c199d79462338fc606ae12c999f':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-30 10:11:44 -07:00
Elliott Hughes
7d617d0db9
am 5f787190: am 4d36b0bd: Merge "Fix the pthread_join on self error case."
...
* commit '5f787190a9e7a749d95f566f920b78eafcd05050':
Fix the pthread_join on self error case.
2012-10-30 10:11:43 -07:00
Elliott Hughes
5e805afa79
am 0b8fa1d4: am 9297af94: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '0b8fa1d456f6cf831be41a6dc6b0a67e89f01bd5':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-30 10:11:42 -07:00
Elliott Hughes
d4834a217e
am 40e467ec: am 33c4a3ad: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '40e467ec668b59be25491bd44bf348a884d6a68d':
libc: Fix alphasort() signature (and implementation).
2012-10-30 10:11:41 -07:00
Elliott Hughes
5ce5edd6cf
am 85765609: am 8f9a1eb1: Merge "Upgrade to tzdata2012h."
...
* commit '8576560979e3d126ef8204959b87336d980b390b':
Upgrade to tzdata2012h.
2012-10-30 10:11:40 -07:00
Elliott Hughes
96b52e104a
am a67cedb5: am 9e783963: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit 'a67cedb52cb57f116a545482bddb979d995fd634':
Clean up the implementation of the <dirent.h> functions.
2012-10-30 10:11:39 -07:00
The Android Automerger
5b006f3d08
merge in master-release history after reset to master
2012-10-26 07:49:10 -07:00
Elliott Hughes
4e0b489a0c
am 8cacc639: am 7193731a: Merge "Workaround g++ 4.7 compfail"
...
* commit '8cacc639b6ae660c494aca07c537cb443c6c6cd9':
Workaround g++ 4.7 compfail
2012-10-25 15:23:29 -07:00
Elliott Hughes
a7bb83475b
am 85819efe: am f2b3ac95: Merge "Fix recovery: don\'t assert if there\'s no tzdata."
...
* commit '85819efe8f771759d12ab86f0bd47ede621dbb7d':
Fix recovery: don't assert if there's no tzdata.
2012-10-25 15:16:44 -07:00
Elliott Hughes
0f96dd8dcb
am df7f24f3: am 7b68e3f7: Merge "Per-thread -fstack-protector guards for x86."
...
* commit 'df7f24f310ee3ceb1dc9413d59d5a8816eb584ef':
Per-thread -fstack-protector guards for x86.
2012-10-25 12:23:56 -07:00
The Android Automerger
2654447c0e
merge in master-release history after reset to master
2012-10-25 07:52:10 -07:00
Elliott Hughes
4cdc426207
am 60c7ac26: am d0f2b7e7: Merge "More upstream NetBSD upgrades."
...
* commit '60c7ac262241588f7942ca068f33d706c8fe5cc4':
More upstream NetBSD upgrades.
2012-10-23 17:29:47 -07:00
Elliott Hughes
217e616772
am 45f07555: am e3dbe1e3: Merge "Upgrade more functions to the current upstream NetBSD copy."
...
* commit '45f075556b26cfe91b1b7e1299b54f0328a06acb':
Upgrade more functions to the current upstream NetBSD copy.
2012-10-23 13:58:25 -07:00
Elliott Hughes
1d212fa6eb
am 4280143d: am fb93e6a5: Merge "Move setlocale(3) and the wchar stubs over to .cpp."
...
* commit '4280143d371eae2123a5d8c4d8779db159ecd1e2':
Move setlocale(3) and the wchar stubs over to .cpp.
2012-10-22 18:08:54 -07:00
Elliott Hughes
1d8b87d2b4
am 69ec117b: am 5a9911e9: Merge "Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes."
...
* commit '69ec117b22e3e842bff15f54f3e777cdf3206d21':
Add missing BEGIN_DECLS/END_DECLS for FORTIFY_SOURCE stdio prototypes.
2012-10-22 16:31:29 -07:00
Elliott Hughes
c866dc20bf
am 9d5a96c0: am 574773b1: Merge "Clean up warnings in stubs.cpp."
...
* commit '9d5a96c0d9583fe9a02190ba54a855a2dcc87eb9':
Clean up warnings in stubs.cpp.
2012-10-22 16:31:28 -07:00
Elliott Hughes
8b8cc88d39
am 75f33adc: am 4e457759: Merge "Move the FORTIFY_SOURCE helpers over to .cpp."
...
* commit '75f33adcb1f845ae121eb5508b120aaaa9f7a217':
Move the FORTIFY_SOURCE helpers over to .cpp.
2012-10-22 16:00:03 -07:00
Elliott Hughes
3135c87ca8
am 008744ce: am df92635a: Merge "Support zone.tab in bionic, and remove the file format version."
...
* commit '008744cedaa7e3be533bbedb51dd986c6dfea987':
Support zone.tab in bionic, and remove the file format version.
2012-10-22 15:11:07 -07:00
Elliott Hughes
9407c5c126
am 417834b1: am eb370aa3: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit '417834b17ee00a6b1cd4e816f632c3596f3f51c3':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:55:42 -07:00
Elliott Hughes
1b62d4e72e
am 629a28cd: am dc595d83: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit '629a28cdf384d83a4d433de8e1299b01e42cc75e':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:24:22 -07:00
Elliott Hughes
421083359e
am 58d08711: am 7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '58d08711af5e8237d6196652d59cc4e8b8caafcf':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:24:21 -07:00
Elliott Hughes
933746ad7d
am af72df5b: am e75c273a: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'af72df5b98944cfb89cecb7abc05bceec0612981':
Track the tzdata2012g update in the new file format.
2012-10-19 14:42:05 -07:00
Elliott Hughes
bde97cf154
am 98533cfa: am 88cd1a21: Merge "Upgrade to tzdata2012g."
...
* commit '98533cfa4b69d053e111e46bc74d8e9b2035a96e':
Upgrade to tzdata2012g.
2012-10-19 13:53:21 -07:00
Elliott Hughes
18ee86f892
am f0af78c2: am 551ca77e: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit 'f0af78c27bede71304a894c23fb3100d027fc74b':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:53:20 -07:00
Elliott Hughes
174b6d0e19
am 356c0af6: am 2266e495: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '356c0af60b83988bdb55970c8f29886a2fa5a672':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:22:50 -07:00
Elliott Hughes
a7bc708e0c
am fb8ecd6e: am bc77942a: am f0e402db: Upgrade to tzdata2012g.
...
* commit 'fb8ecd6e2f20dba3b6eaf0bd6b834c2c072322c5':
Upgrade to tzdata2012g.
2012-10-19 10:02:11 -07:00
Elliott Hughes
0f7814264c
am 4d71adbc: am 10225071: Merge "Fixes x86 build."
...
* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
Fixes x86 build.
2012-10-18 13:58:18 -07:00
Elliott Hughes
c0e8400361
am 79c6a8d2: am ca7466d2: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit '79c6a8d2b163e40eb6f19bbf8f59eb85fb7996e6':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:40:19 -07:00
Elliott Hughes
c63dda22dd
am 1b315363: am 5ae762a3: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '1b315363c22fdf53d77fc83ec0bbada32e73ccc7':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 11:02:01 -07:00
Elliott Hughes
9648b588b4
am e5c8ced4: am 9ffaabcc: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit 'e5c8ced4f95e97b2fadc0c64fbdbeeb023677035':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:28:52 -07:00
Elliott Hughes
f190a16e5e
am c2e4c310: am 32ea9fe5: Merge "Put all the tzdata in one file."
...
* commit 'c2e4c310ff9ace06be0376d649a09abb51813981':
Put all the tzdata in one file.
2012-10-17 16:12:19 -07:00
Elliott Hughes
9eaa953642
am 06abe13c: am a2f596b6: Merge "Make dlerror(3) thread-safe."
...
* commit '06abe13c5f7a318eef316268d0d25d92ff128c19':
Make dlerror(3) thread-safe.
2012-10-17 11:05:19 -07:00
David 'Digit' Turner
826215bec2
am c7dc8425: am 42ac0e50: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit 'c7dc842529ea6f8801164eb8b4f7d036acc53955':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:32:36 -07:00
David 'Digit' Turner
87f487f6ce
am 423a0740: am 4136c3a2: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '423a0740b536f688b0c1866437dfe59e06413435':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:34:57 -07:00
Elliott Hughes
2734345095
am ee7a28c5: am a9944cfe: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'ee7a28c529dad9f51aa86271350a4e2d7cddc9d4':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:25:32 -07:00
Elliott Hughes
b2d2b30a13
am 1452324f: am fcf901d5: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit '1452324ff551f3aa7f9d61186d3b9cb04f7e9d39':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:15:39 -07:00
Elliott Hughes
4089dea451
am c2483ea9: am 9434e8fe: Merge "Make the dlfcn mutex static."
...
* commit 'c2483ea9b63de373e7521e39162395a8c667239a':
Make the dlfcn mutex static.
2012-10-12 11:24:25 -07:00
Elliott Hughes
66d71c8f13
am ab4e2ed1: am db4fdf1a: Merge "Fix dlerror(3)."
...
* commit 'ab4e2ed182011998751ff5d6c321ff5bae20c6cd':
Fix dlerror(3).
2012-10-12 10:49:08 -07:00
The Android Open Source Project
aff37491a1
am cf3fa7f4: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
...
* commit 'cf3fa7f45742c870f1478b1bf7717d3042d599d7':
2012-10-12 07:32:05 -07:00
Elliott Hughes
f0f052f28d
am 2facd5b5: am 417fd233: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '2facd5b5ef3e52b11590b4de01e17f6923a85aee':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:43:49 -07:00
The Android Open Source Project
3622c73cfc
am d1844d4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd1844d4b30a0f75ed0c30c923bea7c718ba53034':
2012-10-11 05:59:18 -07:00
Ying Wang
9ab8851756
am 06201227: am ecbded40: am 2c287e95: Set up the private variables.
...
* commit '0620122763502e4ec6f9939c009faaf5a890ad08':
Set up the private variables.
2012-10-10 13:54:48 -07:00
Elliott Hughes
c41e2216f4
am 4c3d7a86: am 1ceb9824: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '4c3d7a86bb568e0b3fa5c9e24d32fa1ee9404b2e':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:29:25 -07:00
Elliott Hughes
5a16e92eb5
am c7f654df: am b83cad79: Merge "Fix two comment typos."
...
* commit 'c7f654dffea47a80ba566cd05f9212c8c7359a67':
Fix two comment typos.
2012-10-09 17:39:51 -07:00
Ying Wang
ed0570bf0c
am a55f0a10: am b04598a6: Set up the private variables.
...
* commit 'a55f0a1007423837ff8dc26336a1976469439def':
Set up the private variables.
2012-10-08 16:21:46 -07:00
Elliott Hughes
1cae8da8e7
am 7e785323: am 9a7366e8: am fa7e2586: Merge "Test flags before using "info""
...
* commit '7e7853230fcf141477d7332634858c08d8eec5b9':
Test flags before using "info"
2012-10-03 17:44:53 -07:00
The Android Open Source Project
c34bdc957c
am ae8000f3: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'ae8000f368926478b7a1e0a56a3d3ee53c2c4a01':
2012-10-03 07:36:22 -07:00
Naseer Ahmed
2d5d80985e
am 9c389255: am 6b1ba118: am 3ef4fecd: bionic: update processed msm_mdp.h
...
* commit '9c3892558f68ec8791283844e2d7d7326bcd3574':
bionic: update processed msm_mdp.h
2012-10-03 01:05:02 -07:00
Andy McFadden
399f54c133
am 51c7167d: am 7c67e4e4: am 98957db5: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '51c7167d2245286e3458ffb06b0b5068d8f04e1b':
Test flags before using "info"
2012-10-02 15:28:17 -07:00
Andreas Huber
ae554abd41
am 3a0aa5e0: am cafbc940: am 2e0452cb: bionic: update processed msm_vidc_enc.h
...
* commit '3a0aa5e0a01c26278438513a73bc0150d5fc215c':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:44:32 -07:00
Elliott Hughes
f0a9cd7847
am 92e6de6f: am b95ad82f: am 95a2a7f3: Merge "Fix MIPS build."
...
* commit '92e6de6f940fee6362dd306ad77c6d7bfa56e4cb':
Fix MIPS build.
2012-10-02 11:34:14 -07:00
Elliott Hughes
6cdf8dd025
am 80a29832: am 90172541: am b98204a9: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '80a298327299aa28b564941f90818911023ae544':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:28:31 -07:00
The Android Open Source Project
4fbb1569f5
am 4cf143f1: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4cf143f1c8e7147e696225cc852e532f50115624':
2012-10-02 09:17:27 -07:00
Elliott Hughes
95114ff5c5
am 15edd80a: am 39d7c607: am 75f43525: Merge "Always take GCC\'s definition of NULL."
...
* commit '15edd80a696c1b5243874f7db9ef2d753016ade8':
Always take GCC's definition of NULL.
2012-10-01 18:23:31 -07:00
Elliott Hughes
be02504f5f
am baa7ee03: am bb7dfcd3: am d3bf954e: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'baa7ee0370fcb88625a666141431a4187c0f91b2':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:54:48 -07:00
Elliott Hughes
b5d5173139
am a54d08a7: am a428bc12: am fe712e6c: Merge "Upgrade seed48 too."
...
* commit 'a54d08a7c15e15f24d94ca6fb97329134d4441a2':
Upgrade seed48 too.
2012-10-01 14:48:57 -07:00
Elliott Hughes
b28c547aa4
am 6ed5bc12: am b650111a: am cd195eba: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit '6ed5bc12dac544004f8e79b6393b2a8e260a7cc1':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:16:53 -07:00
Elliott Hughes
7f1464c03c
am 068f3398: am 0fa6279f: am 5b6346f6: Merge "bionic: linker: Need update the map->l_addr for execution."
...
* commit '068f33981ddaee7e397eee73ea5ea97827aabeb7':
bionic: linker: Need update the map->l_addr for execution.
2012-10-01 09:25:18 -07:00
Jean-Baptiste Queru
eab85a379d
am adc32bc3: Merge from jb-mr1-aah-dev
...
* commit 'adc32bc3b18576a554143631ab72dc14c1b905c3':
2012-09-28 17:08:41 -07:00
Saurabh Shah
04373fe6fe
am c556da9e: am 204b26b4: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit 'c556da9ed7b0142523d349e7af8ba6492b98a683':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:52:50 -07:00
Jean-Baptiste Queru
4dc7206c94
am de1efebd: Merge from jb-mr1-aah-dev
...
* commit 'de1efebdcac1bfa0e30fa7fbe0b4c7860a72a6a0':
2012-09-28 15:52:31 -07:00
Elliott Hughes
326e4037e9
am 8e1a87b5: am bb892a1b: am d03bfe68: Merge "Define ssize_t if necessary."
...
* commit '8e1a87b5470d0708b0503c3a33580e1782e2bda2':
Define ssize_t if necessary.
2012-09-28 10:31:09 -07:00
Elliott Hughes
2e223d208f
am fb1e192e: am 72b08af3: am f9163dd1: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit 'fb1e192e12fb4047bf5f01ccf0fd4e5644743adb':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:57:11 -07:00
Elliott Hughes
4137d67cde
am 209d67d4: am fd6ca57f: am e4030e0b: Merge "Fix several compiler warnings."
...
* commit '209d67d448a64d147521b3d2efb3efa392dd3ccd':
Fix several compiler warnings.
2012-09-26 16:09:26 -07:00
Elliott Hughes
6a3d9af46e
am bdc51470: am 2c29bcf7: am 827a2604: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit 'bdc514700d9f766f5a44a95bb80dab15846bd1c4':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:20:38 -07:00
Elliott Hughes
100e313c75
am 0792223a: am dd9fbc86: am 8e630dac: Merge "Simple tests for dladdr(3)."
...
* commit '0792223a8ab0f9ecb5fc8fe471dbb7890bb6c2cc':
Simple tests for dladdr(3).
2012-09-26 12:21:03 -07:00
Elliott Hughes
0a2d31838f
am 66569e3d: am a48d5e5f: am 855dde44: Merge "Fix tmpfile(3)."
...
* commit '66569e3d53643fe4682091c4e11c25449e9b7fdc':
Fix tmpfile(3).
2012-09-26 12:21:02 -07:00
Ying Wang
1be6e685a5
Merge "Set up the private variables."
2012-09-26 11:27:48 -07:00
Nick Kralevich
0147bd2f78
am 06abf4ed: am 5989ed5c: am 25937d36: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '06abf4edbf4b6d10ee82369ed48b8145a94ba1aa':
FORTIFY_SOURCE: add umask check
2012-09-26 11:15:38 -07:00
Ying Wang
f680b0f404
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-09-26 10:54:45 -07:00
Elliott Hughes
2fb6457efb
am c3233178: am 00f33977: am 3307bff0: Merge "Revert dl_fbase initialization to the address where the shared object is loaded."
...
* commit 'c32331781097b51a46c03b002cd813752677236a':
Revert dl_fbase initialization to the address where the shared object is loaded.
2012-09-26 10:46:39 -07:00
The Android Open Source Project
23042bab43
am db2b9d05: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'db2b9d052b3ebab73695af9335d649340cb8d193':
2012-09-26 10:08:03 -07:00
Elliott Hughes
a638642f44
am 354867d7: am 0eb4f255: am 6e0e03c3: Merge "Add the cleaned kernel headers"
...
* commit '354867d7020d4c7fb001c659245b60bff82a1a32':
Add the cleaned kernel headers
2012-09-24 13:52:05 -07:00
Elliott Hughes
51d1a14c80
am a06e11cc: am c746bed8: am 7b0377ed: Merge "[MIPS] Removed the unused header"
...
* commit 'a06e11cc34612ef814a0f73bccdd43059111a735':
[MIPS] Removed the unused header
2012-09-24 13:43:59 -07:00
Elliott Hughes
0647355bef
am 28bd96cc: am d5c654c0: am 3b6914bf: Merge "Fix dlsym and dladdr to use load_bias instead of base"
...
* commit '28bd96cc0b9a5eed785df09a4c1bffc43b95fe6b':
Fix dlsym and dladdr to use load_bias instead of base
2012-09-24 13:43:58 -07:00
Elliott Hughes
25b3416960
am f153ed38: (-s ours) am f4b34b6c: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f153ed380d94123d873d7ff04bc9b5b65f989c1d':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:18:48 -07:00
The Android Open Source Project
7c7609f95e
am 51d270af: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '51d270af6d9e648fdec43f716833b6f69688048e':
2012-09-24 10:14:49 -07:00
Elliott Hughes
c08088376a
am 82ec6850: am 6c0e373d: am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '82ec685054bd14e596fcb0661c7f5c398743b4b3':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:48:35 -07:00
Elliott Hughes
9f3c0d32a4
am 6da07f02: am ecf67e15: am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '6da07f02bd064cfae852df2b8ac82203432aef35':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:48:34 -07:00
Elliott Hughes
2b83e0e67e
am 0349e3d3: 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 '0349e3d3ffa411ffd47f005af7f9c5585e469165':
[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:48:33 -07:00
Naseer Ahmed
f9355bc5cd
am 21e0a7ee: am f7070074: bionic: Update MDP header for sync
...
* commit '21e0a7ee8bd9862452a429cef554f31e3c379903':
bionic: Update MDP header for sync
2012-09-24 09:36:43 -07:00
Rebecca Schultz Zavin
e06f77dce0
am 27cfd6af: am a9dca773: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit '27cfd6afd4039a72e3669a2ff32685e81dd455aa':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 15:46:02 -07:00
The Android Open Source Project
284de14ebb
am 0a6cbb97: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0a6cbb97a82ac6cfc3ce3d1eaf2785f911600584':
2012-09-20 12:52:38 -07:00
Iliyan Malchev
dcc80e127c
am e5521822: am 4430aa6a: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit 'e55218223b070d5745dc73c5593c436277c5b9c0':
Update headers for Adreno graphics driver
2012-09-19 15:18:52 -07:00
Elliott Hughes
73b5a72134
am ae0bccf7: am 0ef00090: am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
...
* commit 'ae0bccf7d3252900d2ef31df2c6e4515908b89ec':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:31:35 -07:00
Dave Burke
5c5b720d81
am baa09d1e: am e5830324: Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
...
* commit 'baa09d1e0a408d410fc5a834fe9c283ae589ff13':
Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 00:10:52 -07:00
Elliott Hughes
41bb2eb806
am 1f1e7b70: am 2aceb4bc: am e2a17ef4: am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit '1f1e7b70b7e37039ce53aed8b1b651c8692347e7':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 16:00:07 -07:00
Elliott Hughes
7379f525be
am 469bd669: am 4b3ff1f0: am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
...
* commit '469bd6692b984cfbecc96522960bb83baf7c9131':
Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-17 12:45:38 -07:00
Elliott Hughes
0e4065e8c7
am e409645c: am b67d4ec5: am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"
...
* commit 'e409645c9953bb11bbad116834cecaebff444009':
Add tty defaults to bionic
2012-09-17 12:45:34 -07:00
Elliott Hughes
62466a55bf
am 7e9d6d8a: am b2af8b68: am 66a97ea9: am 4e9d953a: Merge "libc: add ftw / nftw functions"
...
* commit '7e9d6d8abba781992b1f55f36e02b2baae368d07':
libc: add ftw / nftw functions
2012-09-14 10:28:47 -07:00
Elliott Hughes
cd1fb029eb
am c9134074: am 1eaa3e6f: am 77fd7075: am e895e6de: Merge "Update libc/NOTICE and record the incantation."
...
* commit 'c91340749015c4d7e35bd377f9103a340ef65c6a':
Update libc/NOTICE and record the incantation.
2012-09-14 10:28:46 -07:00
Kenny Root
07ab5cbbed
am c01915fd: am 2b270a0c: am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205
...
* commit 'c01915fd04dc352c77d4e2a0fbc906b515d2533c':
Print out shared app gids correctly
Add tests for Android-specific stubs
2012-09-14 10:28:05 -07:00
Elliott Hughes
6a163a1bf1
am c9829a2b: am 155a70b9: am de9db8f7: am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit 'c9829a2b6fb70f2eb0fc6a21f48546c66d9724c7':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-14 10:28:04 -07:00
Elliott Hughes
8631744c49
am 953dbbda: am c7fda6a9: am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."
...
* commit '953dbbda49c9a46e5b1b8d78a643c44eb1426d0e':
Upgrade to tzdata2012f.
2012-09-14 10:28:03 -07:00
Elliott Hughes
4aebbf63c3
am 3d019017: am bec648ee: am 8db4b91b: am d2236e2c: Merge "Fix Mac build."
...
* commit '3d0190177469a8a25895117fc41625cd22e2fb28':
Fix Mac build.
2012-09-13 14:12:31 -07:00
Elliott Hughes
ce061964f7
am c005a55c: am 478f8ff3: am b2550dd4: am 4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit 'c005a55c74105c4eed8e2b0ba68ce0bfd67ccffe':
Add libdl into libc_malloc_debug_leak build
2012-09-13 14:12:02 -07:00
Elliott Hughes
9f7d6840da
am 00f927f1: am 29861b5d: am 58d15966: am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '00f927f137b553caa19fdc62497c012a1cb95f88':
Added new test for dlopen which is failing for MIPS.
2012-09-13 14:12:01 -07:00
Elliott Hughes
9a78257905
am cf57515f: am f801cf55: resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
...
* commit 'cf57515f7070539d560640247df6941a360fcff9':
Update the kernel headers to match external/kernel-headers.
2012-09-13 03:21:42 -07:00
Elliott Hughes
218c7f5dbe
am 7f598671: am ccd7ee62: am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '7f59867170653a62fb1fbce91bca5f4673be065d':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 17:02:36 -07:00
The Android Open Source Project
b8ceb988ea
am 76a3777a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '76a3777a4d6c3233ba2935828371abd3fbbac843':
2012-09-12 16:58:49 -07:00
Elliott Hughes
e290cd1606
am 68221a76: am cc0f2253: am 7f798147: am cc8668f2: Merge "[MIPS] Check error status from pipe system call"
...
* commit '68221a76b7ecfe5ed5d43d76eb3b7a505bf83c0d':
[MIPS] Check error status from pipe system call
2012-09-12 15:35:00 -07:00
Elliott Hughes
20599f5c9e
am eeabbaee: am f50b99f4: am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'eeabbaee88202a459ec381edc45c0995bdcfa3c8':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 17:15:10 -07:00
Ying Wang
62fd0b699a
am 33d552a4: am e3738414: am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit '33d552a4d1c766aeb99c71060aa091e7aafaaac9':
Generate header dependency makefiles for the crt*.o
2012-09-10 17:14:10 -07:00
Elliott Hughes
d203fba8f0
am 934e18e7: am af4371b4: am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
...
* commit '934e18e715b0f6627f258d6fc8dc9406f39705f6':
Add more pthreads tests.
2012-09-10 17:09:54 -07:00
Elliott Hughes
b3cbcb3547
am 5804b88a: am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '5804b88a44c153fa1b39dd3095be9e905d77cee0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-10 17:05:15 -07:00
Elliott Hughes
b35a90d682
am ffcb92e7: am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
...
* commit 'ffcb92e779b347b3725e560aa3aabd122a4dbd62':
Add mlockall and munlockall for Google TV.
2012-09-10 17:05:14 -07:00
Ian Rogers
593315c327
am e9859df7: am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
...
* commit 'e9859df7cc57f761a4b9457b4d55ecff33bfdc8b':
Fix build warning of initialization but no use.
2012-09-06 11:54:48 -07:00
Elliott Hughes
f28d8d7042
am 684669df: am de0dc251: am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '684669dfd7fdefa1e0f45e91667af628d3742429':
Don't corrupt the thread list in static executables.
2012-09-06 10:48:52 -07:00
The Android Open Source Project
c99828169b
am c0ee1171: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c0ee117170e9a8976ffd2afc99bce8f1242cefd1':
Revert "Update ion header"
:Revert "Update ion header"
2012-09-06 09:12:34 -07:00
Ajay Dudani
58deb845c5
am d58928e8: am 183d0a57: Update msm_ion.h ioctls so they dont conflict with ion.h
...
* commit 'd58928e83109aeac42e2226de3ec99a91e59a695':
Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:52:04 -07:00
Ajay Dudani
1c24c54840
am bf3da78e: am 85811fc7: Revert "msm_ion: switch to using legacy_ion.h"
...
* commit 'bf3da78e690524414a8874313638f7cf33b44424':
Revert "msm_ion: switch to using legacy_ion.h"
2012-09-05 21:47:56 -07:00
Ajay Dudani
457e60a2f8
am 7649d622: am dc81b447: Revert "add legacy_ion.h"
...
* commit '7649d62255f056d1520cd746ddcd6352d091f76f':
Revert "add legacy_ion.h"
2012-09-05 21:46:33 -07:00
Elliott Hughes
bc30d0a798
am 8140487f: am 2da90705: am 008f4df5: am ff4608ae: Merge "Add missing dependencies."
...
* commit '8140487f6014f83c14cecb6ecb9535bd4966a13e':
Add missing dependencies.
2012-09-05 15:22:28 -07:00
Elliott Hughes
db18cbdd85
am d5b14e35: am faf361a6: am 2fc3e1ef: am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'd5b14e35521ee6a038714c42ec523dcfe183b65b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:36:09 -07:00
Elliott Hughes
ec0d2a86b7
am 340ff83f: am ac3e35cd: am a76f2eca: am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit '340ff83f9878a478cfa4b5aaaf4260f96304c416':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:06:25 -07:00
Ian Rogers
48468f258a
am 64f4e714: am f71d757f: am 7310a1c4: am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '64f4e714186ff69016abcb241fd912ed8ef8472a':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:56:21 -07:00
Elliott Hughes
3ee5775a0f
am 9deb460a: am ab558163: am b9f0a6eb: am be19a367: Merge "termios: add tcdrain"
...
* commit '9deb460a26b8d5f6c74b5935e35b6f419775a1e5':
termios: add tcdrain
2012-09-04 18:18:01 -07:00
Elliott Hughes
6b08ed7937
am fe7ac11a: am f34c6d77: am bc374078: am 5ff23471: Merge "Add getsid system call to bionic"
...
* commit 'fe7ac11afa1c3a64c12e7e632e12b5c853ca3d89':
Add getsid system call to bionic
2012-09-04 16:52:05 -07:00
Elliott Hughes
5f517ce256
am ad639c1d: am 877ad30f: am 507bcabb: am e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit 'ad639c1d2bf0c12a77c24a3247cedf86cc719d6e':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:05:33 -07:00
Elliott Hughes
839ae785d8
am 1d07eda8: am c0e3b9dd: am b438c54d: am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"
...
* commit '1d07eda8db4a8a8986b0e2681eef0d839c9901df':
bionic: Fix TINY_ANDROID build
2012-09-04 13:53:51 -07:00
Ian Rogers
a4e3391db2
am 5b0e2de6: am b9ad1a1e: am 6abab301: am 6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '5b0e2de6aef96e10c26034d9b447208a56df82d9':
Upgrade to dlmalloc 2.8.6.
2012-08-31 09:03:23 -07:00
Elliott Hughes
6709aba126
am 418ecb7e: am 8c368b5d: am dde94f4c: am 8b4e8a93: Merge "Improve the dynamic linker diagnostics."
...
* commit '418ecb7ec800d8caa97b01a84d7403272fab4e28':
Improve the dynamic linker diagnostics.
2012-08-29 14:11:52 -07:00
Nick Kralevich
35c3408b0d
am 29e52652: am fe7d7d46: am 92133ca4: am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
...
* commit '29e526527c10f92d0a563d1cdec5f4eab0b33875':
disable _FORTIFY_SOURCE under clang
2012-08-29 14:11:52 -07:00
Elliott Hughes
5fe555ecac
am b3732862: am 8900e2de: am e5b85f45: am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit 'b37328627be403b9c2a2896765a7bc7a357cb073':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:23:34 -07:00
Ian Rogers
72758a138e
am 71258e0d: am 15afed42: Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
...
* commit '71258e0d207b9b51f1295808837df95e4dd2711a':
Revert "Revert "Restore posix_memalign""
2012-08-29 08:57:50 -07:00
Ian Rogers
31abfc3a98
am 1df8fe33: am f71fa083: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
...
* commit '1df8fe33d59df1be3b1d33db033e379a32416a68':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
2012-08-29 08:57:49 -07:00
Iliyan Malchev
230752b861
am 7e585192: am 66edcd9d: msm_ion: switch to using legacy_ion.h
...
* commit '7e5851922ce5430ea55e3c9325386846fbedf16c':
msm_ion: switch to using legacy_ion.h
2012-08-29 01:39:28 -07:00
Iliyan Malchev
e59f4c31cb
am ba13ae76: am 5f1d206d: add legacy_ion.h
...
* commit 'ba13ae767207d50dd2214cd5e8a941ab4da74d56':
add legacy_ion.h
2012-08-29 01:39:28 -07:00
Nick Kralevich
9416782be5
am 2868bbab: am 4f90a093: am d3d09f7d: am 069c64cd: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit '2868bbabf3a3146e682f314794b8803bfd60963b':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:46:31 -07:00
Nick Kralevich
97b9643c5b
am 036fa6e6: am 54662dd4: am 1389db8b: am e026b1d8: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '036fa6e66958a05fbde9fddefc5fc8e31741fe80':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:09:40 -07:00
Nick Kralevich
c64bb00cdf
am 773a7832: am d7440f37: am 7cab2188: am ad180738: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit '773a783295e758bdef1a7e205761bcc1f832af95':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:09:39 -07:00
Nick Kralevich
953de64819
am 88160880: am 3ffdef19: am c7d9c400: am c410a961: Merge "libc: remove ctors/dtors sections"
...
* commit '88160880953e01f4fa7523938b6448f194f598a0':
libc: remove ctors/dtors sections
2012-08-28 13:02:10 -07:00
Nick Kralevich
47cac977f5
am 5443561d: am 48c88804: am 775dabd4: am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"
...
* commit '5443561d5d9fd8ababac989116a036b3ab7b15b0':
Allow linker to compile with -DLINKER_DEBUG=1
2012-08-27 16:12:39 -07:00
Elliott Hughes
80921057d4
am ea108d8a: am 8c7f4777: am d2d8031d: am bc366292: Merge "Added missing cache failed notification"
...
* commit 'ea108d8a665aa708e878432ab1cdab959809ef9b':
Added missing cache failed notification
2012-08-27 15:27:46 -07:00
Iliyan Malchev
5006660be8
am c9008991: am 3ad36e52: bionic: update sanitized MSM, V4L2 kernel headers
...
* commit 'c9008991f33b95831f94e0cc970c94a6ea6f4199':
bionic: update sanitized MSM, V4L2 kernel headers
2012-08-27 15:17:31 -07:00
The Android Open Source Project
99696a9373
am 75f3d25c: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '75f3d25cef30dfa4578b1bb7562222ad51a75de5':
2012-08-25 07:16:49 -07:00
Ian Rogers
995f8c925f
am 1f84a4e4: am a190cbb8: am 05fddb41: am a37ce7fa: Merge "Add missing va_end() to prevent stack corruptions"
...
* commit '1f84a4e426aca34ad17b6d626bd725e86a7c97b8':
Add missing va_end() to prevent stack corruptions
2012-08-24 15:27:30 -07:00
Rebecca Schultz Zavin
bbe3d3916f
am fa5942cc: am cbd76d15: Merge "Update ion header" into jb-mr1-dev
...
* commit 'fa5942cc081f3aef1ceb8cf6f0d8c0984d18bf82':
Update ion header
2012-08-23 16:34:33 -07:00
Nick Kralevich
b46a1d8890
am dd5d865d: am 81af404b: am e8198b97: am 26facba2: Merge "hardening: remove pointless ARM __get_pc() function"
...
* commit 'dd5d865d92c21105d28dd931d56c2f5e2f4df275':
hardening: remove pointless ARM __get_pc() function
2012-08-23 12:37:19 -07:00
The Android Open Source Project
e2862bb984
am b1d43872: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b1d43872224837a85f593d9f946686c7272c7d0e':
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Restore posix_memalign"
2012-08-22 15:35:50 -07:00
Brian Carlstrom
2bdfdfbf09
am 4a56211b: am f72ee269: Revert "Upgrade to dlmalloc 2.8.5."
...
* commit '4a56211b0b30757c8a5d64a59976a3a97d300a18':
Revert "Upgrade to dlmalloc 2.8.5."
2012-08-22 13:56:16 -07:00
Brian Carlstrom
3985fbb348
am 71633454: am 78a3069f: Revert "Restore posix_memalign"
...
* commit '716334543788fe564b7d91055d6122657d409efd':
Revert "Restore posix_memalign"
2012-08-22 13:56:16 -07:00
Jean-Baptiste Queru
3487c9b4a8
am 2400c7a6: am e49df020: am 170ad354: am c7de0225: Merge "Use unambiguous mnemonics"
...
* commit '2400c7a60edb18ab62fedcad86ce0d709895e26d':
Use unambiguous mnemonics
2012-08-22 07:35:31 -07:00
Erik Gilling
98b62860cf
am fed12112: am 974e16cd: update linux/sync.h
...
* commit 'fed121126afa91eb04a073ecc1e42535b1b52d27':
update linux/sync.h
2012-08-21 19:14:12 -07:00
The Android Open Source Project
92042e8b91
am a5b7d6dd: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a5b7d6dd00914651f77c4ff6604a2c16df6d73b9':
2012-08-21 16:07:05 -07:00
Andrew Hsieh
0b8770ccbd
am 5e2aa357: am f861705f: am 5cd1efb2: am 1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '5e2aa357d2f76a01c403a208524137c6fccf7304':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:34:44 -07:00
Ian Rogers
6acc9d10e2
am 7c6cc4df: am 4ac3b0a1: am 8af726b2: am 7b0d9b79: Merge "Restore posix_memalign"
...
* commit '7c6cc4dffdcfad48733ac3c3001f5d9b137182b1':
Restore posix_memalign
2012-08-20 19:47:21 -07:00
Brian Carlstrom
4beae98ae0
am 638b0fd9: am cc1f4acb: Restore posix_memalign
...
* commit '638b0fd95346c8930aabcdec933e8caa6d6b4c7c':
Restore posix_memalign
2012-08-20 18:38:50 -07:00
Brian Carlstrom
d03266b2b7
am 94c82633: am 76f60e2e: am fe87596a: am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit '94c82633c72acae0eb7a3390167b35eb3008b4ff':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:36:05 -07:00
Elliott Hughes
758b1c46fb
am 98f26893: am dd0e991c: am 2651d6c6: am 9417a80e: Merge "Always define the 64-bit int types."
...
* commit '98f26893a6a8811df1fe7e012f6cf8885e6c560e':
Always define the 64-bit int types.
2012-08-17 17:01:23 -07:00
Elliott Hughes
230df050ed
am ea5dea8e: am db2903fa: am cbeccc84: am 200de748: Merge "Fix race condition in pthread_create()"
...
* commit 'ea5dea8edb4217da7798ef29759c2b5d27f7dcfb':
Fix race condition in pthread_create()
2012-08-17 16:30:02 -07:00
Elliott Hughes
1f6639a1bf
am d060b824: am efd39834: am e5242bfd: am 1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'd060b824dd293bf1ecd7814cd2e75a77186cefcb':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:04:52 -07:00
Joe Onorato
342e174b24
am 947f2e61: am 28ae6f5d: am cefb93b6: am 6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
...
* commit '947f2e610a89931b20a4ddd678e89df12c76e058':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
2012-08-17 00:18:26 -07:00
The Android Open Source Project
cd6fd2f14d
am 89a4090e: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '89a4090ecae61053e3ac6c9b96a8ee469495cf01':
2012-08-16 19:11:21 -07:00
Elliott Hughes
4b027b381f
am 12911624: am a7d8f3d5: am c80ca54f: am 60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit '129116241022d51ca915ef1d6b94d131a3f5569f':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:09:35 -07:00
Elliott Hughes
0a14d9f5c8
am ca82e1f3: am 820ad428: am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit 'ca82e1f3d17b57b1d5bbf0527cae58be1861e9ae':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:28:52 -07:00
Scott Anderson
4628d2f6bb
am cc8165ae: am 09d9dd3a: Merge "Add clean kernel header for uhid." into jb-mr1-dev
...
* commit 'cc8165aea50294c6a86ad456967a7a741ac85a65':
Add clean kernel header for uhid.
2012-08-16 12:07:53 -07:00
Elliott Hughes
26145cfc18
am 949d6faa: am a626bbdb: am 4af9141c: am ae728099: Merge "enable clone system call for x86"
...
* commit '949d6faa96e25170293d2a9ebe6f76cc91b77a6e':
enable clone system call for x86
2012-08-15 17:26:44 -07:00
Elliott Hughes
1d16b89289
am 31041a01: am 29af938c: am ab8850f7: am 07cd1125: Merge "Fix comment typos."
...
* commit '31041a0138d62879257d6980abd1e006c299752b':
Fix comment typos.
2012-08-15 17:11:48 -07:00
Elliott Hughes
b8d2695c82
am cdbd3406: am 4d63f33c: am 76aad1d2: am e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'cdbd3406f51d7f21326fe99df21e48a9191dddc1':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:11:47 -07:00
Elliott Hughes
0681b2e477
am f53c75e5: am 2e3756b4: am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'f53c75e513cb088d712badc32b89a8792a329d63':
Switch to the current NetBSD regex implementation.
2012-08-15 16:03:03 -07:00
The Android Open Source Project
c05ca5f058
am e24cde44: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e24cde4406792ee57f5dbfaa1efc35131f289063':
2012-08-15 08:29:17 -07:00
Elliott Hughes
cc9f4d56c0
am ff45d5cd: am 82259117: am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."
...
* commit 'ff45d5cdbfc4117d69fc688f12ec251297eb8751':
Sort NOTICE entries.
2012-08-14 15:47:31 -07:00
Iliyan Malchev
422bb8b5c4
am 912dd712: am df88d88f: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit '912dd71259959a259478465296438e83d0ad8e64':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:43:18 -07:00
Elliott Hughes
ea4900b89a
am 0a3f66e9: am fdbecf3b: am 63696738: am b6a97196: Merge "More cleanup."
...
* commit '0a3f66e9a0ef47dc2f751292a69434405221ef90':
More cleanup.
2012-08-14 15:14:56 -07:00
Elliott Hughes
8af9d9a7d0
am 7bb37492: am 89a35435: am 16a0cbaa: am b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '7bb37492cc371e9bbca68406af1b94ae1348fe3c':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:33:05 -07:00
Elliott Hughes
6bdc30e923
am 028ed539: am dc320d99: am 82b69fcb: am b9c6854c: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit '028ed539ddbe577687ac9778382c98aab3bf279f':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:21:21 -07:00
Elliott Hughes
a10b277de2
am bfcd5525: am b6d6ec53: am 370a7094: am c50e0197: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'bfcd55250058e927e0c6d0b94337c89fc2d86fa2':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:21:20 -07:00
Jeff Sharkey
0febe091a5
am 21f7ef9e: am d8450043: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit '21f7ef9eb269f75d7c291b4c574eabc865bf4362':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:11:01 -07:00
Elliott Hughes
d52075bd97
am 2bc1cade: am 93a9d534: am d544bdfa: am 54655eaf: Merge "Fix nice..."
...
* commit '2bc1cadeff4b7d41c889b8f1b965028ec575bed6':
Fix nice...
2012-08-13 17:16:55 -07:00
Elliott Hughes
50b4523380
am aa29740c: am 69fc1522: am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa29740ce252113071f96872b7b99c8528bd1637':
Clean up warnings in stubs.cpp.
2012-08-13 16:28:44 -07:00
Elliott Hughes
71c9a05614
am c37b31d8: am eab7bddd: am ca09412a: am 222eec2e: Merge "Handle naming for system uids running as secondary users"
...
* commit 'c37b31d848050b6bc534984556641f738fa0324b':
Handle naming for system uids running as secondary users
2012-08-13 16:10:32 -07:00
Elliott Hughes
66c033868f
am c64c1b49: am ad8ff472: am c1eb7619: am 440e417d: Merge "Add dependencies on all the makefiles."
...
* commit 'c64c1b49fd5c51b1b6e87d88b233d23fa172d372':
Add dependencies on all the makefiles.
2012-08-13 16:10:31 -07:00
Elliott Hughes
4a5ab7a191
am 141a3b10: am cfd0345f: am 35dcf19b: am 66fba009: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '141a3b109c32acb0d7279ea85706db781bfc0594':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:10:30 -07:00
Amith Yamasani
79f3698f39
am c6c26a08: am ca7ee8a9: Merge "Handle naming for system uids running as secondary users" into jb-mr1-dev
...
* commit 'c6c26a08c8ffd431824e13c40328c35394fb4148':
Handle naming for system uids running as secondary users
2012-08-13 13:53:55 -07:00
Elliott Hughes
5dcf871abb
am 94d7f701: am 71c0366f: am e135d7f3: am a61ac525: Merge "Fix module constructor order."
...
* commit '94d7f701d1b5cda0621eb46160e11ccbeb85cdd3':
Fix module constructor order.
2012-08-13 11:15:25 -07:00
Nick Kralevich
f574ce603a
am 34e52129: am 19b10419: am 89fd9ecc: am 20b94c0c: Merge "linker: don\'t perform unnecessary mprotects"
...
* commit '34e5212961cb64cf690289bc94c59b3b6245694c':
linker: don't perform unnecessary mprotects
2012-08-13 09:51:48 -07:00
Elliott Hughes
259f4a1503
am 7261264c: am 2a22a69e: am 877dc946: am 072a7e6c: Merge "MIPS support to the libc Makefile"
...
* commit '7261264c3a336bfb6e52241c2ba80679cbba68c8':
MIPS support to the libc Makefile
2012-08-11 15:19:34 -07:00
Ben Cheng
dd8cd5d6bc
am daedcfc5: am 9eeaa4bd: am 7e3918eb: am 0bf5cf87: Merge "Set the dynamic field in the link map for the linker itself."
...
* commit 'daedcfc595f51b1fe22b53d272cee1a142305a11':
Set the dynamic field in the link map for the linker itself.
2012-08-11 15:19:33 -07:00
Ying Wang
c97c5fc788
Split out LOCAL_ASFLAGS.
...
Bug: 6967574
Change-Id: I5be50d582c1cb8075039b06292cf0745a996c3c4
2012-08-11 14:23:19 -07:00
Elliott Hughes
6a80cc9e08
am 516b26f2: am 0837c69a: am edf09bf9: am 316ee626: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit '516b26f2bf755879feb51d06dcd9511903d0a9bd':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:20:58 -07:00
Nick Kralevich
d7a941f210
am 17f65bf4: am 73d99958: am fabeb736: am 38a02b4b: Merge "crtend*: Add GNU_STACK note"
...
* commit '17f65bf468074083624aa7546da024193d70c50a':
crtend*: Add GNU_STACK note
2012-08-10 14:50:02 -07:00
Elliott Hughes
4a20a7f77c
am 623ed02e: am d71ada63: am 535477ca: am 3ede900b: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '623ed02e35fb8c5b8c868b11f53c005e39707f74':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:16:50 -07:00
Elliott Hughes
63c16f85c5
am be01adce: am 5adc7fdc: am b54e5f2a: am a1822dce: Merge "Add unshare() syscall."
...
* commit 'be01adce3653912644b33e34a3c7894cf42c71e9':
Add unshare() syscall.
2012-08-10 13:10:22 -07:00
Elliott Hughes
c383a32926
am 4fc5f6c3: am 5140b785: am f6922be2: am f91e2f72: Merge "Fix typo in SIGTTOU description."
...
* commit '4fc5f6c366dac9c3c264b94b413b1f162a60a53d':
Fix typo in SIGTTOU description.
2012-08-10 12:54:39 -07:00
Elliott Hughes
1bb1aea178
am 7186a132: am 55206504: am a618ea30: am 4ec9e343: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '7186a13284bd70840b396aaec2090804e461869c':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:54:38 -07:00
Elliott Hughes
c2817899e4
am 731ecf0a: am 29b8fb3d: am 3e83da43: am 9ad1d6f5: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '731ecf0a317b46e12a71542fdaa289d31898f3c0':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:54:37 -07:00
Elliott Hughes
75501a17f2
am d18b181a: am b6c1e34d: am dc6d5327: am 0836a7ff: Merge "Auto-generate a complete NOTICE file."
...
* commit 'd18b181a25b2fa21c20ecd4faaf5c8e6e50fb35b':
Auto-generate a complete NOTICE file.
2012-08-10 12:40:35 -07:00
Jeff Sharkey
b17cd156b5
am 9a477de2: am 6ccc2c8f: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '9a477de2f54922ba28dbc4789b12b83e64bd1474':
Add unshare() syscall.
2012-08-10 11:33:26 -07:00
The Android Open Source Project
cb221a5cbe
am 1551f18a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1551f18af0c75c2b2c3ca61168fe4284b54f1a2e':
2012-08-10 08:53:33 -07:00
Elliott Hughes
444a2bf314
am 8e1e66da: am 31ab6ac0: am 8cc8f7e0: am 709bb0f7: Merge "Remove ThirdPartyProject.prop."
...
* commit '8e1e66da21398b9ccd4ce68d855909e5eb53f6f0':
Remove ThirdPartyProject.prop.
2012-08-09 14:51:21 -07:00
Elliott Hughes
f1e95d935f
am 9550a7c5: am 3fc21198: am 531d348d: am a17b85d9: Merge "Remove the last .jam file."
...
* commit '9550a7c57c7f2ed98a5266843e1929cfd92c4a16':
Remove the last .jam file.
2012-08-09 12:15:02 -07:00
Elliott Hughes
1ab6f486de
am 0ac6d235: am b13ad93f: am 3820229b: am d504eee9: Merge "MIPS support to sys/ headers"
...
* commit '0ac6d23515cbeb8462b62be713119edb8718cd70':
MIPS support to sys/ headers
2012-08-08 17:49:39 -07:00
Elliott Hughes
a8e76ddf9e
am 1afca3f6: am 73ac7d94: am d2040cb2: am f655ce7e: Merge "Fix x86 build."
...
* commit '1afca3f69887d9c761d448ddc0c4031176351fe1':
Fix x86 build.
2012-08-08 17:49:38 -07:00
Elliott Hughes
40805076f9
am b02f100f: am 366c0199: am f3ffb8fa: am 78129204: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'b02f100fa41d1905013b571fa4092857b873d78d':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:34:04 -07:00
Elliott Hughes
baa35efba8
am 96fd6601: am 10e2d222: am d463f6e9: am 34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit '96fd66018cff2e3a217abdc95aafbcaea94e4a4e':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 15:11:55 -07:00
Jean-Baptiste Queru
6dd6634bf6
am d0a7bc2f: am affd1b42: am 9f3a8aaf: am 7e248be7: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit 'd0a7bc2fd61c052801226a7b92f544ebed6eb59a':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 15:11:30 -07:00
The Android Open Source Project
60ca41ebb7
am d9c2de10: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd9c2de10d94b1c46e0e3dee41bd6d8de673d2267':
2012-08-07 11:04:10 -07:00
The Android Open Source Project
fa844eff32
am 45193df5: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '45193df53aebb0764853aa21541e6f6ab73b9b9f':
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"
2012-08-06 13:35:38 -07:00
The Android Open Source Project
31096ceb79
am 1466b1aa: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1466b1aad294138fc1e189c6fdce5eb7a2d06a42':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-06 13:19:43 -07:00
Shih-wei Liao
6f2e8f9878
am 25ef2bbf: am 3b4c9db2: am df523880: am e2731d98: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit '25ef2bbf01bf6f8e934a07bd1304cba35ae5a38e':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:12:30 -07:00
Shih-wei Liao
dec42d9112
am 42bfbd1e: am 6ff66601: am ce4a5cd5: am 8173d767: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit '42bfbd1e617b7430fd5c62cb9162ab5c79655e3d':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:23:24 -07:00
Shih-wei Liao
839c4f1eb6
am ed33635d: am cddedade: am 924fd920: am 601a49d3: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit 'ed33635da7d8cfc6f5c61c5d7ab9bc42ab5b3916':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:23:23 -07:00
Elliott Hughes
b11eaaed35
am a870ded2: am eaac1e5a: am 94ce1356: am 7c92b6ca: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'a870ded21ac2e8b792ddc1fe1c5d71c421f0d8a1':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:09:25 -07:00
Elliott Hughes
15b3aef581
am 8ccbc90a: am 4bac8f68: am 7e81ee04: am 1c861728: Merge "Remove yet more SH4 cruft."
...
* commit '8ccbc90a3b6071dff015bff284b0a11d95a00349':
Remove yet more SH4 cruft.
2012-08-03 15:17:14 -07:00
Elliott Hughes
031226a9fd
am 9f8c7daf: am c9dbebe3: am f5385754: am aea5f00d: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit '9f8c7daf402738beda56868692e62a90e095481d':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:34:57 -07:00
Elliott Hughes
7478b0bfa6
am 58234e78: am 48955d24: am c6f15ecf: am 1510795f: Merge "Upgrade to tzdata2012e."
...
* commit '58234e788be30a16e6ba745adc21cbfd6d9828ec':
Upgrade to tzdata2012e.
2012-08-03 13:41:39 -07:00
David Turner
65f12237b8
am c7813c08: am d7552a31: am 2f2b7212: am 16d40217: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit 'c7813c08570a5e6ef3e410973d7f4b4befebee77':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:04:06 -07:00
Elliott Hughes
889a706637
am df7aa950: am 9b6a4538: am 0ce92b96: am 1e304a3b: Merge "[MIPS] Support for TLS register"
...
* commit 'df7aa95031f5f99ba3fc95956c38bf7ffd037ab4':
[MIPS] Support for TLS register
2012-08-02 18:51:38 -07:00
Elliott Hughes
855a3779be
am e5bd6efa: am f94effda: am fd4685be: am 52f3ee96: Merge "MIPS support for libc."
...
* commit 'e5bd6efa0805a743ed6c2022c65c5a8ff79d7310':
MIPS support for libc.
2012-08-02 16:39:18 -07:00
Elliott Hughes
36c27b547e
am 79d834b5: am 82dcfee5: am 19e30fc4: am a1c0f08d: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '79d834b5aba80407046ece1377033c8d48fbd427':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:13:40 -07:00
Elliott Hughes
967c9f7fcb
am 422067eb: am c0719660: am 670766c5: am 994935f6: Merge "Error numbers are target specific."
...
* commit '422067eb3ceba3c39903df5562cb8997b40d61c4':
Error numbers are target specific.
2012-08-02 16:13:38 -07:00
Elliott Hughes
fccadc38bd
am 0b8dda0e: am 673c092e: am 54830578: am f34ecbff: Merge "MIPS support to the linker"
...
* commit '0b8dda0e422e9669af06d9e6d264fb14652b23b5':
MIPS support to the linker
2012-08-02 15:45:45 -07:00
Brian Muramatsu
963a8fc036
am fa22fd9f: am 402ec708: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
...
* commit 'fa22fd9f817e0fe49e0f7524f5589710f1140d8f':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:24:34 -07:00
The Android Open Source Project
3a6e56534d
am d7b3cc0c: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd7b3cc0c69b02cad4090a0068349f1ab83e3112f':
2012-08-02 15:09:18 -07:00
The Android Open Source Project
2a258c9f2d
am 8f2f2466: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8f2f24661870c349a19bff71d85ed5eb897c7c9f':
2012-08-01 14:50:42 -07:00
Shih-wei Liao
543960121c
am cfc8b93c: am 4f13bdd4: am 7565d5b1: am 0ca9d074: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit 'cfc8b93c4e223f72a2e419f4571f55f7eb819df3':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:07:50 -07:00
Elliott Hughes
96ca71a7a6
am 029cf34c: am 81f1617a: am 8d2c5b24: am b910b6f8: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '029cf34cfd3fc50fe373527c82855924a1db41ad':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:35:53 -07:00
The Android Open Source Project
338d3fbc8b
am 6ac55791: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '6ac557918a1a5703f0376f659e5cb1a9af6a2901':
2012-07-31 15:05:49 -07:00
Elliott Hughes
0f004be596
am 494e534b: am f1997971: am 7645355e: am a513f70b: Merge "bionic: Stack pointer/signal race condition."
...
* commit '494e534b003a45c32e06d225cd89ad84777d28f7':
bionic: Stack pointer/signal race condition.
2012-07-31 10:43:46 -07:00
Elliott Hughes
120e7fbeb9
am ad2e065d: am b78aa539: am bf397b60: am 21372896: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'ad2e065de11748e1c33562cd2005ce14843d64f0':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:43:45 -07:00
The Android Open Source Project
d8b46b7bc4
am 0531d199: Reconcile with jb-mr1-release
...
* commit '0531d199dca9d70ccfd4642f845de02736ecf87f':
2012-07-30 15:10:37 -07:00
Shih-wei Liao
a68c57ee5f
am 0c2d3188: am 18421669: am 1ee6e3b7: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '0c2d3188373d7386b5946d1cf70155188cd616cd':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:17:01 -07:00
The Android Automerger
f40c69c259
merge in master-release history after reset to master
2012-07-25 07:49:07 -07:00
The Android Automerger
1e52e79b70
merge in master-release history after reset to master
2012-07-24 07:49:06 -07:00
The Android Automerger
aaba380787
merge in master-release history after reset to master
2012-07-20 07:59:22 -07:00
The Android Automerger
43ef6784df
merge in master-release history after reset to master
2012-07-19 07:49:05 -07:00
The Android Automerger
d18f341398
merge in master-release history after reset to master
2012-07-17 09:10:34 -07:00
Nick Kralevich
761ba27d62
Merge "FORTIFY_SOURCE: revert memcpy changes."
2012-07-16 15:18:43 -07:00
Cédric Cabessa
beb349348e
syslog needs a valid socket path for _PATH_LOG
...
/dev/kmsg is a character device already used for different purposes.
Most distribution use /dev/log for _PATH_LOG but this path is already used
by logcat.
I suggest using /dev/syslog.
This change was tested with busybox's syslogd.
Change-Id: I75b428123c7a0b3ca4bea656ce06860f6f727dde
2012-05-13 17:16:06 +02:00