Elliott Hughes
3d01901774
am bec648ee
: am 8db4b91b
: am d2236e2c
: Merge "Fix Mac build."
...
* commit 'bec648ee9f47c4120e5a4f82c7f0e6d225cb107f':
Fix Mac build.
2012-09-13 11:14:23 -07:00
Elliott Hughes
bec648ee9f
am 8db4b91b
: am d2236e2c
: Merge "Fix Mac build."
...
* commit '8db4b91bd2a069b2afb377f7e5190f625c3002cf':
Fix Mac build.
2012-09-13 11:11:54 -07:00
Elliott Hughes
8db4b91bd2
am d2236e2c
: Merge "Fix Mac build."
...
* commit 'd2236e2c0717818e150215b4eee7af58cd3540d8':
Fix Mac build.
2012-09-13 11:09:49 -07:00
Elliott Hughes
d2236e2c07
Merge "Fix Mac build."
2012-09-13 11:02:22 -07:00
Elliott Hughes
38bfa21695
Fix Mac build.
...
Change-Id: Id625806fab0f2f7f90f9508c5fce649afe970414
2012-09-13 11:01:46 -07:00
Elliott Hughes
c005a55c74
am 478f8ff3
: am b2550dd4
: am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit '478f8ff3f0bd0b805702eb1f90bd03eef6d19e89':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:54:31 -07:00
Elliott Hughes
00f927f137
am 29861b5d
: am 58d15966
: am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '29861b5d8edf9506acd2289fb5b993b9a7997a59':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:54:30 -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
29861b5d8e
am 58d15966
: am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit '58d15966c8f95998f82a90a5b24e23d56ba6254f':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:52:37 -07:00
Elliott Hughes
b2550dd4c8
am 4a9b7c69
: Merge "Add libdl into libc_malloc_debug_leak build"
...
* commit '4a9b7c694a8312160d3cd953a8227c23a1624868':
Add libdl into libc_malloc_debug_leak build
2012-09-13 09:47:52 -07:00
Elliott Hughes
58d15966c8
am af4d630e
: Merge "Added new test for dlopen which is failing for MIPS."
...
* commit 'af4d630e4d87dca38cc2026b992bb50c49911db9':
Added new test for dlopen which is failing for MIPS.
2012-09-13 09:47:51 -07:00
Elliott Hughes
4a9b7c694a
Merge "Add libdl into libc_malloc_debug_leak build"
2012-09-13 09:46:31 -07:00
Elliott Hughes
af4d630e4d
Merge "Added new test for dlopen which is failing for MIPS."
2012-09-13 09:42:50 -07:00
The Android Automerger
f238e06d3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:18 -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
Xiaokang Qin
9c3449ecd9
bionic: linker: Need update the map->l_addr for execution.
...
Currently, linker doesn't update the map->l_addr for execution.
Which could break the Unwind_Backtrace with PT_GNU_EH_FRAME enabled
in new toolchain.
Change-Id: Ifbd853134da64a962f7e4c4105e56a3f20def1b2
Author: Fengwei Yin <fengwei.yin@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57077
2012-09-13 18:09:20 +08: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
jeffhao
acf5aa76a5
Added new test for dlopen which is failing for MIPS.
...
Change-Id: I2240faefb387a11647f49b1a15699907a40f98c1
2012-09-12 19:19:13 -07:00
Elliott Hughes
218c7f5dbe
am 7f598671
: am ccd7ee62
: am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '7f59867170653a62fb1fbce91bca5f4673be065d':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 17:02:36 -07:00
The Android Open Source Project
b8ceb988ea
am 76a3777a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '76a3777a4d6c3233ba2935828371abd3fbbac843':
2012-09-12 16:58:49 -07:00
Elliott Hughes
cf57515f70
am f801cf55
: resolved conflicts for merge of 47bda0c2
to jb-mr1-dev
...
* commit 'f801cf55bebc8d0d397fbe6db8cc91b3afb78149':
Update the kernel headers to match external/kernel-headers.
2012-09-12 16:11:21 -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
47bda0c293
am 7593fa8e
: Merge "Update the kernel headers to match external/kernel-headers."
...
* commit '7593fa8eb7d8c3950a069e5edd244fb68872ec17':
Update the kernel headers to match external/kernel-headers.
2012-09-12 15:59:29 -07:00
Elliott Hughes
7593fa8eb7
Merge "Update the kernel headers to match external/kernel-headers."
2012-09-12 15:56:11 -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
7f59867170
am ccd7ee62
: am 90ae787b
: am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit 'ccd7ee624a81d61675fa08e149fe190a317341eb':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:08:30 -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
90ae787b30
am 666d06fe
: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
...
* commit '666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
2012-09-12 11:03:24 -07:00
Elliott Hughes
666d06fee9
Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
2012-09-12 10:51:48 -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
The Android Open Source Project
76a3777a4d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1cd7d82959c5e821c23be974b7eb9d4914593bef
2012-09-12 07:39:34 -07:00
The Android Automerger
5766b0932f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:18 -07:00
Elliott Hughes
68221a76b7
am cc0f2253
: am 7f798147
: am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit 'cc0f225365d7103baaba80517850489a5ff17d89':
[MIPS] Check error status from pipe system call
2012-09-11 16:48:50 -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
Elliott Hughes
7f79814798
am cc8668f2
: Merge "[MIPS] Check error status from pipe system call"
...
* commit 'cc8668f261ae5d0ed38961f357e33c026502ed0d':
[MIPS] Check error status from pipe system call
2012-09-11 16:43:39 -07:00
Elliott Hughes
cc8668f261
Merge "[MIPS] Check error status from pipe system call"
2012-09-11 16:38:43 -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
The Android Automerger
49b5eb4ded
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:14 -07:00
Elliott Hughes
20599f5c9e
am eeabbaee
: am f50b99f4
: am e8b4d67a
: am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'eeabbaee88202a459ec381edc45c0995bdcfa3c8':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 17:15:10 -07:00
Ying Wang
62fd0b699a
am 33d552a4
: am e3738414
: am f9920563
: am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit '33d552a4d1c766aeb99c71060aa091e7aafaaac9':
Generate header dependency makefiles for the crt*.o
2012-09-10 17:14:10 -07:00
Elliott Hughes
d203fba8f0
am 934e18e7
: am af4371b4
: am 56ba6336
: am f1d57e16
: Merge "Add more pthreads tests."
...
* commit '934e18e715b0f6627f258d6fc8dc9406f39705f6':
Add more pthreads tests.
2012-09-10 17:09:54 -07:00
Elliott Hughes
b3cbcb3547
am 5804b88a
: am b0102454
: am 7c7a7f8e
: am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '5804b88a44c153fa1b39dd3095be9e905d77cee0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-10 17:05:15 -07:00
Elliott Hughes
b35a90d682
am ffcb92e7
: am b18d4f63
: am 72fcdbe9
: am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit 'ffcb92e779b347b3725e560aa3aabd122a4dbd62':
Add mlockall and munlockall for Google TV.
2012-09-10 17:05:14 -07:00
Elliott Hughes
eeabbaee88
am f50b99f4
: am e8b4d67a
: am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit 'f50b99f471a9af07b2dec6ac3fe1abca5ba9a20b':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:06:50 -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
e8b4d67a37
am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:01:04 -07:00
Elliott Hughes
59726beda5
Merge "Rename crtstart variables as crtbegin, to match reality."
2012-09-10 11:52:12 -07:00