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
Elliott Hughes
6c0e373d38
am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -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
Elliott Hughes
ecf67e152a
am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6
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 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[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 08:52:14 -07:00
Elliott Hughes
0c24effd01
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 08:41:55 -07:00
Elliott Hughes
95a7a64ac8
Use hidden visibility for several internal-use-only functions.
...
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
2012-09-21 18:27:40 -07:00
Raghu Gandham
988ff8ff9f
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
...
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
2012-09-21 17:14:05 -07:00
Naseer Ahmed
f707007435
bionic: Update MDP header for sync
...
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -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
Rebecca Schultz Zavin
a9dca77315
Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:47:37 -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
Jeff Boody
02e06782fc
Update headers for Adreno graphics driver
...
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-18 19:52:01 -07:00
Dave Burke
88f1ea8f82
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
(cherry-pick of e58303249b9e799a4fe84c5a2dfe71518441a6ec.)
Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
2012-09-18 16:55:24 -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
Dave Burke
e58303249b
Make pthread_create more forgiving of invalid sched_policy.
...
Bug: 7005326
Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
2012-09-17 21:55:24 -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
2aceb4bcb3
am e2a17ef4
: am 77ac158e
: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
...
* commit 'e2a17ef444e1d3b3e27e649440a320139038d1d9':
Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:53:22 -07:00
Elliott Hughes
77ac158e90
Merge "Don't copy strerror(3) or strsignal(3) strings if we can share."
2012-09-17 15:36:27 -07:00
Elliott Hughes
4198fa4c23
Don't copy strerror(3) or strsignal(3) strings if we can share.
...
Change-Id: Ic405269f63b945c6fb347e7c4346cd6f104aff35
2012-09-17 15:23:35 -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
4b3ff1f0fa
am f8902bf7
: am 047a285d
: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
...
* commit 'f8902bf7079be1a7ad51b82ebb24556ff40a1fff':
Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-14 16:21:18 -07:00
Elliott Hughes
047a285d41
Merge "Fix <sys/klog.h> to correspond to the kernel operations."
2012-09-14 16:14:48 -07:00
Elliott Hughes
b67d4ec5ba
am 950a3c01
: am 51519521
: Merge "Add tty defaults to bionic"
...
* commit '950a3c010cfbb18bb5974a78040ab9946370e553':
Add tty defaults to bionic
2012-09-14 16:04:30 -07:00
Elliott Hughes
5151952197
Merge "Add tty defaults to bionic"
2012-09-14 15:45:46 -07:00
Elliott Hughes
e249b05963
Fix <sys/klog.h> to correspond to the kernel operations.
...
This makes the constants correspond to those in the Linux kernel's
include/linux/syslog.h, but keeping our old badly-named constants for
source compatibility.
Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
2012-09-14 15:42:30 -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
b2af8b6848
am 66a97ea9
: am 4e9d953a
: Merge "libc: add ftw / nftw functions"
...
* commit '66a97ea9fbc96c8ebf7f9aae8c2512ec3ffbdb80':
libc: add ftw / nftw functions
2012-09-13 17:12:40 -07:00
Elliott Hughes
1eaa3e6f72
am 77fd7075
: am e895e6de
: Merge "Update libc/NOTICE and record the incantation."
...
* commit '77fd70758ae579aadf153124f7c26494e4a54988':
Update libc/NOTICE and record the incantation.
2012-09-13 17:12:39 -07:00
Nick Kralevich
5e58ea07d4
libc: add ftw / nftw functions
...
Please see "man 3 ftw" for a description of the
ftw / nftw functions.
This code is taken directly from netbsd unmodified.
Change-Id: Ia4879ac57212b424adf5281b5e92858e216d0f14
2012-09-13 16:54:57 -07:00
Elliott Hughes
e895e6deaa
Merge "Update libc/NOTICE and record the incantation."
2012-09-13 16:52:35 -07:00
Elliott Hughes
965b867512
Update libc/NOTICE and record the incantation.
...
Change-Id: I0673d6263de2c5a21cd549f18c0648d0fa4bb40f
2012-09-13 16:51:57 -07:00
Kenny Root
2b270a0cac
am a4ea1a3d
: am f7e403d6
: Merge changes I06ee0b67,I914d2205
...
* commit 'a4ea1a3d2e12f8b240a70d90ddf1f54af06c286c':
Print out shared app gids correctly
Add tests for Android-specific stubs
2012-09-13 15:33:57 -07:00
Elliott Hughes
155a70b93f
am de9db8f7
: am fa36875d
: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
...
* commit 'de9db8f7efb10cdab1c81f1d3164f3b55e5f08e9':
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:33:57 -07:00
Elliott Hughes
c7fda6a96d
am d4623e56
: am b338ea30
: Merge "Upgrade to tzdata2012f."
...
* commit 'd4623e56fb61b38e2c436f214a1282252908b93b':
Upgrade to tzdata2012f.
2012-09-13 15:33:56 -07:00
Kenny Root
8a05a01de7
Print out shared app gids correctly
...
For applications that share resources across users such as
forward-locked applications, print out their group name correctly.
Change-Id: I06ee0b67e4325cfa415ffd7a03e301700399a66d
2012-09-13 15:25:09 -07:00
Kenny Root
2a54e5ecd0
Add tests for Android-specific stubs
...
Also fix problem with multi-user IDs that the home directory was
returned as "/data" instead of "/" unlike all the other uids.
Change-Id: I914d22052e5a86552989f8969b85aadbc748c65d
2012-09-13 15:25:09 -07:00
Elliott Hughes
fa36875df4
Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
2012-09-13 15:19:37 -07:00
Irina Tirdea
b5f053b5a7
Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
...
Change-Id: I426109db25e907980d6cb3a7a695796e45783b78
2012-09-13 15:18:21 -07:00
Elliott Hughes
88b61cb691
Upgrade to tzdata2012f.
...
This release reflects the following change circulated on the tz
mailing list:
* australasia (Pacific/Fiji): Fiji DST is October 21 through January
20 this year. (Thanks to Steffen Thorsen.)
Change-Id: Ie21ea791ff5191264967aff685cbfa5c73f1fa5c
2012-09-13 14:54:51 -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
478f8ff3f0
am b2550dd4
: am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit 'b2550dd4c85845974bf61d3e4071b2b957fbcf09':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:52:38 -07:00
Elliott Hughes
4a9b7c694a
Merge "Add libdl into libc_malloc_debug_leak build"
2012-09-13 09:46:31 -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
Pavel Chupin
e007775f4b
Add libdl into libc_malloc_debug_leak build
...
Otherwise libc_malloc_debug_leak.so is failed to load runtime in x86
case
Change-Id: I8207ce06d1ec17b233f4e4fcfdd2b161673b4fa8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-09-13 12:03:06 +04: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
Elliott Hughes
f801cf55be
resolved conflicts for merge of 47bda0c2
to jb-mr1-dev
...
Change-Id: Ia1969c79111c006bde709920254a515646c20aa7
2012-09-12 16:08:14 -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
86ec05acc9
Update the kernel headers to match external/kernel-headers.
...
Note that the Linux kernel handed over responsibility for most of the
socket constants to glibc some time ago. Someone had updated our
external/kernel-headers file but not regenerated the bionic headers,
so this change copies the missing stuff from the old bionic <linux/socket.h>
into <sys/socket.h>. This is what glibc does.
I've hacked a few of the other files to #include <sys/socket.h> for
backward compatibility, but even so this requires numerous other
changes to switch people over from direct inclusion of <linux/...> headers.
Change-Id: I0e4af64e631d3cef911a31d90f2f806e058278a0
2012-09-12 12:30:22 -07:00
Elliott Hughes
ccd7ee624a
am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:07:12 -07:00
Elliott Hughes
0d207ba624
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
...
Change-Id: Iba58077a1f057a968eb2283ebba259975925ff4c
2012-09-12 10:51:05 -07:00
Elliott Hughes
cc0f225365
am 7f798147
: am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit '7f798147980798718ac893229ae20dba9e3a26c7':
[MIPS] Check error status from pipe system call
2012-09-11 16:47:25 -07:00
KwongYuan Wong
b03bc56b79
[MIPS] Check error status from pipe system call
...
Change-Id: Iaaea0e826c2678aa7f6fad9d46b16302a4d3b876
2012-09-11 16:38:04 -07:00
Irina Tirdea
e77e1afe24
Add tty defaults to bionic
...
Add ttydefaults.h bionic. Some userspace programs (e.g. perf) need the
definitions from this file. This header file is copied from NetBSD
(http://netbsd.org/ ) under the NetBSD Foundation's (TNF) license (“2 clause”
Berkeley-style license).
Change-Id: I9c862415b52b710f25adb1629a699627cd715775
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-11 22:47:31 +03:00
Elliott Hughes
3a936a4980
Add the libcutils localtime_tz and mktime_t extensions to bionic.
...
Bug: 7012465
Change-Id: Ib66f061e29199ba134545111dc79f9b50c8f4a21
2012-09-11 11:15:53 -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
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
Elliott Hughes
f50b99f471
am e8b4d67a
: am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'e8b4d67a37e27ffc34086562ad13dcd9316a8249':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:04:28 -07:00
Elliott Hughes
12949e5d39
Rename crtstart variables as crtbegin, to match reality.
...
No functional change, but it's confusing that the variable
names don't match the filenames.
Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
2012-09-10 11:16:12 -07:00
Ying Wang
e3738414a6
am f9920563
: am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:07:17 -07:00
Ying Wang
cf464878ef
Generate header dependency makefiles for the crt*.o
...
Bug: 7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-07 17:13:37 -07:00
Elliott Hughes
b010245490
am 7c7a7f8e
: am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361
am 72fcdbe9
: am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Elliott Hughes
d10309c36b
Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
2012-09-07 10:59:20 -07:00
Elliott Hughes
691ef3c80b
Merge "Add mlockall and munlockall for Google TV."
2012-09-07 10:51:49 -07:00
Andrew Hsieh
048569be54
Rename __dso_handle_so.c to __dso_handle_so.h
...
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.
Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
2012-09-07 12:49:41 +08: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
Ian Rogers
973bf681b7
am 77039d34
: am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit '77039d34449e369b9425a36eaed38d41b9d20884':
Fix build warning of initialization but no use.
2012-09-06 11:50:22 -07:00
Ian Rogers
e8f815473b
Merge "Fix build warning of initialization but no use."
2012-09-06 11:41:52 -07:00
Elliott Hughes
1ad05db9ce
Add mlockall and munlockall for Google TV.
...
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
2012-09-06 11:24:45 -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
Elliott Hughes
de0dc25112
am 41ff8b98
: am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '41ff8b98044de19d6ea5228452c2d555c4224da7':
Don't corrupt the thread list in static executables.
2012-09-06 10:44:13 -07:00
Ian Rogers
09f76cdd9b
Fix build warning of initialization but no use.
...
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.
Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
2012-09-06 09:59:13 -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
183d0a57a2
Update msm_ion.h ioctls so they dont conflict with ion.h
...
Change-Id: Ib6ffcc147e39b3f9f2eb9a8ed403b74d99bc755f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-05 21:47:32 -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
Ajay Dudani
85811fc7c2
Revert "msm_ion: switch to using legacy_ion.h"
...
This reverts commit 66edcd9dad
.
2012-09-05 21:43:15 -07:00
Ajay Dudani
dc81b44759
Revert "add legacy_ion.h"
...
This reverts commit 5f1d206de3
.
2012-09-05 21:42:10 -07:00
Elliott Hughes
bfeab1bbe7
Don't corrupt the thread list in static executables.
...
Several previous changes conspired to make a mess of the thread list
in static binaries. This was most obvious when trying to call
pthread_key_delete(3) on the main thread.
Bug: http://code.google.com/p/android/issues/detail?id=36893
Change-Id: I2a2f553114d8fb40533c481252b410c10656da2e
2012-09-05 17:47:37 -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
faf361a6ac
am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit '2fc3e1efda003d9eb110c3fc08bb32f29c6e8a4b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:32:25 -07:00
Elliott Hughes
b2c5bd543d
Merge "ARM: warn about atexit() calls from legacy shared libraries"
2012-09-05 10:18:43 -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
Elliott Hughes
ac3e35cd8f
am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'a76f2ecaa203bd8b5cc2ca157f06c0d2de66a52f':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:01:48 -07:00
Elliott Hughes
26f2e4a163
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
2012-09-05 09:43:35 -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
Ian Rogers
f71d757f6e
am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '7310a1c4326bc875aeea2ce091a4b6558d183b2d':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:52:12 -07:00
Ian Rogers
82978cae4e
Merge "Avoid malloc lock while calling pthread_atfork."
2012-09-05 07:41:32 -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
ab558163a3
am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit 'b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8':
termios: add tcdrain
2012-09-04 18:13:50 -07:00
Elliott Hughes
be19a36717
Merge "termios: add tcdrain"
2012-09-04 17:52:40 -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
f34c6d7796
am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
Add getsid system call to bionic
2012-09-04 16:47:44 -07:00
Elliott Hughes
5ff2347130
Merge "Add getsid system call to bionic"
2012-09-04 16:36:27 -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
877ad30fd6
am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '507bcabb3565d20541242ad61f987bc1a6483ba1':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:00:20 -07:00
Elliott Hughes
63deae5e4f
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
...
Without these, sometimes malloc(3) returns NULL without setting errno.
Change-Id: I4708c3f675bf2c878ddcaf012fde7848b255826b
2012-09-04 15:42:23 -07:00
Vitaly Wool
954923858b
termios: add tcdrain
...
Change-Id: I05c0007f7bcc6ef5295c32f86fafbf1ad31e07fa
2012-09-04 14:11:28 +02:00
Irina Tirdea
1ad10a566e
Add getsid system call to bionic
...
Add getsid() system call to bionic for
all architectures. This is needed for various tools
(e.g. perf).
Adding the getsid system call was done in 3 steps:
() add getsid 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.
() add the system call signature to libc/include/unistd.h
Change-Id: Id69a257e13ec02e1a44085a6b217a3f19ab025b1
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-03 01:38:34 +03:00
Kirill Artamonov
3e2d2936b0
Avoid malloc lock while calling pthread_atfork.
...
Expecting the memory in a forked child process to be sane wrt threading
is a bad idea. An example of a problem is when the parent process has
the malloc lock and a child process is forked. The malloc lock in the
child will appear locked by a thread that doesn't exist.
This change aims to make bionic more compatible with glibc by reseting
the malloc lock in the child forked process, as well as holding it
during the fork. This is a feature in dlmalloc 2.8.6 called
LOCK_AT_FORK. In general this feature isn't necessary as a forked
process will then exec. Some bad applications rely on being able to use
features like malloc before the exec and having multiple threads running
in the parent program. This isn't a problem with glibc and this patch
makes it not a problem for bionic.
Unfortunately for use in bionic, LOCK_AT_FORK has an issue as internally
it uses pthread_atfork that in bionic uses malloc. This leads to the
LOCK_AT_FORK initialization deadlocking with pthread_atfork's call to
malloc due to the malloc lock. This change moves the pthread_atfork logic
in LOCK_AT_FORK to be called without the malloc lock held.
Change-Id: Id68175a564a6abb936ee4488b44d9479f7311f69
2012-08-31 11:11:40 -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
Ian Rogers
b9ad1a1e00
am 6abab301
: am 6fe901ef
: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '6abab301db84af7c98a4873fbf49997078aa19cc':
Upgrade to dlmalloc 2.8.6.
2012-08-31 08:58:33 -07:00
Ian Rogers
6fe901ef38
Merge "Upgrade to dlmalloc 2.8.6."
2012-08-31 08:42:41 -07:00
Ian Rogers
c6d95add30
Upgrade to dlmalloc 2.8.6.
...
This fixes a bug and enables the use of MORECORE_CONTIGUOUS.
Change-Id: Ia7c5d32bdc46e99b3ecb92ee94d1f702c4385d5d
2012-08-29 18:18:29 -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
Nick Kralevich
fe7d7d4693
am 92133ca4
: am 17d9be8a
: Merge "disable _FORTIFY_SOURCE under clang"
...
* commit '92133ca427b9c697d5afb59b74cb2cff50840c8e':
disable _FORTIFY_SOURCE under clang
2012-08-29 14:06:57 -07:00
Nick Kralevich
17d9be8ad7
Merge "disable _FORTIFY_SOURCE under clang"
2012-08-29 13:54:49 -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
Elliott Hughes
8900e2de45
am e5b85f45
: am 0d7177c0
: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit 'e5b85f45f9b23b4adbea5a9bb0bc29099880ed69':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:19:58 -07:00
Elliott Hughes
0d7177c0d4
Merge "Clean up warnings in the malloc_debug_* files."
2012-08-29 13:08:50 -07:00
Nick Kralevich
829c089f83
disable _FORTIFY_SOURCE under clang
...
Clang and _FORTIFY_SOURCE are just plain incompatible with
each other. First of all, clang doesn't understand the
__attribute__((gnu_inline)) header. Second of all,
Clang doesn't have support for __builtin_va_arg_pack()
and __builtin_va_arg_pack_len() (see
http://clang.llvm.org/docs/UsersManual.html#c_unimpl_gcc )
Until we can resolve these issues, don't even try using
_FORTIFY_SOURCE under clang.
Change-Id: I81c2b8073bb3276fa9a4a6b93c427b641038356a
2012-08-29 12:47:41 -07:00
Elliott Hughes
c4d1fecc10
Clean up warnings in the malloc_debug_* files.
...
Also clean up cpplint.py-detected lint.
Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-29 12:08:13 -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
Ian Rogers
15afed42ca
Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
2012-08-29 08:53:41 -07:00
Ian Rogers
f71fa0830a
Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
2012-08-29 08:53:26 -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
Iliyan Malchev
66edcd9dad
msm_ion: switch to using legacy_ion.h
...
Change-Id: I0fa64cb9684062f371bd21a1f94f6c7dad8d854d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-29 01:31:34 -07:00
Iliyan Malchev
5f1d206de3
add legacy_ion.h
...
legacy_ion.h is a pre android-3.4 copy of the ion.h header, for backwards
compatibility
Change-Id: Iaf2f1659f19a3b55334df929d9500069bf8acbdd
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-29 01:24:49 -07:00
Ian Rogers
e0d680176f
Revert "Revert "Restore posix_memalign""
...
This reverts commit 78a3069f82
.
2012-08-28 16:36:08 -07:00
Ian Rogers
2c344d3631
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
...
This reverts commit f72ee26927
.
2012-08-28 15:53:10 -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
4f90a0932c
am d3d09f7d
: am 069c64cd
: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit 'd3d09f7d75726dbe7cd9dfae211427f8bebe1397':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:41:10 -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
54662dd4de
am 1389db8b
: am e026b1d8
: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '1389db8b94ca0cff4744dc070d99f48c6cf53b07':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:04:47 -07:00
Nick Kralevich
069c64cdf2
Merge "ARM: make sure __on_dlclose() actually gets called"
2012-08-28 13:04:22 -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
e026b1d89a
Merge "ARM: remove dummy entries from .so init_array/fini_array"
2012-08-28 12:49:46 -07:00
Nick Kralevich
3ffdef19b4
am c7d9c400
: am c410a961
: Merge "libc: remove ctors/dtors sections"
...
* commit 'c7d9c400126f1d1159025d1005248ab556dbdb7e':
libc: remove ctors/dtors sections
2012-08-28 10:38:28 -07:00
Nick Kralevich
c410a9613a
Merge "libc: remove ctors/dtors sections"
2012-08-28 10:20:27 -07:00
Ard Biesheuvel
144c291866
ARM: warn about atexit() calls from legacy shared libraries
...
Legacy ARM shared libraries use this generic version of atexit(),
which queues exit functions for invocation at program exit, at
which time the library may have been dlclose()'d, causing the
program to crash.
Change-Id: I41ae153c23268daa65ede7fb8966fc3e9caec369
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 11:23:06 +02:00
Ard Biesheuvel
f3cfcd869d
ARM: make CRT_LEGACY_WORKAROUND work as intended
...
To properly support legacy ARM shared libraries, libc.so needs
to export the symbols __dso_handle and atexit, even though
these are now supplied by the crt startup code.
This patch reshuffles the existing CRT_LEGACY_WORKAROUND
conditionally compiled code slightly so it works as the
original author likely intended.
Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 10:27:02 +02:00
Ard Biesheuvel
c23092887f
ARM: remove dummy entries from .so init_array/fini_array
...
The runtime linker parses the ELF section headers to
discover the size of the init_array and fini_array, so
there is no point in putting NULL terminators at the end.
Change-Id: I3246cd585efce9314155600277dd829e9f37d04f
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 09:55:51 +02: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
Elliott Hughes
8c7f4777ec
am d2d8031d
: am bc366292
: Merge "Added missing cache failed notification"
...
* commit 'd2d8031df16c78b4d5bdbe481ebe6856caa69fd1':
Added missing cache failed notification
2012-08-27 15:22:35 -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
Elliott Hughes
bc366292ff
Merge "Added missing cache failed notification"
2012-08-27 15:00:51 -07:00
Iliyan Malchev
3ad36e525f
bionic: update sanitized MSM, V4L2 kernel headers
...
Change-Id: I4ca8835ff7a1d21f80a139b1d76ceacf82b48502
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-27 12:11:41 -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
Ian Rogers
a190cbb825
am 05fddb41
: am a37ce7fa
: Merge "Add missing va_end() to prevent stack corruptions"
...
* commit '05fddb41d00710a31181693cebed570d711acd37':
Add missing va_end() to prevent stack corruptions
2012-08-24 15:23:11 -07:00
Ian Rogers
a37ce7faa6
Merge "Add missing va_end() to prevent stack corruptions"
2012-08-24 15:10:07 -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
Rebecca Schultz Zavin
cbd76d15af
Merge "Update ion header" into jb-mr1-dev
2012-08-23 16:31:45 -07:00
Rebecca Schultz Zavin
eb75db7d83
Update ion header
...
Change-Id: Ib06a2c63070c9f507c14a43a0a0ac4d362f68d22
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-08-23 16:29:23 -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
Nick Kralevich
81af404b63
am e8198b97
: am 26facba2
: Merge "hardening: remove pointless ARM __get_pc() function"
...
* commit 'e8198b97c369292a3ea97e5a2009bfba8229ddb5':
hardening: remove pointless ARM __get_pc() function
2012-08-23 12:34:21 -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
Brian Carlstrom
f72ee26927
Revert "Upgrade to dlmalloc 2.8.5."
...
This reverts commit 999089181e
.
2012-08-22 12:07:33 -07:00
Brian Carlstrom
78a3069f82
Revert "Restore posix_memalign"
...
This reverts commit bfc1d97531
.
2012-08-22 12:07:26 -07:00
Ard Biesheuvel
0a150ead18
libc: remove ctors/dtors sections
...
None of the supported ARCHs actually populate these sections,
so there is no point in keeping them in the binaries.
Change-Id: I21a364f510118ac1114e1b49c53ec8c895c6bc6b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-22 20:45:26 +02:00
Nick Kralevich
26facba288
Merge "hardening: remove pointless ARM __get_pc() function"
2012-08-22 11:41:53 -07:00
Ard Biesheuvel
404e28ff8c
hardening: remove pointless ARM __get_pc() function
...
Useful if you're trying to defeat ASLR, otherwise not
so much ...
Change-Id: I17ebb50bb490a3967db9c3038f049adafe2b8ea7
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-22 20:38:54 +02: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
Jean-Baptiste Queru
e49df0203c
am 170ad354
: am c7de0225
: Merge "Use unambiguous mnemonics"
...
* commit '170ad35419620b428c15a8945416ce8cedef3e81':
Use unambiguous mnemonics
2012-08-22 07:32:21 -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
Erik Gilling
974e16cd82
update linux/sync.h
...
Change-Id: Ic2133976b675cdcd3ca88f4845180a7ff1c79e34
Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-21 18:17:24 -07:00
Kevin Schoedel
c0b4d18d7d
Use unambiguous mnemonics
...
Change-Id: I8da0af54cc3cbf69d9e485eb71bc44a6976b1adc
Author: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
2012-08-21 15:28:23 -04:00
Ard Biesheuvel
5ed48a4d7f
ARM: make sure __on_dlclose() actually gets called
...
Change-Id: I280e5428b0543cccf17ca36baee4865395928cdb
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-21 12:56:05 +02:00
Brian Carlstrom
bfc1d97531
Restore posix_memalign
...
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
2012-08-20 19:25:39 -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
cc1f4acbda
Restore posix_memalign
...
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
2012-08-20 18:28:20 -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
Brian Carlstrom
76f60e2ebd
am fe87596a
: am c37dcd3d
: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit 'fe87596a5ba5a5b0773b2854f9fce85f49367611':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:31:29 -07:00
Ian Rogers
999089181e
Upgrade to dlmalloc 2.8.5.
...
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes
easier.
Declare pvalloc and malloc_usable_size routines present in malloc.h but with
missing implementations. Remove other functions from malloc.h that have
no implementation nor use in Android.
Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
2012-08-20 14:12:20 -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
dd0e991c6a
am 2651d6c6
: am 9417a80e
: Merge "Always define the 64-bit int types."
...
* commit '2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
Always define the 64-bit int types.
2012-08-17 16:58:10 -07:00
Elliott Hughes
9417a80e48
Merge "Always define the 64-bit int types."
2012-08-17 16:48:14 -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
db2903fac3
am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
2012-08-17 16:26:37 -07:00
Jurijs Oniscuks
2932f04832
Fix race condition in pthread_create()
...
Save thread id to *thread_out before new
thread is allowed to run else there's a
risk that the thread has finished and
been deleted when *thread_out is assigned.
Change-Id: I6b84c61a8df06840877d4ab036f26feace3192d8
2012-08-17 16:18:32 -07:00
Elliott Hughes
6d6731adc0
Always define the 64-bit int types.
...
These preprocessor tricks have caused trouble for -std=gnu99 and -ansi, and
both netbsd's libc and glibc seem to unconditionally define these types.
Change-Id: Ib8dffa341a8ca88f80d275ba2b7f93a4c910ee32
2012-08-17 14:30:06 -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
Elliott Hughes
efd3983446
am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:01:53 -07:00
Pavel Chupin
b7beb69075
Add link.h for all platforms with dl_phdr_info
...
This header is used on bionic build and should be propagated into
sysroot on toolchain rebuild. Discussion re. this header is here:
http://gcc.gnu.org/ml/gcc-patches/2012-08/msg00936.html
It is available already in mips NDK platforms:
development/ndk/platforms/android-9/arch-mips/include/link.h
Change-Id: I39ff467cdac9f448e31c11ee3e14a6200e82ab57
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-08-17 12:44:23 -07:00
Henrik Engström
ce5ba8bfcd
Added missing cache failed notification
...
Added a missing call to _resolv_cache_query_failed for another fail
case where it was missing (it doesn't go through the error handling
under the "fail" label). This missing notification caused requests to
have to wait for timeout instead of beeing notified on some failed
requests.
Change-Id: I904d60269c59b926784e3a397d2a860329f55142
2012-08-17 09:18:47 +02: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
a7d8f3d50e
am c80ca54f
: am 60ef95e1
: Merge "Enhance getcwd(3) to handle NULL like glibc."
...
* commit 'c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
2012-08-16 17:05:40 -07:00
Elliott Hughes
04a83a48ed
Enhance getcwd(3) to handle NULL like glibc.
...
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
2012-08-16 15:59:12 -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
Elliott Hughes
820ad4283d
am 74438bb2
: am 449d4634
: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
...
* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
2012-08-16 14:23:56 -07:00
Jin Wei
9862f5e08b
bionic: add macro protection for MALLOC_ALIGNMENT
...
In previous commit: 2fd81ef7
, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.
Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-08-16 12:08:36 -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
Scott Anderson
09d9dd3acd
Merge "Add clean kernel header for uhid." into jb-mr1-dev
2012-08-16 12:03:25 -07:00
Scott Anderson
52bf2d5659
Add clean kernel header for uhid.
...
The original kernel header was submitted in this change:
commit 45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com>
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com>
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-16 11:56:11 -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
a626bbdb36
am 4af9141c
: am ae728099
: Merge "enable clone system call for x86"
...
* commit '4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
2012-08-15 17:24:21 -07:00
Jin Wei
22d366cc09
enable clone system call for x86
...
Add __bionic_clone function for x86, which will be
used for clone system call.
Change-Id: I889dc9bf4b7ebb4358476e17e6f3233e26491f4d
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 51414
2012-08-15 17:04:50 -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
Elliott Hughes
2e3756b4d3
am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
Elliott Hughes
cc213f871b
Switch to the current NetBSD regex implementation.
...
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
2012-08-15 15:39:11 -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
Elliott Hughes
8225911775
am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
2012-08-14 15:43:57 -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
261e2232c1
Sort NOTICE entries.
...
Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.
Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592
2012-08-14 15:04:05 -07:00
Naseer Ahmed
056b4bc499
update msm_mdp.h header to support vsync
...
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
2012-08-14 12:51:42 -07:00
Ajay Dudani
77b25702ba
update processed msm_camera.h and msm_isp.h
...
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
2012-08-14 12:51:42 -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
Elliott Hughes
b6d6ec5326
am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -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
Jeff Sharkey
74c0464006
Update MS_ mount flags, define unshare() syscall.
...
(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)
Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d
2012-08-14 12:09:25 -07:00
Jeff Sharkey
d8450043b0
Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
2012-08-14 12:05:46 -07:00
Jeff Sharkey
82393decdf
Update MS_ mount flags, define unshare() syscall.
...
Bug: 6925012
Change-Id: I4ad79b4bccb7737d4dc704476cdb5795d124f53e
2012-08-14 11:45:12 -07:00
Elliott Hughes
409302f0f9
Switch to upstream NetBSD tdelete/tfind/tsearch.
...
tdestroy is a GNU extension, so that stays.
Change-Id: Iedebaff25ea7e92b1ab1dd4440da12b67b99aa40
2012-08-13 17:41:49 -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
93a9d53485
am d544bdfa
: am 54655eaf
: Merge "Fix nice..."
...
* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
Fix nice...
2012-08-13 17:14:40 -07:00
Elliott Hughes
3d2d448af1
Fix nice...
...
...by switching to the NetBSD implementation.
Change-Id: I562b27b237a24ded95804035cc322c7bff12ff59
2012-08-13 16:38:29 -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
69fc1522a3
am aa6c8994
: am b66bc514
: Merge "Clean up warnings in stubs.cpp."
...
* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
Clean up warnings in stubs.cpp.
2012-08-13 16:24:38 -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
Elliott Hughes
de727caee2
Clean up warnings in stubs.cpp.
...
Switch to C++ to get extra warnings, and format the code Google style.
Change-Id: Ifc0131bf297a6ee8a8a6b8d049a02518b0b1a4b7
2012-08-13 16:10:19 -07:00
Elliott Hughes
ad8ff472b6
am c1eb7619
: am 440e417d
: Merge "Add dependencies on all the makefiles."
...
* commit 'c1eb76198ec81802f69b52a8c6fbf97765d46f53':
Add dependencies on all the makefiles.
2012-08-13 16:03:26 -07:00
Elliott Hughes
cfd0345fe0
am 35dcf19b
: am 66fba009
: Merge "Update arch-mips/asm/unistd.h for the newer syscalls"
...
* commit '35dcf19b2bcf388cda7f4c9baacb159c15c9b03f':
Update arch-mips/asm/unistd.h for the newer syscalls
2012-08-13 16:03:16 -07:00
Amith Yamasani
bf9441efb8
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
(cherry-pick of c60a0027b1ef3bc4929d2023e7083fbce12fafe7.)
Change-Id: I46eeb23fee4f57b2907640570504123d3ce99985
2012-08-13 14:19:16 -07:00
Elliott Hughes
ae5c64413b
Add dependencies on all the makefiles.
...
This should help prevent broken builds next time I'm messing with
assembler/compiler/linker flags...
Change-Id: I30f15a3ce3c3f3c60cad7bc59aaba9f42d792224
2012-08-13 14:06:05 -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
Amith Yamasani
c60a0027b1
Handle naming for system uids running as secondary users
...
Allow naming such as u1_system, u2_radio, u2_media.
Forward and reverse mapping for the above.
Change-Id: Iebe6e5702fc1ed83aa67769a12f693c1be7968ed
2012-08-13 13:35:31 -07:00
Raghu Gandham
7d9f1c46bb
Update arch-mips/asm/unistd.h for the newer syscalls
...
Change-Id: Ie292c091cbf4b972e1b5faa7d779645c6e4442f0
2012-08-13 11:54:53 -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
Elliott Hughes
2a22a69e94
am 877dc946
: am 072a7e6c
: Merge "MIPS support to the libc Makefile"
...
* commit '877dc946090749ba7a71f7ae07f51aa32f966083':
MIPS support to the libc Makefile
2012-08-11 15:16:34 -07:00
Ying Wang
c97c5fc788
Split out LOCAL_ASFLAGS.
...
Bug: 6967574
Change-Id: I5be50d582c1cb8075039b06292cf0745a996c3c4
2012-08-11 14:23:19 -07:00
Raghu Gandham
a4c7933b49
MIPS support to the libc Makefile
...
Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-10 17:24:02 -07:00
Elliott Hughes
0837c69a63
am edf09bf9
: am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:17:05 -07:00
Elliott Hughes
316ee626b7
Merge "MIPS support to sigsuspend and sigwait routines"
2012-08-10 15:05:36 -07:00
Nick Kralevich
73d99958bb
am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00
Nick Kralevich
38a02b4b80
Merge "crtend*: Add GNU_STACK note"
2012-08-10 14:29:27 -07:00
Elliott Hughes
d71ada630d
am 535477ca
: am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '535477ca5e29f3c14dff11ac362423156b5971ec':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:12:08 -07:00
Nick Kralevich
6eee1fc68f
crtend*: Add GNU_STACK note
...
Add a GNU_STACK marker to crtend* files. This tells the linker
that these files do not require an executable stack.
When linking, a missing GNU_STACK marker in any .o file can prevent
the compiler from automatically marking the final executable as NX
safe (executable stack not required). In Android, we normally work
around this by adding -Wa,--noexecstack / -Wl,-z,noexecstack.
For files like crtend.S / crtend_so.S, which are included in every
executable / shared library, it's better to add the GNU_STACK note
directly to the assembly file. This allows the compiler to
automatically mark the final executable as NX safe without any
special command line options.
References: http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
Change-Id: I07bd058f9f60ddd8b146e0fb36ba26ff84c0357d
2012-08-10 14:12:00 -07:00
Elliott Hughes
3ede900b64
Merge "Revert "Revert "Switch to NetBSD's strxfrm(3)."""
2012-08-10 14:03:06 -07:00
Elliott Hughes
a1822dced3
Merge "Add unshare() syscall."
2012-08-10 12:59:49 -07:00
Jeff Sharkey
e36c826f7a
Add unshare() syscall.
...
(cherry-pick of 5467f25f82934d611c60f8bc57a05114f3c1bea0.)
Bug: 6925012
Change-Id: Ic5ea2fbd606311087de05d7a3594df2fa9b2fef9
2012-08-10 12:57:43 -07:00
Elliott Hughes
5140b785a0
am f6922be2
: am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit 'f6922be2a5e30fc594f48ec435d92b5386648061':
Fix typo in SIGTTOU description.
2012-08-10 12:49:12 -07:00
Elliott Hughes
5520650483
am a618ea30
: am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit 'a618ea30e1c9d4f06031fb4ecdae31666db92993':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:49:10 -07:00
Elliott Hughes
29b8fb3d5e
am 3e83da43
: am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '3e83da435b3ad7bee739972fca53dbfb692e6438':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:49:08 -07:00
Elliott Hughes
b6c1e34dca
am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'dc6d5327bb6b030d154675f753d3e4f96dfa5e14':
Auto-generate a complete NOTICE file.
2012-08-10 12:36:22 -07:00
Elliott Hughes
01030e6388
Fix typo in SIGTTOU description.
...
Change-Id: Ie0db3e7df3e1f17b43f5645d027a90603139be2f
2012-08-10 12:23:58 -07:00
Elliott Hughes
f8b3a920a8
Revert "Revert "Switch to NetBSD's strxfrm(3).""
...
This reverts commit 8793e7c7d2
,
and fixes the build by building upstream NetBSD source as a
separate library that's then swallowed whole into libc_common.
Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 12:10:10 -07:00
Elliott Hughes
8793e7c7d2
Revert "Switch to NetBSD's strxfrm(3)."
...
This reverts commit be1d78b0dc
Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
2012-08-10 11:36:17 -07:00
Jeff Sharkey
6ccc2c8f43
Merge "Add unshare() syscall." into jb-mr1-dev
2012-08-10 11:29:53 -07:00
Jeff Sharkey
5467f25f82
Add unshare() syscall.
...
Bug: 6925012
Change-Id: I2530a8f6cea49eb32b60f8f9c4d86963773456ca
2012-08-10 11:17:59 -07:00
Elliott Hughes
be1d78b0dc
Switch to NetBSD's strxfrm(3).
...
There were two bugs in our implementation. Intel found one, but another
remainined, and tracking upstream is the way forward for functions where
we add no value.
Change-Id: Ida9bac0293fb2c4cbc942b1e0515ee0477c6538b
2012-08-10 11:03:02 -07:00
Raghu Gandham
abd10011a7
MIPS support to sigsuspend and sigwait routines
...
Change-Id: I870e798ed7eac5a8c74e5784a670f3a4f24331a9
2012-08-09 18:51:19 -07:00
Elliott Hughes
387d4b7de9
Auto-generate a complete NOTICE file.
...
Remove the hand-collated ones, and switch to a script that pulls the
copyright headers out of every file and collects the unique ones.
Change-Id: Ied3b98b3f56241df97166c410ff81de4e0157c9d
2012-08-09 16:05:31 -07:00
Elliott Hughes
3fc211983e
am 531d348d
: am a17b85d9
: Merge "Remove the last .jam file."
...
* commit '531d348d6e37deb751efbefc0613934c5a80de1d':
Remove the last .jam file.
2012-08-09 12:11:08 -07:00
Elliott Hughes
a554212992
Remove the last .jam file.
...
How did I miss this before?
Change-Id: I2e582133fc4800656fdd81104f8dfc7ee8f5b580
2012-08-09 11:54:23 -07:00
Elliott Hughes
b13ad93f4a
am 3820229b
: am d504eee9
: Merge "MIPS support to sys/ headers"
...
* commit '3820229b46ed3012f19a32cea70b6007ad54b746':
MIPS support to sys/ headers
2012-08-08 17:44:20 -07:00
Elliott Hughes
d504eee9fa
Merge "MIPS support to sys/ headers"
2012-08-08 16:32:55 -07:00
Elliott Hughes
366c01992a
am f3ffb8fa
: am 78129204
: Merge "Clean up the linker a bit, remove prelinking support."
...
* commit 'f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc':
Clean up the linker a bit, remove prelinking support.
2012-08-08 15:30:39 -07:00
Elliott Hughes
7812920487
Merge "Clean up the linker a bit, remove prelinking support."
2012-08-08 15:17:23 -07:00
Elliott Hughes
10e2d222ce
am d463f6e9
: am 34959e0b
: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."
...
* commit 'd463f6e98011fe3b5a23cef2502705dedd702173':
Clean up libc/Android.mk a bit after the crtbrand changes.
2012-08-08 14:43:00 -07:00
Jean-Baptiste Queru
affd1b4243
am 9f3a8aaf
: am 7e248be7
: Merge "Add a .note.android.ident section to Android ELF binaries."
...
* commit '9f3a8aaf926bb0439b7e6b7b62efab62f1900d02':
Add a .note.android.ident section to Android ELF binaries.
2012-08-08 14:08:29 -07:00
Elliott Hughes
76be660aae
Clean up libc/Android.mk a bit after the crtbrand changes.
...
Change-Id: Icfb95fffe70967418cd93da8cbeae22dcd68f8c9
2012-08-08 14:07:37 -07:00
Jean-Baptiste Queru
7e248be764
Merge "Add a .note.android.ident section to Android ELF binaries."
2012-08-08 13:44:27 -07:00
Elliott Hughes
4688279db5
Clean up the linker a bit, remove prelinking support.
...
Also make the errors more readable, since none of us seemed to know
what they actually meant. The new style is still as verbose as the
old, but that's probably necessary in the absence of chained exceptions
in C. Here's what you'd see if you try to boot after removing
libsurfaceflinger.so:
32267 32267 E AndroidRuntime: java.lang.UnsatisfiedLinkError: Cannot load library: (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsystem_server.so" needed by "libandroid_servers.so"; caused by (linker.c:1629, pid 32259) soinfo_link_image: could not load library "libsurfaceflinger.so" needed by "libsystem_server.so"; caused by (linker.c:709, pid 32259) load_library: library "libsurfaceflinger.so" not found
This patch also fixes almost all of the compiler warnings.
Change-Id: I64bb59aed6d4e039c15ea45be2367f319ef879f8
2012-08-07 11:41:10 -07:00
Shih-wei Liao
3b4c9db256
am df523880
: am e2731d98
: Merge "When compiling with clang, don\'t "fortify_source" the strlcpy and strlcat."
...
* commit 'df523880b59604ef36e212cb7ba30d663eeea179':
When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
2012-08-06 11:09:35 -07:00
Shih-wei Liao
e2731d98c1
Merge "When compiling with clang, don't "fortify_source" the strlcpy and strlcat."
2012-08-06 11:02:19 -07:00
Shih-wei Liao
d600617645
When compiling with clang, don't "fortify_source" the strlcpy and
...
strlcat.
Change-Id: I91f58322f28e425ab9d22b51c23fcd6b772ede97
2012-08-06 10:57:37 -07:00
Shih-wei Liao
6ff66601a4
am ce4a5cd5
: am 8173d767
: Merge "Revert "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute""
...
* commit 'ce4a5cd5f3ee09fbc8dea7ffdfcd4fd097f8ed34':
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-06 10:18:21 -07:00
Shih-wei Liao
cddedade5b
am 924fd920
: am 601a49d3
: Merge "When compiling with clang, don\'t "fortify_source" the strlen."
...
* commit '924fd920137135729483d0beacea20d5a0552c15':
When compiling with clang, don't "fortify_source" the strlen.
2012-08-06 10:18:20 -07:00
Shih-wei Liao
8173d76740
Merge "Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute""
2012-08-06 10:05:15 -07:00
Shih-wei Liao
601a49d398
Merge "When compiling with clang, don't "fortify_source" the strlen."
2012-08-06 10:04:22 -07:00
Shih-wei Liao
9a3d53fad0
When compiling with clang, don't "fortify_source" the strlen.
...
At this point, FORTIFY_SOURCE and clang are just plain incompatible.
Need to solve the underlying incompatibility first.
Change-Id: I3366477d19461e1ec93b1c30e0c7e8145b391b9b
2012-08-06 09:50:56 -07:00
Elliott Hughes
eaac1e5a1c
am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '94ce135693a73ac09116dabc0f2440604bba5c87':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:06:27 -07:00
Elliott Hughes
7c92b6ca40
Merge "Remove an awkward #include that is no longer upstream."
2012-08-06 07:57:59 -07:00
Shih-wei Liao
2b7f68c03d
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-03 17:44:08 -07:00
Elliott Hughes
4bac8f689e
am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '7e81ee04532e9c26f90d73061d9a53f09e2c3fa1':
Remove yet more SH4 cruft.
2012-08-03 15:12:39 -07:00
Elliott Hughes
bbf094fdf5
Remove yet more SH4 cruft.
...
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
2012-08-03 14:58:18 -07:00
Elliott Hughes
c9dbebe344
am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'f5385754e29dcb093cb9445c40b69e45bd71d685':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:29:45 -07:00
Jin Wei
c164f2a969
bionic: modify syscall to use 6 registers to pass parameter.
...
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 30838
2012-08-03 13:54:29 -07:00
Elliott Hughes
48955d24b9
am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit 'c6f15ecf76842801db653d58a262c7d342be2a93':
Upgrade to tzdata2012e.
2012-08-03 13:33:15 -07:00
Elliott Hughes
094651335e
Upgrade to tzdata2012e.
...
Includes this change:
* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
(Thanks to Steffen Thorsen.)
Change-Id: I51bfab759f424b90daeb1960c6cfb2b55b78ff46
2012-08-03 12:26:06 -07:00
David Turner
d7552a3101
am 2f2b7212
: am 16d40217
: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit '2f2b72120489d9e7e67a97a059a731aa72a34f72':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:00:03 -07:00
Shih-wei Liao
4f1f149c37
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
...
Recent clang compiler doesn't have gnu_inline working. When frameworks/rs
is compiled with clang instead of gcc, it no longer works. Will be fixed
by this patch.
Change-Id: I8b281a1305151909e18958b73914ea27343cb4cd
2012-08-03 04:38:15 -07:00
Elliott Hughes
9b6a453865
am 0ce92b96
: am 1e304a3b
: Merge "[MIPS] Support for TLS register"
...
* commit '0ce92b9625c5d0cc4e72047e6c8759c4cc079dcb':
[MIPS] Support for TLS register
2012-08-02 18:48:04 -07:00
Elliott Hughes
bdcc14d721
Remove an awkward #include that is no longer upstream.
...
This was causing trouble in https://android-review.googlesource.com/#/c/37590/ .
Change-Id: Ib7cb4fbaef6e9c1470c59f67d24bd24c7ce90bcc
2012-08-02 18:12:36 -07:00
Raghu Gandham
6437eac15a
MIPS support to sys/ headers
...
Change-Id: I32207a1d918e4842da341f6b242ae39c69a83b03
2012-08-02 18:03:54 -07:00
Raghu Gandham
1c30398143
[MIPS] Support for TLS register
...
Change-Id: I6b5194e5e379b573e3b1203d8015e20fb3edd647
Signed-off-by: Chris Dearman <chris@mips.com>
2012-08-02 18:01:05 -07:00
Elliott Hughes
f94effdab2
am fd4685be
: am 52f3ee96
: Merge "MIPS support for libc."
...
* commit 'fd4685be87fa2c957d4f95deb75a6ba763fd7339':
MIPS support for libc.
2012-08-02 16:34:57 -07:00
Elliott Hughes
82dcfee5fc
am 19e30fc4
: am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '19e30fc41030ab0524134b097dfef88baea14f4a':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:07:41 -07:00
Elliott Hughes
c07196605c
am 670766c5
: am 994935f6
: Merge "Error numbers are target specific."
...
* commit '670766c5649086ad5ffe26c0deadeb460139202f':
Error numbers are target specific.
2012-08-02 16:07:40 -07:00
Raghu Gandham
405b8029a6
MIPS support for libc.
...
Change-Id: I2864dea04b3faf2d919165dcaa600af5b16c41c8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-02 16:07:26 -07:00
Elliott Hughes
ecb53eab4b
Fix a ENOTUP/ENOTSUP typo.
...
Change-Id: Ifa347a09a2aa1f505965ae7c1383fd0caf95793c
2012-08-02 15:45:04 -07:00
Elliott Hughes
994935f64c
Merge "Error numbers are target specific."
2012-08-02 15:42:48 -07:00
Chris Dearman
da2611084f
Error numbers are target specific.
...
Use the system supplied error numbers when mapping error numbers to messages.
Change-Id: I520556fa3e2ff668fdc4eda36ad31491fbb48ea8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 17:53:07 -07:00
Ajay Dudani
cbbe9528ca
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-07-31 21:32:50 -07:00
Elliott Hughes
81f1617a68
am 8d2c5b24
: am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '8d2c5b247e701f51ce3d750e9ee3ff37009630c3':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:32:45 -07:00
Raghu Gandham
c29f295d39
Updated the cleaned header file mman.h for MIPS.
...
Change-Id: I8b3734e535711ca07fbf4066e6d967d1ce0f30eb
2012-07-31 14:47:51 -07:00
Elliott Hughes
f19979710a
am 7645355e
: am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit '7645355ecdf29301bdc65f9ea8e00c20e51da3f5':
bionic: Stack pointer/signal race condition.
2012-07-31 10:40:06 -07:00
Elliott Hughes
b78aa53904
am bf397b60
: am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'bf397b601189f8a63c8a842e16af5ed004ef75f5':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:40:05 -07:00
Elliott Hughes
a513f70b43
Merge "bionic: Stack pointer/signal race condition."
2012-07-31 10:32:59 -07:00
Elliott Hughes
21372896ea
Merge "fix __cxa_finalize() implementation to be thread safe."
2012-07-31 10:31:20 -07:00
Srinavasa Nagaraju
2270dfa0c4
fix __cxa_finalize() implementation to be thread safe.
...
__cxa_finalize() modifies the access permissions of __atexit
global variable without acquiring _ATEXIT_LOCK(). Fix it prevent
any possible races.
Change-Id: I11939d0ebcbf6f360c14163222d40a449d96948e
2012-07-31 12:30:28 +02:00
Michael Hope
ea8fad11d9
Add a .note.android.ident section to Android ELF binaries.
...
This allows debugging tools to know they are working with Android
binaries and adapt accordingly.
Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Signed-off-by: Michael Hope <michael.hope@linaro.org>
Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 16:18:22 +12:00
Shih-wei Liao
0c2d318837
am 18421669
: am 1ee6e3b7
: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '184216696a9945a5bf6cb186b4d3a42ffe582818':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:13:26 -07:00
Ed Heyl
681ccffb45
Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h
...
Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09
2012-07-29 08:22:16 -07:00
Shih-wei Liao
fc0725ec5c
Install crt(begin|end)_so.o to target library path.
...
BUG=6886348.
Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 00:33:28 -07:00
Elliott Hughes
52d6233296
Report errors to the log, not just stderr.
...
In particular this affects assert(3) and __cxa_pure_virtual, both of
which have managed to confuse people this week by apparently aborting
without reason. (Because stderr goes nowhere, normally.)
Bug: 6852995
Bug: 6840813
Change-Id: I7f5d17d5ddda439e217b7932096702dc013b9142
2012-07-27 17:43:38 -07:00
Ying Wang
6171d11e72
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
(cherry-picked from 186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug: 6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
2012-07-27 13:44:01 -07:00
Elliott Hughes
12f411d9a6
Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
2012-07-27 10:02:59 -07:00
Jens Gulin
c20d0f3993
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
...
RETRY macro may retry command if result is -1. In this
case the command was "connect < 0" instead of just
connect. The comparison will not return -1 and thus
retry is never done. This is now corrected so that
interrupts will cause retry instead of fail.
(There was no other negative side effect of the bug.
The result code from RETRY was used in an if-statement
and it would be true for all negative connect results.
This was according to expectations.)
Change-Id: Ie206b39878e9befea4e3be9a4061ee39eb232d80
2012-07-27 15:18:23 +02:00
Peter Enderborg
3460db9490
bionic: Stack pointer/signal race condition.
...
Move the stackpointer so a captured signal does not corrupt
stack variables needed for __thread_entry.
Change-Id: I3e1e7b94a6d7cd3a07081f849043262743aa8064
2012-07-27 15:11:01 +02:00
Elliott Hughes
7d6c3f700b
Merge "Remove the 'Factory' time zone by not processing the 'factory' file."
2012-07-26 17:36:21 -07:00
Elliott Hughes
541c225320
Remove the 'Factory' time zone by not processing the 'factory' file.
...
The factory file (and Factory time zone) was meant as a way to say
"not configured" that would give a clear error when running date(1).
For us it would just look like UTC, so it is of no value.
Bug: 2997381
Change-Id: I1a4b85dce97d1d9370b22ba79e8fe5dafff56541
2012-07-26 16:19:46 -07:00
Nick Kralevich
9145ad3f0a
vfprintf: fix spelling.
...
Change-Id: I6dc611143fb1f3e9ccf0a77b40ee48a3c1d72ca9
2012-07-25 16:01:38 -07:00
Chris Dearman
00a66a6fe8
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
...
Change-Id: I269c9ccc07058773fb0f9d70673673157ab38f6a
2012-07-24 17:42:06 -07:00
Chris Dearman
958dad705a
Fix implementation of generic atomic operations
...
Change-Id: Ie1ea5aacc561e2d6d40125d2952ed0e9116b7b0d
2012-07-24 13:56:38 -07:00
Raghu Gandham
f7fb9e1ef1
[MIPS] Add atomic routines
...
Change-Id: I2cb20ce44dd230d222b7fc1ede2e1e3dce6e692b
2012-07-24 10:30:22 -07:00
Elliott Hughes
5d967e43d0
Upgrade to tzdata2012d.
...
This upgrade involved rewriting the script; the data has moved to ftp.iana.org,
where it's slightly less convenient to access, so it's time to use something
that can talk FTP...
As for tzdata2012d, it's just updating Morocco for this weekend's changes, now
they've been decided at the last minute (as usual).
Change-Id: I772df57a6e09b3bf3d9541bfc08930d6f18633b4
2012-07-20 16:53:32 -07:00
Naseer Ahmed
2730674ca9
bionic: Update MDP and rotator headers
...
Change-Id: I585e07b004dfa6b5113050211ca67e4c057f5531
2012-07-20 08:54:32 -07:00
Nick Pelly
0351955a68
Update time.h for CLOCK_BOOTTIME.
...
(cherry-pick of 8958a38329
)
Change-Id: Ie8de6b32fa81566db53ad7e9fd4b197f4cede628
2012-07-19 17:10:14 -07:00
Ajay Dudani
3e210abf7d
Adding msm_dsps.h header
...
Change-Id: I7736a3a895b9c81d5184f7c97ac0ed5aeb138d25
2012-07-19 07:26:26 -07:00
Elliott Hughes
fabddfe833
Merge "limits.h: Include page.h when relying on PAGE_SIZE"
2012-07-16 09:39:24 -07:00
Nick Kralevich
c37fc1ab6a
FORTIFY_SOURCE: revert memcpy changes.
...
Performance regressions. Hopefully this is a temporary
rollback.
Bug: 6821003
Change-Id: I84abbb89e1739d506b583f2f1668f31534127764
2012-07-13 17:58:37 -07:00
Nick Kralevich
9b6cc223a3
FORTIFY_SOURCE: introduce __BIONIC_FORTIFY_UNKNOWN_SIZE macro
...
Replace all occurances of "(size_t) -1" with a
__BIONIC_FORTIFY_UNKNOWN_SIZE macro.
Change-Id: I0b188f6cf31417d2dbef0e1bd759de3f9782873a
2012-07-13 14:49:33 -07:00
Nick Kralevich
260bf8cfe0
FORTIFY_SOURCE: strlen check.
...
This test is designed to detect code such as:
int main() {
char buf[10];
memcpy(buf, "1234567890", sizeof(buf));
size_t len = strlen(buf); // segfault here with _FORTIFY_SOURCE
printf("%d\n", len);
return 0;
}
or anytime strlen reads beyond an object boundary. This should
help address memory leakage vulnerabilities and make other
unrelated vulnerabilities harder to exploit.
Change-Id: I354b425be7bef4713c85f6bab0e9738445e00182
2012-07-13 13:49:59 -07:00
Nick Kralevich
b2060b027c
FORTIFY_SOURCE: restore __memcpy_chk()
...
In our previous FORTIFY_SOURCE change, we started using a custom
inline for memcpy(), rather than using GCC's __builtin_memcpy_chk().
This allowed us to delete our copy of __memcpy_chk(), and replace it
by __memcpy_chk2().
Apparently GCC uses __memcpy_chk() outside of __builtin_memcpy_chk().
Specifically, __memcpy_chk() is used by __builtin__memMOVE_chk() under
certain optimization levels.
Keep the old __memcpy_chk() function around, and have it call into
__memcpy_chk2().
Change-Id: I2453930b24b8a492a3b6ed860e18d92a6b762b80
2012-07-13 13:49:45 -07:00
Yaroslav Miroshnychenko
c7dcd67d56
Add missing va_end() to prevent stack corruptions
...
Added va_end() for copied variable arguments lists
in __vfprintf() and __find_arguments().
This is by C standard.
Important for systems which pass arguments in registers.
Change-Id: I7ac42beaa6645bfe856c18132253352dae29ea37
2012-07-13 09:37:57 +02:00
Nick Kralevich
f3913b5b68
FORTIFY_SOURCE: enhanced memcpy protections.
...
Two changes:
1) Detect memory read overruns.
For example:
int main() {
char buf[10];
memcpy(buf, "abcde", sizeof(buf));
sprintf("%s\n", buf);
}
because "abcde" is only 6 bytes, copying 10 bytes from it is a bug.
This particular bug will be detected at compile time. Other similar
bugs may be detected at runtime.
2) Detect overlapping buffers on memcpy()
It is a bug to call memcpy() on buffers which overlap. For
example, the following code is buggy:
char buf3[0x800];
char *first_half = &buf3[0x400];
char *second_half = &buf3[1];
memset(buf3, 0, sizeof(buf3));
memcpy(first_half, second_half, 0x400);
printf("1: %s\n", buf3);
We now detect this at compile and run time.
Change-Id: I092bd89f11f18e08e8a9dda0ca903aaea8e06d91
2012-07-12 15:38:15 -07:00
Nick Kralevich
e64259e860
memmove: Don't call memcpy if regions overlap
...
memmove() unconditionally calls memcpy() if "dst" < "src". For
example, in the code below, memmove() would end up calling memcpy(),
even though the regions of memory overlap.
int main() {
char buf3[0x800];
char *dst = &buf3[1];
char *src = &buf3[0x400];
memset(buf3, 0, sizeof(buf3));
memmove(dst, src, 0x400);
printf("1: %s\n", buf3);
return 0;
}
Calling memcpy() on overlaping regions only works if you assume
that memcpy() copies from start to finish. On some architectures,
it's more efficient to call memcpy() from finish to start.
This is also triggering a failure in some of my code.
More reading:
* http://lwn.net/Articles/414467/
* https://bugzilla.redhat.com/show_bug.cgi?id=638477#c31 (comment 31)
Change-Id: I65a51ae3a52dd4af335fe5c278056b8c2cbd8948
2012-07-11 17:46:03 -07:00
Nick Kralevich
6334c662ca
Don't use -fstack-protector on ssp.c
...
libc's stack protector initialization routine (__guard_setup)
is in bionic/ssp.c. This code deliberately modifies the stack
canary. This code should never be compiled with -fstack-protector-all
otherwise it will crash (mismatched canary value).
Force bionic/ssp.c to be compiled with -fno-stack-protector
Change-Id: Ib95a5736e4bafe1a460d6b4e522ca660b417d8d6
2012-07-10 10:51:41 -07:00
Arun Raghavan
6331db3fd2
limits.h: Include page.h when relying on PAGE_SIZE
...
limits.h relies on PAGE_SIZE being defined without actually including
page.h. Make sure this is included to avoid compilation failures.
Signed-off-by: Arun Raghavan <arun.raghavan@collabora.co.uk>
2012-07-10 10:36:37 +05:30
Nick Kralevich
8f08e1c902
Merge "FORTIFY_SOURCE: Add openat, fix bug"
2012-07-09 12:55:32 -07:00
Nick Kralevich
a3e230d1fa
FORTIFY_SOURCE: Add openat, fix bug
...
Add fortify_source support for openat(). This change requires that
an argument be supplied when using O_CREAT.
Fix unnecessary call to __open_2. If, at compile time, we know that
"flags" is constant and DOESN'T contain O_CREAT, the call to __open_2
is useless.
Change-Id: Ifcd29c4fb25e25656961d7552d672e161f0cfdbd
2012-07-09 12:30:40 -07:00
Nick Kralevich
965dbc6405
FORTIFY_SOURCE: add fgets support.
...
Change-Id: I8c3410a90c71a3336c4ac8581618fa9330edf5e3
2012-07-09 09:57:18 -07:00
Ajay Dudani
3fc3b7fd94
Update msm headers for audio, camera, ion, charm, rmnet
...
Change-Id: I226a1c57b94ea542fa5f3ea081582d49b3b9a3d1
2012-07-08 23:53:32 -07:00
Naseer Ahmed
05ad617b5b
bionic: Update msm_mdp.h from the kernel
...
Adds more color formats that were missing
Change-Id: I4e247ab630d9afa3ba75444bde7cd2dcd39f2ab2
2012-07-06 12:03:26 -07:00
choongryeol.lee
402b93c16d
update linux/fb.h to support fb ioctl in kernel 3.4
...
Change-Id: I959e4f445360263a34f20b0ae1a8b42123710c13
2012-06-28 21:11:08 -07:00
Rebecca Schultz Zavin
2ddf77b377
Merge "Modify ion header"
2012-06-28 14:16:10 -07:00
Nick Kralevich
bd73eede46
Merge "FORTIFY_SOURCE: add open() checks"
2012-06-27 12:56:52 -07:00
Nick Kralevich
cb228fb4a9
libc: cleanups
...
Prefix private functions with underscores, to prevent name
conflicts.
Use __error__ instead of error, since occasionally programs will
create their own "#define error ...".
Change-Id: I7bb171df58aec5627e61896032a140db547fd95d
2012-06-26 16:05:19 -07:00
Nick Kralevich
8118f62a7d
FORTIFY_SOURCE: add open() checks
...
Add a FORTIFY_SOURCE check which requires that you pass a
"mode" argument when calling open(..., O_CREAT). If a mode isn't
passed, then the file is created with "undefined" permissions.
Change-Id: I4427be4f9ce170c69da01af5b00fb05b03613a28
2012-06-26 15:19:12 -07:00
Haynes Mathew George
3fad2b17b9
Use sanitized video decode/encode header files
...
Change-Id: Id4897181da94af51992c71cd49aff1f40970e6c7
2012-06-21 15:45:28 -07:00
Naseer Ahmed
240b3349fc
bionic: Update MDP and KGSL headers
...
Update headers for MSM MDP, MSM KGSL and MSM
rotator to match the version in the Linux
3.4 kernel baseline
Change-Id: I37052486be8c8862e65cac1f6934368ecc055a76
2012-06-21 11:50:01 -07:00
Andy McFadden
f2ba5c9afa
am 63c4179f
: am 4d0128f1
: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev
...
* commit '63c4179f5951edc2d68700fe75659fbd34febe63':
Minor tweak to get memory around corrupted heap chunks dumped.
2012-06-19 11:33:19 -07:00
Andy McFadden
63c4179f59
am 4d0128f1
: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev
...
* commit '4d0128f13a3ca9f7a0c81b6e69f7e20d28e9e6e3':
Minor tweak to get memory around corrupted heap chunks dumped.
2012-06-19 11:31:14 -07:00
Andy McFadden
5e94df8a4f
am 4d0128f1
: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev
...
* commit '4d0128f13a3ca9f7a0c81b6e69f7e20d28e9e6e3':
Minor tweak to get memory around corrupted heap chunks dumped.
2012-06-19 11:31:06 -07:00
Ben Cheng
ec2ab73b87
Minor tweak to get memory around corrupted heap chunks dumped.
...
Change-Id: I8f72c5c7e23960b13fc53e2354cd74aca8aac3c0
2012-06-19 07:11:38 -07:00
Arve Hjønnevåg
ece8f502ed
Merge "Add watchdog.h"
2012-06-14 16:13:16 -07:00
Nick Kralevich
70f6901c3d
libc: make atoi, atol, and atoll pure functions
...
Change-Id: Ib831c079c865929b6c91d42f35e117f2e974808f
2012-06-14 13:57:43 -07:00
Nick Kralevich
8df49ad246
FORTIFY_SOURCE: add strlcpy / strlcat support
...
Add strlcpy / strlcat support to FORTIFY_SOURCE. This allows
us to do consistency checks on to ensure we don't overflow buffers
when the compiler is able to tell us the size of the buffer we're
dealing with.
Unlike previous changes, this change DOES NOT use the compiler's
builtin support. Instead, we do everything the compiler would
normally do.
Change-Id: I47c099a911382452eafd711f8e9bfe7c2d0a0d22
2012-06-14 12:52:42 -07:00