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
ccd403161c
Merge "use architecture-specific ssize_t definition"
2013-02-19 22:13:53 +00:00
Thorsten Glaser
c641cafbc3
use architecture-specific ssize_t definition
...
after change 32822 was rejected, this is the more light-weight
version of the fix: libc/include/sys/types.h already - via
libc/kernel/common/linux/posix_types.h - includes a definition
of __kernel_ssize_t from libc/kernel/arch-*/asm/posix_types.h
which is architecture-specific, toolchain-agnostic and also
gets rid of the gcc -Wformat warning (which it issues correctly,
since this i̲s̲ indeed a bug in bionic)
Change-Id: Ie4503ab16628bc25815a836d07556f665e9795c7
2013-02-19 14:12:55 -08:00
Elliott Hughes
593abb7b59
Merge "stdlib: atexit: include <sys/cdefs.h>"
2013-02-19 21:58:18 +00:00
Elliott Hughes
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
eeecff7293
Merge "Fix pthreads functions that should return ESRCH."
2013-02-19 21:37:55 +00:00
Elliott Hughes
9d23e04c43
Fix pthreads functions that should return ESRCH.
...
imgtec pointed out that pthread_kill(3) was broken, but most of the
other functions that ought to return ESRCH for invalid/exited threads
were equally broken.
Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-19 12:21:41 -08:00
Elliott Hughes
6f55284103
am b5862d4d
: Merge "Update linker README."
...
* commit 'b5862d4d8a1246dc1e21695cf3bacafefedf0428':
Update linker README.
2013-02-19 11:39:40 -08:00
Elliott Hughes
b5862d4d8a
Merge "Update linker README."
2013-02-19 19:14:26 +00:00
Elliott Hughes
aa772a33ba
Update linker README.
...
Change-Id: Icaa353e9cf1848c86e7445f4ad590bdab44f7941
2013-02-19 11:13:44 -08:00
The Android Automerger
82232f0e6b
merge in jb-mr2-release history after reset to master
2013-02-19 09:50:40 -08:00
Chirayu Desai
61ba9b526b
stdlib: atexit: include <sys/cdefs.h>
...
Change-Id: Ib9eb167710a021e0a2b5c77a06a9338cdc748e6d
2013-02-16 21:23:27 +05:30
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
7f67f78ad5
Merge "dalvik is big enough and ugly enough to handle System.arraycopy itself."
2013-02-16 00:40:21 +00: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
081318e355
dalvik is big enough and ugly enough to handle System.arraycopy itself.
...
Change-Id: I4b54a15ea101c0c6bab06cfb11e4178f5a57fc05
2013-02-15 14:27:52 -08:00
Elliott Hughes
39804dcde6
Merge "Fix the pthread_setname_np test."
2013-02-15 21:55:22 +00:00
Elliott Hughes
40eabe24e4
Fix the pthread_setname_np test.
...
Fix the pthread_setname_np test to take into account that emulator kernels are
so old that they don't support setting the name of other threads.
The CLONE_DETACHED thread is obsolete since 2.5 kernels.
Rename kernel_id to tid.
Fix the signature of __pthread_clone.
Clean up the clone and pthread_setname_np implementations slightly.
Change-Id: I16c2ff8845b67530544bbda9aa6618058603066d
2013-02-15 12:08:59 -08:00
Elliott Hughes
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
3e3b239d2b
Merge "Fix the stack protector death test."
2013-02-15 02:10:29 +00:00
Elliott Hughes
7fd803cdfa
Fix the stack protector death test.
...
Now __stack_chk_fail calls abort(3) directly, we terminate with
SIGSEGV rather than SIGABRT. (Because of the workaround for the
debuggerd lossage in the abort(3) implementation, which was the
motivation for switching __stack_chk_fail over to abort(3).)
Also clarify the comment on the weird pthread death test, so it
doesn't get copied and pasted onto real death tests.
Change-Id: Ie832eaded61359c99e7a10db65e28f35e8f63eed
2013-02-14 16:35:58 -08:00
Elliott Hughes
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
Elliott Hughes
0a2cb81597
Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."
2013-02-14 23:50:13 +00:00
Nick Kralevich
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
Nick Kralevich
b128f49fd5
Merge "bionic: Add securebits.h"
2013-02-14 22:49:28 +00:00
Elliott Hughes
fb7eb5e07f
Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.
...
Bug: 2487269
Change-Id: Iec5e470fc22cd9108404f634a9d4baa2c7b7f58f
2013-02-14 14:37:34 -08:00
Nick Kralevich
0276656daa
bionic: Add securebits.h
...
Change-Id: I2031796b9be117558b80246498b29736492cf269
2013-02-14 14:03:37 -08:00
Elliott Hughes
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
Elliott Hughes
c2d26ce745
Merge "Turn on -Werror for ssp.cpp."
2013-02-14 19:17:33 +00:00
Elliott Hughes
dc5ec07158
Turn on -Werror for ssp.cpp.
...
libc_bionic.a is already compiled -Werror, but this one file gets
compiled into its own library because it needs to be compiled with
-fno-stack-protector.
Change-Id: I273c535ab5c73ccaccbcf793fda1f788a2589abe
2013-02-14 11:15:58 -08:00
Nick Kralevich
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
Nick Kralevich
fe33fc790a
Merge "fix compiler warning."
2013-02-14 17:48:30 +00:00
Nick Kralevich
a261afb7c9
fix compiler warning.
...
bionic/libc/bionic/ssp.cpp:41:31: warning: converting to non-pointer type 'uintptr_t {aka unsigned int}' from NULL [-Wconversion-null]
Change-Id: Id154ed4a99520cca64ffd3dbe4d743db6e2da28a
2013-02-14 09:44:13 -08:00
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
6b97c7dc03
Merge "ffs was not being built for x86."
2013-02-14 00:49:47 +00:00
Elliott Hughes
97f2ec50a7
Merge "Stop using the local gcc."
2013-02-14 00:48:53 +00:00
Elliott Hughes
26a13bcfb8
Stop using the local gcc.
...
Some build servers are still out of date, so we're better off having
the known quanitity of the consistently out-of-date prebuilt host gcc.
Change-Id: Ib6308ae926ffa1ac5d95efbbf32052344c17a6b8
2013-02-13 16:32:47 -08:00
Elliott Hughes
d2547040a1
ffs was not being built for x86.
...
Change-Id: I53e92273664a4d0a13536c2fa1aeb87e1f3cf4e8
2013-02-13 16:31:52 -08:00
Elliott Hughes
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
95b1ea1bb3
Merge "Add a bunch more missing ENDs to assembler routines."
2013-02-13 23:18:26 +00:00
Elliott Hughes
6719500dbd
Add a bunch more missing ENDs to assembler routines.
...
This isn't everything; I've missed out those x86 files that are
Change-Id: Idb7bb1a68796d6c0b70ea2b5c3300e49da6c62d2
2013-02-13 15:12:32 -08:00
Elliott Hughes
2fee0340a9
Merge "Everyone has CLZ."
2013-02-13 23:10:19 +00:00
Elliott Hughes
73964c592c
Everyone has CLZ.
...
Even armv5 had CLZ.
Change-Id: I51bc8d1166d09940fd0d3f4c7717edf26977082c
2013-02-13 14:40:48 -08:00
Elliott Hughes
8ca1da6e71
resolved conflicts for merge of 62727429
to master
...
Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e
2013-02-13 13:51:54 -08:00
Elliott Hughes
627274292e
Merge "Update getnameinfo.c, remove dead code, and fix error reporting."
2013-02-13 21:15:05 +00:00