Elliott Hughes
f6bb5bf498
Merge "Add the glibc-compatible names to <sys/endian.h>."
2013-02-22 21:46:59 +00: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
Elliott Hughes
440bc83d92
am 7b2c6385
: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit '7b2c6385effbb6d6e98bfe29cc6c144211128d9e':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:10:15 -08:00
Nick Kralevich
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
cadc858329
am bc0e7ee1
: Merge "libc: add sys/signal.h for compatibility"
...
* commit 'bc0e7ee18157c2ffe65644514555689f4259ccfe':
libc: add sys/signal.h for compatibility
2013-02-22 11:53:05 -08:00
Elliott Hughes
7b2c6385ef
Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
2013-02-22 19:49:39 +00:00
Nick Kralevich
5d36baee95
Merge "gethostbyname: fix crash"
2013-02-22 19:32:37 +00:00
Elliott Hughes
6f1b7a6407
Fix <memory.h> to be a synonym for <string.h> like in glibc.
...
Change-Id: If23589c5d85dffd28788e04b010303620fa178ca
2013-02-22 11:11:48 -08:00
Elliott Hughes
cf820d7e96
Add the glibc-compatible names to <sys/endian.h>.
...
Also remove declarations for functions that don't exist; these
are all macros.
Bug: http://code.google.com/p/android/issues/detail?id=41769
Change-Id: Ia3774ab2ff7d3c535f83774eac61068f9b11e194
2013-02-22 11:04:27 -08:00
Nick Kralevich
b22a684990
libc: add sys/signal.h for compatibility
...
Some applications look for sys/signal.h instead of signal.h.
Work around those apps.
Change-Id: I76ac7744ebc56d196b5f0cb9ed381d32817436b9
2013-02-22 10:38:28 -08:00
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
Elliott Hughes
2a5b57db8c
am 580a7073
: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit '580a707376d81bfcb39919f0a1203b39a39dbd8a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 17:55:28 -08:00
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
538f6fc202
Stop advertising rindex(3), which is both deprecated and unimplemented.
...
Change-Id: I3c775d9974e49c3f76a53e46e022659657b89034
2013-02-21 17:39:06 -08:00
Nick Kralevich
398f46dd92
am a0259b42
: Merge "libc: remove bcmp prototype"
...
* commit 'a0259b42eba08e6d71a274fa3f770afccbb93107':
libc: remove bcmp prototype
2013-02-21 17:39:03 -08:00
Nick Kralevich
a0259b42eb
Merge "libc: remove bcmp prototype"
2013-02-22 01:22:35 +00:00
Nick Kralevich
11ebbc8437
libc: remove bcmp prototype
...
AFAIK, bionic only ever provided an implementation of bcmp
for x86, and even then, the code was never actually compiled.
Remove the prototype.
bcmp() has been obsoleted and replaced by memcmp()
Change-Id: I549d02ab6a9241a9acbbbfade0d98a9a02c2eaee
2013-02-21 17:17:09 -08:00
Elliott Hughes
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
Elliott Hughes
719d46f8ac
am a9ff09d1
: Merge "Fix raise(3) so it works in signal handlers."
...
* commit 'a9ff09d1fc22292adc12cf99d4d44448d619b3cf':
Fix raise(3) so it works in signal handlers.
2013-02-21 14:17:47 -08:00
Elliott Hughes
fae89fc404
Fix raise(3) so it works in signal handlers.
...
We could special-case raise(3) in non-threaded programs, but the more
conservative course is to make pthread_kill(3) work in signal handlers
at the cost of a race shared by other C libraries.
Change-Id: I59fb23d03bdabf403435e731704b33acdf3e0234
2013-02-21 11:22:23 -08:00
Jean-Baptiste Queru
818b1423d2
Fix mako builds. Do not merge.
...
Revert "Regenerate msm_ion.h."
This reverts commit 3fac8f7f49
.
2013-02-20 12:47:58 -08:00
Elliott Hughes
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
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
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
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
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
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
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
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
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
a261afb7c9
fix compiler warning.
...
bionic/libc/bionic/ssp.cpp:41:31: warning: converting to non-pointer type 'uintptr_t {aka unsigned int}' from NULL [-Wconversion-null]
Change-Id: Id154ed4a99520cca64ffd3dbe4d743db6e2da28a
2013-02-14 09:44:13 -08:00
Elliott Hughes
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
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
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
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
d8213bb573
Update getnameinfo.c, remove dead code, and fix error reporting.
...
Also add a unit test for the salen size checking.
Bug: 1889275
Change-Id: I8ec4107df9e2e9a8571e8915525249c6e44b98ad
2013-02-13 13:11:11 -08:00
Elliott Hughes
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
Elliott Hughes
3002d64bcd
Merge "Everyone has a TLS register."
2013-02-13 16:03:32 +00:00
Elliott Hughes
b6032515a0
Fix __pthread_clone and __bionic_clone error handling on x86.
...
Bug: 3461078
Change-Id: I93c151e27411211dd32717f206745c62c08c21ee
2013-02-12 23:02:33 -08:00
Elliott Hughes
91a9925998
Everyone has a TLS register.
...
Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-12 21:56:42 -08:00
Elliott Hughes
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
59aeff9417
Merge "Use ENTRY/END in custom x86 assembler too."
2013-02-13 04:01:01 +00: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
4b4a882428
Clean up pthread_create.
...
Bug: 3461078
Change-Id: I082122a86d7692cd58f4145539241be026258ee0
2013-02-12 17:15:59 -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
6d33918207
Simplify pthread_create, using more public API.
...
Change-Id: I08e65ba88ed01436223e4e528631c9e41ec0e7f4
2013-02-12 16:36:04 -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
Elliott Hughes
9f878c2fca
Really set errno if __pthread_clone fails.
...
If r0 == 0, we're the child. If r0 > 0, we're the parent.
Otherwise set errno.
The __bionic_clone code I copy & pasted was wrong. This patch
fixes both.
Bug: 3461078
Change-Id: Ibb7d6cc7e54e666841f2f0dc59a141a0b31982e4
2013-02-12 16:07:06 -08:00
Elliott Hughes
558a8b1d3b
Merge "Revert "Revert "More pthreads cleanup."""
2013-02-13 00:05:24 +00:00
Elliott Hughes
3e898476c7
Revert "Revert "More pthreads cleanup.""
...
This reverts commit 6f94de3ca4
(Doesn't try to increase the number of TLS slots; that leads to
an inability to boot. Adds more tests.)
Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca
2013-02-12 15:27:18 -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
Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00: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
bfa199ab40
am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
Revert "More pthreads cleanup."
2013-02-11 22:16:56 -08:00
Elliott Hughes
fcaf4e9f9b
Merge "Revert "More pthreads cleanup.""
2013-02-12 06:07:32 +00:00
Elliott Hughes
6f94de3ca4
Revert "More pthreads cleanup."
...
This reverts commit 2a1bb4e646
Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51
2013-02-12 06:06:22 +00: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
a2a9817f4c
am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '85f491f96da3b79d0d7cc5368bc1f649e1a82340':
More pthreads cleanup.
2013-02-11 18:35:56 -08:00
Elliott Hughes
85f491f96d
Merge "More pthreads cleanup."
2013-02-12 02:33:08 +00:00
Elliott Hughes
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
605cc29358
am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '83bf28e6a38dbf28707147b50d29e81f4b555046':
Fix MIPS build.
2013-02-11 18:19:34 -08:00
Elliott Hughes
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
83bf28e6a3
Merge "Fix MIPS build."
2013-02-12 02:08:05 +00:00
Elliott Hughes
ba342c11ad
Fix MIPS build.
...
Change-Id: I4863f21f3c2fd597ea36cb7096fc72db808643a3
2013-02-11 18:06:23 -08:00
Elliott Hughes
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
Elliott Hughes
8e2b28cb6c
am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c56be54a18eff7e1c35c9a19cfc8b84a80780b73':
Use ENTRY/END in ARM __get_sp.
2013-02-11 17:27:40 -08:00
Elliott Hughes
bdff26df27
Use ENTRY/END in custom x86 assembler too.
...
Change-Id: Ic2e482e5daff29c65d3b2ab0b2111c996bbc6226
2013-02-11 17:08:16 -08:00
Elliott Hughes
d7a3a403c1
Use ENTRY/END in ARM __get_sp.
...
Change-Id: If2f159b266f5fa4ad9d188a17d4cd318b605e446
2013-02-11 16:58:34 -08:00
Elliott Hughes
c440d24423
am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'cae7b2cfb509e7d5d10a8085b1ec319daaef768f':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 16:55:16 -08:00
Elliott Hughes
5e3fc43dde
Fix __pthread_clone on ARM to set errno on failure.
...
MIPS and x86 appear to have been correct already.
(Also fix unit tests that ASSERT_EQ with errno so that the
arguments are in the retarded junit order.)
Bug: 3461078
Change-Id: I2418ea98927b56e15b4ba9cfec97f5e7094c6291
2013-02-11 16:39:10 -08:00
Elliott Hughes
03798dd23c
am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1fea0f258a45d918fe5ae8e9769f45c0348bd095':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 16:17:48 -08:00
Elliott Hughes
f94fd3ccc6
Clean up ARM assembler files to use ENTRY/END.
...
We also don't need legacy syscall support (non-"swi 0").
Change-Id: Id1012e8ca18bf13f3f4e42200f39ba0e2e632cbf
2013-02-11 15:36:59 -08:00
Elliott Hughes
2a1bb4e646
More pthreads cleanup.
...
POSIX says pthread_create returns EAGAIN, not ENOMEM.
Also pull pthread_attr_t functions into their own file.
Also pull pthread_setname_np into its own file.
Also remove unnecessary #includes from pthread_key.cpp.
Also account for those pthread keys used internally by bionic,
so they don't count against the number of keys available to user
code. (They do with glibc, but glibc's limit is the much more
generous 1024.)
Also factor out the common errno-restoring idiom to reduce gotos.
Bug: 6702535
Change-Id: I555e66efffcf2c1b5a2873569e91489156efca42
2013-02-11 14:56:39 -08:00
Elliott Hughes
6b73d13fa4
am 2d3e7233
: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2d3e72336e76180fb00822386da4f14203d117ce':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 12:38:30 -08:00
Elliott Hughes
e4b08318c1
am 8397cdba
: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review
* commit '8397cdba9424febeaed4068829a5b0174ee1138c':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 12:21:50 -08:00
Elliott Hughes
44b53ad681
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
This reverts commit 6260553d48
(Removing the accidental libm/Android.mk change.)
Change-Id: I6cddd9857c31facc05636e8221505b3d2344cb75
2013-02-11 12:20:33 -08:00
Elliott Hughes
6260553d48
Revert "Pull the pthread_key_t functions out of pthread.c."
...
This reverts commit ad59322ae4
somehow my unfinished libm/Android.mk change got into here.
Change-Id: I46be626c5269d60fb1ced9862f2ebaa380b4e0af
2013-02-11 20:18:16 +00:00
Elliott Hughes
024246ec27
am 09e89c3c
: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '09e89c3ced51d846e13c2508fbb6812bb61475cd':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 12:05:45 -08:00
Elliott Hughes
ad59322ae4
Pull the pthread_key_t functions out of pthread.c.
...
This was originally motivated by noticing that we were setting the
wrong bits for the well-known tls entries. That was a harmless bug
because none of the well-known tls entries has a destructor, but
it's best not to leave land mines lying around.
Also add some missing POSIX constants, a new test, and fix
pthread_key_create's return value when we hit the limit.
Change-Id: Ife26ea2f4b40865308e8410ec803b20bcc3e0ed1
2013-02-11 12:00:48 -08:00
Elliott Hughes
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
8f509e8be1
am 9a9bb243
: Merge "Switch to using AT_RANDOM for the stack guards."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9a9bb243b50be5e3910b8edad72327bc216e72d0':
Switch to using AT_RANDOM for the stack guards.
2013-02-08 11:22:05 -08:00
Elliott Hughes
9a9bb243b5
Merge "Switch to using AT_RANDOM for the stack guards."
2013-02-08 19:17:33 +00:00
Elliott Hughes
d3920b3a99
Switch to using AT_RANDOM for the stack guards.
...
Bug: 7959813
Change-Id: I8db4b8912ba649bfe668c6f22aa44690ddd401a2
2013-02-08 11:16:13 -08:00
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
Nick Kralevich
f156b901b1
am fa75fce5
: Merge "update xattr.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fa75fce56641255a571b8b472f010863c3095b70':
update xattr.h
2013-02-07 16:50:08 -08:00
Nick Kralevich
b184d3ba33
update xattr.h
...
Change-Id: Ibd91167ba56e2692359b92fe3108da271f0c2e38
2013-02-07 16:23:16 -08:00
Elliott Hughes
86e4e23408
am 964886af
: Merge "Remove dead code from gensyscalls.py."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '964886afa339959aedad1c09af738df4ffa4091d':
Remove dead code from gensyscalls.py.
2013-02-07 14:57:41 -08:00
Elliott Hughes
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
Elliott Hughes
cd6780b167
Remove dead code from gensyscalls.py.
...
Change-Id: I0df69f8fd990f829ccbfcd5123c17b523d5a4d45
2013-02-07 14:07:00 -08:00
Elliott Hughes
5bb67760f0
am f6afd3b6
: Merge "Fix x86 build, remove void* arithmetic."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6afd3b670e23f56bf341d12136416aee17ea249':
Fix x86 build, remove void* arithmetic.
2013-02-07 12:34:24 -08:00
Elliott Hughes
8ddef40dad
am 59e9a496
: Merge "__progname should be const char*, not char*."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59e9a496b4341fd2b11d4a01544bf7edf3d00cc5':
__progname should be const char*, not char*.
2013-02-07 12:34:23 -08:00
Elliott Hughes
f6afd3b670
Merge "Fix x86 build, remove void* arithmetic."
2013-02-07 20:27:40 +00:00
Elliott Hughes
646e058136
Fix x86 build, remove void* arithmetic.
...
Change-Id: Idc7f14af2e094ac33de315e808176237af063bb8
2013-02-07 12:16:10 -08:00
Elliott Hughes
e4ccf5a138
__progname should be const char*, not char*.
...
Change-Id: I8e846872c30a712fbc05c8da59ffa1cec1be31a4
2013-02-07 12:06:44 -08:00
Elliott Hughes
6f67cd224e
am 2f41531f
: Merge "Clean up the argc/argv/envp/auxv handling."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2f41531ff9f48dbdaf2ba711e14c669031728e99':
Clean up the argc/argv/envp/auxv handling.
2013-02-07 11:56:57 -08:00
Elliott Hughes
2f41531ff9
Merge "Clean up the argc/argv/envp/auxv handling."
2013-02-07 19:48:17 +00:00
Elliott Hughes
42b2c6a5ee
Clean up the argc/argv/envp/auxv handling.
...
There's now only one place where we deal with this stuff, it only needs to
be parsed once by the dynamic linker (rather than by each recipient), and it's
now easier for us to get hold of auxv data early on.
Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 11:44:21 -08:00
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
Elliott Hughes
4e9d9e4df8
am d4187efd
: Merge "Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd4187efd7f9c30ffaff4738862e3d08be27a52e9':
Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs.
2013-02-07 09:12:18 -08:00
Elliott Hughes
7582a9c119
Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs.
...
Also update the x86 asm.h to support this; we need it for libm assembler
anyway.
Also clean up the _FBSDID hack in <sys/cdefs.h>.
Change-Id: Iababd977b8110ec022bf7c93f4d62ece47630e7c
2013-02-06 17:08:15 -08:00
Elliott Hughes
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
Elliott Hughes
df8c72e510
am d7ff139f
: Merge "Remove bogus extra alignment from sbrk."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'd7ff139fec5cec08793523aa97503ade2b13c38e':
Remove bogus extra alignment from sbrk.
2013-02-05 17:09:55 -08:00
Elliott Hughes
428f5567be
Remove bogus extra alignment from sbrk.
...
Bug: https://code.google.com/p/android/issues/detail?id=37349
Change-Id: I970c7b6be7bb7fbe6bbbe2c332f05816aeb0e09f
2013-02-05 16:10:59 -08:00
Elliott Hughes
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
3cbcb87bd1
am a4f88fdc
: Merge "Document the mallinfo struct, add missing attributes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a4f88fdcf0e9be084d04048ad65671716298c3c2':
Document the mallinfo struct, add missing attributes.
2013-02-04 13:59:15 -08:00
Elliott Hughes
24fad01755
Document the mallinfo struct, add missing attributes.
...
Change-Id: Ia97acce1f6a83bd8b3ba8dd20efd962bc96f35a9
2013-02-04 13:44:14 -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
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
Elliott Hughes
ada6de673b
am a1821f01
: Merge "Regenerate msm_ion.h."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a1821f015306e221e6a51e5acc27176ae2d72f6b':
Regenerate msm_ion.h.
2013-02-04 10:52:16 -08:00
Elliott Hughes
3fac8f7f49
Regenerate msm_ion.h.
...
Bug: 8000377
Change-Id: If496d9972cb8aebfc996ac641aa762220aa71f3b
2013-02-01 18:21:08 -08:00
Elliott Hughes
16444e0f85
am 3dc6b57c
: Merge "Don\'t claim there were no leaks if we weren\'t even checking."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3dc6b57cf54b15a756551deeda33df5715e519bb':
Don't claim there were no leaks if we weren't even checking.
2013-02-01 17:26:56 -08:00
Elliott Hughes
9c81892c2e
Don't claim there were no leaks if we weren't even checking.
...
Bug: 8107016
Change-Id: I9059f1f8374ebcdf00dfc6ac74d3709f501292c9
2013-02-01 17:07:40 -08:00
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
Elliott Hughes
704d9c5b45
am a9dd3670
: Merge "Restore bionic\'s <linux/elf-em.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a9dd36702f4a9d65d084387050b688b8965b13b3':
Restore bionic's <linux/elf-em.h>.
2013-02-01 16:19:37 -08:00
Elliott Hughes
a48e1b2aac
Restore bionic's <linux/elf-em.h>.
...
Used by <linux/audit.h>.
Change-Id: Ica4ebb7f52a7fce13c52fdff35e187ded3939382
2013-02-01 16:10:28 -08:00
Elliott Hughes
ff26e25b51
am 44badc70
: Merge "Upgrade libm."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '44badc70ccd35d7690bda9f107e3e5da0b80d295':
Upgrade libm.
2013-02-01 15:24:27 -08:00
Elliott Hughes
44badc70cc
Merge "Upgrade libm."
2013-02-01 23:07:49 +00:00
Elliott Hughes
a0ee07829a
Upgrade libm.
...
This brings us up to date with FreeBSD HEAD, fixes various bugs, unifies
the set of functions we support on ARM, MIPS, and x86, fixes "long double",
adds ISO C99 support, and adds basic unit tests.
It turns out that our "long double" functions have always been broken
for non-normal numbers. This patch fixes that by not using the upstream
implementations and just forwarding to the regular "double" implementation
instead (since "long double" on Android is just "double" anyway, which is
what BSD doesn't support).
All the tests pass on ARM, MIPS, and x86, plus glibc on x86-64.
Bug: 3169850
Bug: 8012787
Bug: https://code.google.com/p/android/issues/detail?id=6697
Change-Id: If0c343030959c24bfc50d4d21c9530052c581837
2013-02-01 14:51:19 -08:00
Elliott Hughes
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
9743d7fb60
am fb55511e
: am e1a124e5
: Merge "Say explicitly if there were no leaks."
...
# Via Android Git Automerger (1) and others
* commit 'fb55511e71900476fd03f9c490dc60269d076d1f':
Say explicitly if there were no leaks.
2013-01-30 12:11:30 -08:00
Elliott Hughes
fb55511e71
am e1a124e5
: Merge "Say explicitly if there were no leaks."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'e1a124e5c93b59e2b6792e4de8a2c72dc0a78be1':
Say explicitly if there were no leaks.
2013-01-30 12:09:14 -08:00
Elliott Hughes
1d12d57416
Say explicitly if there were no leaks.
...
Otherwise people trying to use this are left wondering "did I not leak, or did
the leak checking code not get called when I exited?".
Change-Id: If79b225f8a2e24dd69aba1fb836bf9e81bb00efe
2013-01-30 11:38:26 -08:00
Elliott Hughes
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
Elliott Hughes
9d43c07987
am 4e882503
: am a990cf5b
: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Android Git Automerger (1) and others
* commit '4e8825038e08762dcc973fa435b531f10290ffa8':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:31:24 -08:00
Elliott Hughes
4e8825038e
am a990cf5b
: Merge "Clean up trailing whitespace in the kernel headers."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a990cf5b3392c5aef767aee1e67b4d7ef651afc6':
Clean up trailing whitespace in the kernel headers.
2013-01-30 10:28:59 -08:00
Elliott Hughes
a990cf5b33
Merge "Clean up trailing whitespace in the kernel headers."
2013-01-30 18:13:29 +00:00
Elliott Hughes
c95eb57405
Clean up trailing whitespace in the kernel headers.
...
And fix the scripts so they stop letting trailing whitespace through.
Change-Id: Ie109fbe1f63321e565ba0fa60fee8e9cf3a61cfc
2013-01-30 10:13:07 -08:00
Elliott Hughes
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
5821e11d0b
am 7bc49fcf
: am 323287ea
: Merge "Fix valgrind build."
...
# Via Android Git Automerger (1) and others
* commit '7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4':
Fix valgrind build.
2013-01-29 18:09:26 -08:00
Elliott Hughes
7bc49fcfc0
am 323287ea
: Merge "Fix valgrind build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '323287ea7fb1d22f64b49d701b33cef9fbaf757d':
Fix valgrind build.
2013-01-29 18:06:19 -08:00
Elliott Hughes
6fe67c3cf2
Fix valgrind build.
...
Change-Id: Ie375d32565d10f4c0c56da5422f52b68cb069654
2013-01-29 17:49:12 -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
9d995d6721
am 1cc09402
: am f6721978
: Merge "Fix x86 build to use <elf.h>."
...
# Via Android Git Automerger (1) and others
* commit '1cc09402e86b91213e06a9a349c5c510cefcf1d5':
Fix x86 build to use <elf.h>.
2013-01-29 17:04:14 -08:00
Elliott Hughes
0a383883fa
am be11de2b
: am 5fb409b7
: Merge "Bring the NOTICE files back up to date."
...
# Via Android Git Automerger (1) and others
* commit 'be11de2b52ac5f8cbb5a733821cb27002f2ea975':
Bring the NOTICE files back up to date.
2013-01-29 17:04:13 -08:00
Elliott Hughes
a7f44b5afe
am 172e038f
: am f09f6db5
: Merge "Use the NetBSD <sys/exec_elf.h>."
...
# Via Android Git Automerger (1) and others
* commit '172e038f9e5b711a77afe7e8899343215cf25c9e':
Use the NetBSD <sys/exec_elf.h>.
2013-01-29 17:04:11 -08:00
Elliott Hughes
1cc09402e8
am f6721978
: Merge "Fix x86 build to use <elf.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f67219783fa7c38c1f4f077364290d10d3aa1db4':
Fix x86 build to use <elf.h>.
2013-01-29 16:58:45 -08:00
Elliott Hughes
be11de2b52
am 5fb409b7
: Merge "Bring the NOTICE files back up to date."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '5fb409b7b0b0a4ecca5fd2a6c7dc5ce421f6b7cf':
Bring the NOTICE files back up to date.
2013-01-29 16:42:04 -08:00
Elliott Hughes
d070df4c74
Fix x86 build to use <elf.h>.
...
Change-Id: I7b697d5eae69dc08eb31471a42cb8bbe5360be76
2013-01-29 16:40:39 -08:00
Elliott Hughes
172e038f9e
am f09f6db5
: Merge "Use the NetBSD <sys/exec_elf.h>."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f09f6db5dd87856bbbb7a3d465187b9d8799a788':
Use the NetBSD <sys/exec_elf.h>.
2013-01-29 16:26:10 -08:00
Elliott Hughes
448080d372
Bring the NOTICE files back up to date.
...
Change-Id: I978275cf6604b90595ee79d897c0460eeadc7dc8
2013-01-29 16:25:06 -08:00
Elliott Hughes
a6a3ac5924
Use the NetBSD <sys/exec_elf.h>.
...
Replace a kernel header file dependency with files from NetBSD.
They're more complete, and ELF is ELF, whether you're on Linux or a BSD.
Bug: 7973611
Change-Id: I83ee719e7efdf432ec2ddbe8be271d05b2f558d7
2013-01-29 15:02:50 -08:00
Elliott Hughes
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
Elliott Hughes
f5d6238c4b
am 3f20ecc2
: am 3db2fc5a
: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
...
# Via Android Git Automerger (1) and others
* commit '3f20ecc20486ae8fe8d9332102b503135f83c62d':
Don't collect useless stack frames; do demangle C++ symbols.
2013-01-29 12:07:13 -08:00
Elliott Hughes
3f20ecc204
am 3db2fc5a
: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3db2fc5acb4894a2cb22533b165a0de1bbafc3f6':
Don't collect useless stack frames; do demangle C++ symbols.
2013-01-29 12:03:53 -08:00
Elliott Hughes
35b621c5f4
Don't collect useless stack frames; do demangle C++ symbols.
...
Previously, we'd collect every stack frame and then throw some away
when we came to log them. This meant that stack traces were effectively
shorter than the buffers that had been allocated for them. This patch
only stores frames we'll actually output.
Also dynamically call the C++ demangler so we don't have to try to
read mangled names. Because no one knows the mangling of operator new[]
for int arrays off the top of their head.
Bug: 7291287
Change-Id: I42b022fd7cd61675d05171de4c3b2704d058ef2a
2013-01-29 09:56:31 -08:00
Elliott Hughes
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
Elliott Hughes
2218b89ca7
am d383ac15
: am a0151cbf
: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
Unit tests for formatting code, fix %%.
2013-01-28 14:11:54 -08:00
Elliott Hughes
d383ac1570
am a0151cbf
: Merge "Unit tests for formatting code, fix %%."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a0151cbfbaa37965dbcd188a55a78d3ad4802b9b':
Unit tests for formatting code, fix %%.
2013-01-28 14:10:08 -08:00
Elliott Hughes
41b3179c9e
Unit tests for formatting code, fix %%.
...
Also fix <signal.h> and <stdio.h> so they don't cause compiler warnings.
Change-Id: Ib1a746bf01de22d47dbd964de0e6af80a7c96303
2013-01-28 10:36:31 -08:00
Elliott Hughes
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
Elliott Hughes
d265d36749
am f07db754
: am 0a91b11d
: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
More debug malloc fixes.
2013-01-25 18:09:45 -08:00
Elliott Hughes
f07db75443
am 0a91b11d
: Merge "More debug malloc fixes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a91b11d286446fe7849a6f537b4a21a52f63399':
More debug malloc fixes.
2013-01-25 18:07:23 -08:00
Iliyan Malchev
ac10757e2a
Merge "bionic: update processed msm_vidc_enc.h"
2013-01-26 01:41:55 +00:00
Elliott Hughes
239e7a0756
More debug malloc fixes.
...
Include the leaky executable's name in the log output. Fix the "sh" test.
Use uintptr_t instead of intptr_t.
Also fix debug formatting of NULL with %s.
Bug: 7291287
Change-Id: I015bf341cd48d43a247173612e6ccb1bf1243d53
2013-01-25 17:13:45 -08:00
Elliott Hughes
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
Elliott Hughes
88af723267
am 7ae99845
: am 6a94cb74
: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (1) and others
* commit '7ae998456c2564aff4ecbe6a6df214821f6e26cc':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:10:02 -08:00
Nick Kralevich
2ebcd19cbc
am 27818d2a
: am b871e5d6
: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (1) and others
* commit '27818d2a16e4972acba15368f55a59cc0ed990f0':
system_properties: do more checking of file
2013-01-25 14:10:01 -08:00
Elliott Hughes
7ae998456c
am 6a94cb74
: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Gerrit Code Review (1) and Matthieu Castet (1)
* commit '6a94cb748bf63278c3271b0ab610061b0dc6f04a':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:08:26 -08:00
Nick Kralevich
27818d2a16
am b871e5d6
: Merge "system_properties: do more checking of file"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b871e5d6b3b4a214c7f19bdfca7663f1fe49fda8':
system_properties: do more checking of file
2013-01-25 14:08:26 -08:00
Elliott Hughes
6a94cb748b
Merge "arm syscall : for eabi call_default don't use stack"
2013-01-25 21:57:58 +00:00
Nick Kralevich
c16961b8c3
system_properties: do more checking of file
...
Check that the permissions on the properties file
are exactly as we expect them to be.
Make sure we close the fd if fstat fails.
Refactor the code slightly.
Change-Id: I5503fd58c3b8093ce7e6d05920748ed70eaf8e2c
2013-01-25 13:07:31 -08:00
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
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
151e91e66c
am da2d2c61
: am 82ef8296
: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (1) and others
* commit 'da2d2c618c23f212f8dec0c0615bf75d7c18b88d':
prctl.h: include sys/cdefs.h
2013-01-24 16:11:56 -08:00
Nick Kralevich
da2d2c618c
am 82ef8296
: Merge "prctl.h: include sys/cdefs.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '82ef8296dc5e25b9cc8e7231f9515f50185dac9d':
prctl.h: include sys/cdefs.h
2013-01-24 08:59:00 -08:00
Nick Kralevich
8e70b0d5c3
prctl.h: include sys/cdefs.h
...
prctl.h uses __BEGIN_DECLS but fails to include sys/cdefs.h
(where it's defined). Code which includes prctl.h without
previously including sys/cdefs.h will fail to compile.
Fixed.
Change-Id: If4c9f3308f08b93596dcd00e351ae786807e9320
2013-01-23 16:49:47 -08:00
Nick Kralevich
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
Nick Kralevich
b8726037ee
am e7d937b5
: am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'e7d937b52f183ce84751701c369ffe6a4c81d033':
libc: use more secure system properties if available
2013-01-23 11:09:40 -08:00
Nick Kralevich
e7d937b52f
am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'b3351f12047747b603efb070069e7afdf3040335':
libc: use more secure system properties if available
2013-01-23 11:07:23 -08:00
Nick Kralevich
32417fb376
libc: use more secure system properties if available
...
Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.
Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable. Fall back to the environment variable
if the file doesn't exist.
Bug: 8045561
Change-Id: I54f3efa98cf7d63d88788da5ce0d19e34fd7851a
2013-01-23 09:28:35 -08:00
Elliott Hughes
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
c08ab018ad
am 40107623
: am 778a68e1
: Merge "Don\'t free anything when reporting leaks."
...
* commit '40107623b05fdc2b6c61d9c885483abd3add486a':
Don't free anything when reporting leaks.
2013-01-22 22:14:32 -08:00
Elliott Hughes
ce8732b188
am 552e02fa
: am 5c8f75ef
: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '552e02fa9c99fd234c57d756358e3208d11a13ad':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:14:31 -08:00
Elliott Hughes
40107623b0
am 778a68e1
: Merge "Don\'t free anything when reporting leaks."
...
* commit '778a68e1e57408be04806b5bfc3150aade44bcbf':
Don't free anything when reporting leaks.
2013-01-22 22:11:55 -08:00
Elliott Hughes
552e02fa9c
am 5c8f75ef
: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '5c8f75ef8bd89498de1d1108efa54869a2784738':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:11:54 -08:00
Elliott Hughes
778a68e1e5
Merge "Don't free anything when reporting leaks."
2013-01-23 06:06:21 +00:00
Elliott Hughes
848247a972
Don't free anything when reporting leaks.
...
We don't know that they're not going to be cleaned up by a
C++ global destructor that runs after us. This is the case with
bootanimation, for example.
Bug: 7291287
Change-Id: Iba402514d1735fdc2ae4bc95b65396d816be46c0
2013-01-22 18:36:28 -08:00
Elliott Hughes
84f8b5f401
Disable leak checking for mksh; it's way too leaky.
...
When each shell leaks ~240 allocations, you can't see the leaks from
the program you ran with "adb shell".
Bug: 7291287
Change-Id: Ib8780db72ba0114ebdb24768537da74bbb61f354
2013-01-22 18:35:14 -08:00
Elliott Hughes
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
a8e0f2b956
am b16ec162
: am 28f82b26
: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'b16ec162881110a30f665ce7bd1432ccefba60b7':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:29:01 -08:00
Elliott Hughes
b16ec16288
am 28f82b26
: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit '28f82b260c9076aae437dafb57193a174aef1eb3':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:26:45 -08:00
Elliott Hughes
28f82b260c
Merge "Add const for first argument of sigismember for fit POSIX spec"
2013-01-23 01:11:28 +00:00
Elliott Hughes
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
5f79f75ba6
am 57edf36c
: am 8d6302cd
: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '57edf36c5f83fa7bcf9d8d028cde0acc7ddfadcc':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:33:24 -08:00
Elliott Hughes
57edf36c5f
am 8d6302cd
: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:31:26 -08:00
Elliott Hughes
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
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
Elliott Hughes
2b47307012
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
...
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
2013-01-22 15:10:19 -08:00
Elliott Hughes
ad551eaa04
am 5f7b6b83
: am 547eba0a
: Merge "Avoid overflow in memccpy."
...
* commit '5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
Avoid overflow in memccpy.
2013-01-22 15:08:58 -08:00
Elliott Hughes
5f7b6b8301
am 547eba0a
: Merge "Avoid overflow in memccpy."
...
* commit '547eba0a63951d7db93c0542e1ecab891725b9a8':
Avoid overflow in memccpy.
2013-01-22 15:05:31 -08:00
Elliott Hughes
c51cd764a2
Avoid overflow in memccpy.
...
Just take the upstream NetBSD code.
Bug: http://code.google.com/p/android/issues/detail?id=43078
Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
2013-01-22 14:41:23 -08:00
Elliott Hughes
0dfb2ecaab
am 0609c0fe
: am 7af7895e
: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:35:06 -08:00
Elliott Hughes
0609c0fe8d
am 7af7895e
: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '7af7895eeb810ff1a1ca8b60fcda13595d551114':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:32:02 -08:00
Elliott Hughes
7af7895eeb
Merge "Use the new non-allocating logging for dlmalloc failures."
2013-01-22 22:26:35 +00:00
Elliott Hughes
ce4cf90d79
Use the new non-allocating logging for dlmalloc failures.
...
Change-Id: I88afe0201ee5766a295fc5a9e710fba9d6e0d363
2013-01-22 14:24:52 -08:00
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
98ae1a85b0
am e652ed30
: am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00
Nick Kralevich
e652ed3051
am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0':
bionic_auxv.h: fix #define conflict
2013-01-22 13:38:53 -08:00
Nick Kralevich
25e3f4a90d
Merge "Revert "libc: make system properties more secure.""
2013-01-22 21:26:18 +00:00
Nick Kralevich
abc21c8056
bionic_auxv.h: fix #define conflict
...
Both libc/include/sys/auxv.h and libc/private/bionic_auxv.h
use _SYS_AUXV_H_ to see if a header file has already been included.
This prevents both of these files from being included at the same
time.
Fix this name conflict.
Change-Id: Ifaec88aa9779d784b95f8e75145117acf3d5cfc5
2013-01-22 13:09:04 -08:00
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
04afcd25a3
am 8ef83bc4
: am 02f96b9d
: Merge "Add missing extern "C"."
...
* commit '8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
Add missing extern "C".
2013-01-22 11:34:25 -08:00
Elliott Hughes
8ef83bc46e
am 02f96b9d
: Merge "Add missing extern "C"."
...
* commit '02f96b9db0242711fe1dfe0713c0c4e698561da5':
Add missing extern "C".
2013-01-22 11:32:16 -08:00
Elliott Hughes
f90b95ea1a
Add missing extern "C".
...
Change-Id: Idbf24ce8482ff03f24caa89bafb08677b1c5cec3
2013-01-22 11:20:45 -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
Elliott Hughes
4cd5703b9e
am 75b64a1b
: am ca483765
: Merge "Fix the duplication in the debugging code."
...
* commit '75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
Fix the duplication in the debugging code.
2013-01-22 10:02:12 -08:00
Elliott Hughes
75b64a1b64
am ca483765
: Merge "Fix the duplication in the debugging code."
...
* commit 'ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
Fix the duplication in the debugging code.
2013-01-22 09:59:44 -08:00
Elliott Hughes
ca483765bd
Merge "Fix the duplication in the debugging code."
2013-01-22 17:44:15 +00:00
Kito Cheng
f373b11f9f
Add const for first argument of sigismember for fit POSIX spec
...
Change-Id: Icbc67375282f2a22dce02e4bacab15ddae846057
2013-01-20 00:15:23 +08:00
Elliott Hughes
1e980b6bc8
Fix the duplication in the debugging code.
...
We had two copies of the backtrace code, and two copies of the
libcorkscrew /proc/pid/maps code. This patch gets us down to one.
We also had hacks so we could log in the malloc debugging code.
This patch pulls the non-allocating "printf" code out of the
dynamic linker so everyone can share.
This patch also makes the leak diagnostics easier to read, and
makes it possible to paste them directly into the 'stack' tool (by
using relative PCs).
This patch also fixes the stdio standard stream leak that was
causing a leak warning every time tf_daemon ran.
Bug: 7291287
Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
2013-01-18 22:20:06 -08:00
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
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
c5c99adeed
am 8e833972
: am 0a0c2321
: am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '8e833972c2506267024136a0f609bdbb26dcc498':
FORTIFY_SOURCE: optimize
2013-01-17 17:08:21 -08:00
Nick Kralevich
8e833972c2
am 0a0c2321
: am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '0a0c23216766adf76739dc38dcb45934105cd41c':
FORTIFY_SOURCE: optimize
2013-01-17 17:06:11 -08:00
Nick Kralevich
0a0c232167
am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '4bfaf1e5f62748b305406ff4ceebd5f4b750038c':
FORTIFY_SOURCE: optimize
2013-01-17 17:04:33 -08:00
Elliott Hughes
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
Elliott Hughes
a4723742c1
am 261e9d08
: am e4ca88d9
: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit '261e9d08dbf1cd7fea7e1799338238d11d18cb7c':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:51:09 -08:00
Nick Kralevich
4bfaf1e5f6
Merge "FORTIFY_SOURCE: optimize"
2013-01-18 00:49:36 +00:00
Elliott Hughes
261e9d08db
am e4ca88d9
: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit 'e4ca88d9fa8757e4fb4056fcafa5bc15b406a2fd':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:48:45 -08:00
Nick Kralevich
a44e9afdd1
FORTIFY_SOURCE: optimize
...
Don't do the fortify_source checks if we can determine, at
compile time, that the provided operation is safe.
This avoids silliness like calling fortify source on things like:
size_t len = strlen("asdf");
printf("%d\n", len);
and allows the compiler to optimize this code to:
printf("%d\n", 4);
Defer to gcc's builtin functions instead of pointing our code
to the libc implementation.
Change-Id: I5e1dcb61946461c4afaaaa983e39f07c7a0df0ae
2013-01-17 15:41:33 -08:00
Raghu Gandham
a864c2c234
Add functionlity to the scripts to replace tokens in kernel headers
...
based on architecture.
2013-01-17 14:39:09 -08:00
Robert Greenwalt
89f9b30e4d
Merge "dns cache per interface iteration 2"
2013-01-17 16:14:52 +00: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
91bc5865a3
am 8d01c055
: am 1271cdc1
: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '8d01c0557bb2b7ea30f4038b6c84b816800073a7':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:55:55 -08:00
Nick Kralevich
8d01c0557b
am 1271cdc1
: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '1271cdc1c91c6ae688917bc8f4ae59d2a97b3e99':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:53:25 -08:00
Nick Kralevich
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
27ff1ae414
am de666485
: am ba117e41
: Merge "stack protector: use AT_RANDOM"
...
* commit 'de666485b8123ac35be94109336f7c56a7e9e3c2':
stack protector: use AT_RANDOM
2013-01-16 13:31:24 -08:00
Nick Kralevich
36bd371e26
Revert "stack protector: use AT_RANDOM"
...
The AT_RANDOM changes broke setuid / setgid executables
such as "ping". When the linker executes a setuid program,
it cleans the environment, removing any invalid environment
entries, and adding "NULL"s to the end of the environment
array for each removed variable. Later on, we try to determine
the location of the aux environment variable, and get tripped
up by these extra NULLs.
Reverting this patch will get setuid executables working again,
but getauxval() is still broken for setuid programs because of
this bug.
This reverts commit e3a49a8661
.
Change-Id: I05c58a896b1fe32cfb5d95d43b096045cda0aa4a
2013-01-16 13:16:42 -08:00
Nick Kralevich
de666485b8
am ba117e41
: Merge "stack protector: use AT_RANDOM"
...
* commit 'ba117e4172fe6f160bf5f4d58b37e12c08c34245':
stack protector: use AT_RANDOM
2013-01-16 11:31:00 -08:00
Elliott Hughes
b989c9ceda
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c39
.
2013-01-16 10:34:33 -08:00
Nick Kralevich
e3a49a8661
stack protector: use AT_RANDOM
...
Populate the stack canaries from the kernel supplied
AT_RANDOM value, which doesn't involve any system calls.
This is slightly faster (6 fewer syscalls) and avoids
unnecessarily reading /dev/urandom, which depletes entropy.
Bug: 7959813
Change-Id: If2b43100a2a9929666df3de56b6139fed969e0f1
2013-01-16 10:09:52 -08:00
Elliott Hughes
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
Elliott Hughes
e611fad0d0
am 14e1975e
: Merge "Fix signalfd for MIPS."
...
* commit '14e1975e13c197180ed0481f305f83a362b16a24':
Fix signalfd for MIPS.
2013-01-16 09:45:57 -08:00
Elliott Hughes
f193b9fc21
Fix signalfd for MIPS.
...
Also mark signalfd's sigset_t* argument as non-nullable.
Change-Id: I466e09cdf3fb92480744c496da92274a97f99dd1
2013-01-16 09:40:25 -08:00
Matthieu Castet
faa0fdb119
arm syscall : for eabi call_default don't use stack
...
In the default case, we don't need to use the stack, we can save r7 with
ip register (that what does eglibc).
This allow to fix vfork data corruption
(see 3884bfe966
), because vfork now don't
use the stack.
2013-01-16 14:53:37 +01:00
Elliott Hughes
acb907fb0d
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c39
.
The revert was only meant to apply to the jb-mr1 branch, but accidentally
leaked out into AOSP. This revert-revert gets AOSP master and internal
master back in sync.
2013-01-15 11:12:18 -08:00
Ben Cheng
4130af46bf
am b09d7d86
: Merge "Add __aeabi_idiv to the dummy reference list."
...
* commit 'b09d7d86004ab75b774358454d8ee261987af96b':
Add __aeabi_idiv to the dummy reference list.
2013-01-14 15:44:01 -08:00
Ben Cheng
35f5385aa5
Add __aeabi_idiv to the dummy reference list.
...
If the platform code is compiled with -mcpu=cortex-a15, then without this
change prebuilt libraries built against -march=armv7 cannot resolve the
dependency on __aeabi_idiv (provided by libgcc.a).
Bug: 7961327
cherry-picked from internal master.
Change-Id: I8fe59a98eb53d641518b882523c1d6a724fb7e55
2013-01-14 15:33:40 -08:00
Nick Kralevich
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
Nick Kralevich
1519690cfb
am 29fe857e
: Merge "headers: update auxvec.h from Linux kernel"
...
* commit '29fe857ec80e59347e28458a5396eb68d1cba0e4':
headers: update auxvec.h from Linux kernel
2013-01-14 14:31:28 -08:00
Ben Cheng
86050b9e92
Merge "Add __aeabi_idiv to the dummy reference list."
2013-01-14 13:36:33 -08:00
Nick Kralevich
a67e4de662
headers: update auxvec.h from Linux kernel
...
Pull a new version of auxvec.h from the upstream Linux
kernel at commit b719f43059903820c31edb30f4663a2818836e7f
These files were generated using the following commands:
cd bionic/libc/kernel
./tools/clean_header.py -u ../../../external/kernel-headers/original/uapi/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/asm-x86/auxvec.h
This change is needed to get AT_RANDOM defined.
Change-Id: Ib064649684b17af6ff4b1a31d501a05f78bb81d0
2013-01-14 11:49:59 -08:00
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
Ian Rogers
763d4bb345
am 68fa57f0
: Merge "Name anonymous mmap mallocs."
...
* commit '68fa57f000285af20100c00db3d2bc143ad32294':
Name anonymous mmap mallocs.
2013-01-14 11:19:00 -08:00
Ian Rogers
68fa57f000
Merge "Name anonymous mmap mallocs."
2013-01-14 10:54:44 -08:00
Nick Kralevich
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
Nick Kralevich
13bd37160e
am bb897fa9
: Merge "libc_init_static: apply relro earlier."
...
* commit 'bb897fa9f79d25e4445fe3ab46b86657d6660c10':
libc_init_static: apply relro earlier.
2013-01-14 10:25:16 -08:00
Nick Kralevich
9fb48ac257
libc_init_static: apply relro earlier.
...
The dynamic linker applies relro before the preinit and init
arrays are executed, so we should be consistent for statically
linked executables.
Change-Id: Ia0a49d0e981a6e8791f74eed00280edf576ba139
2013-01-11 18:38:26 -08:00
Ian Rogers
8921060253
Name anonymous mmap mallocs.
...
Change-Id: Icc53ba1eecb8445210623826d8e99a611d686f7f
2013-01-11 17:42:17 -08:00
Nick Kralevich
8ffe08c86b
am fdd6dfa8
: am 2c5153b0
: libc: add getauxval()
...
* commit 'fdd6dfa863ea73251b5d59990e239854c31ecee3':
libc: add getauxval()
2013-01-11 17:04:04 -08:00
Nick Kralevich
fdd6dfa863
am 2c5153b0
: libc: add getauxval()
...
* commit '2c5153b043b44e9935a334ae9b2d5a4bc5258b40':
libc: add getauxval()
2013-01-11 16:59:57 -08:00
Nick Kralevich
2c5153b043
libc: add getauxval()
...
Add support for getauxval(). This method allows a program an easy way
to retrieve information from the kernel auxiliary vector, and will
hopefully replace other clumsy ways of accessing this same information.
This particular function was also added to glibc in glibc 2.16.
See the following URLs for more details.
* http://lwn.net/Articles/519085/
* http://www.gnu.org/software/libc/manual/html_node/Auxiliary-Vector.html
This change is a prerequisite for bug 7959813.
Bug: http://code.google.com/p/android/issues/detail?id=38441
Change-Id: Iba19d899df334bddc6f4899077ece2fc87564ea8
2013-01-11 16:44:15 -08:00
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
Andrew Boie
07564f2d3a
add factory property file definition
...
This property file is used for properties which are set at device
provisioning time or in the factory. They are never touched by
a software update or factory data reset and typically contain
data specific to the particular unit.
Change-Id: I2e7c2fe62cb684cb2449eea917c42b19462e89a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-01-11 13:02:27 -08:00
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
Wink Saville
801aeefe2d
am a12c5445
: Fix unused warnings in pthread.c
...
* commit 'a12c54454f3a6132988b68873903f6e9eed7f384':
Fix unused warnings in pthread.c
2013-01-11 10:12:12 -08:00
Wink Saville
a12c54454f
Fix unused warnings in pthread.c
...
Change-Id: I0287aadb825fd8cda29dc976bce55d75a1279fc5
2013-01-10 16:30:22 -08:00
Elliott Hughes
0f9be1eaee
am bfde0b6f
: Merge "glibc 2.15 treats errno as signed in strerror(3)."
...
* commit 'bfde0b6fd9e5de545746ab963d3a05ed2a8014f6':
glibc 2.15 treats errno as signed in strerror(3).
2013-01-10 16:27:26 -08:00