David 'Digit' Turner
67cbb25865
resolved conflicts for merge of b4896660
to master
...
Change-Id: I40451873c006e5bbcbd17d3bddc1a44773ba16a0
2011-06-24 18:00:04 +02:00
David Turner
b489666086
am 1c0a0381
: Merge "Enable functional DSO object destruction"
...
* commit '1c0a0381dfb3648ffadef9537ec9383d63d62473':
Enable functional DSO object destruction
2011-06-23 05:28:13 -07:00
David Turner
1c0a0381df
Merge "Enable functional DSO object destruction"
2011-06-23 04:39:04 -07:00
Brian Carlstrom
e4e7755de3
Merge "Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master"
2011-06-22 14:45:07 -07:00
Brian Carlstrom
a94dc678fb
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
...
Change-Id: I795687c11ca2e8443f7c8c264e209501dab9b2c9
2011-06-22 14:34:39 -07:00
Glenn Kasten
31b1221c2f
Re-generate resource.h from Linux 2.6.39
...
Change-Id: I22534914a4ae042ece4933bd372aafbc9129ab59
2011-06-21 17:49:32 -07:00
Bruce Beare
3964084282
Enable functional DSO object destruction
...
Unfortunately, legacy .so files for ARM don't have a correct crtbegin file.
Consequently, we have to grandfather the old __dso_handle behaviour.
Add some ifdefs for ARM to allow it to use the old code until we can work
out a transition.
Change-Id: I6a28f368267d792c94e1d985d8344023bc632f6f
Author: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-06-20 14:44:44 -07:00
David 'Digit' Turner
ff03fb25f7
am d0909a87
: am 4d9b75a9
: Merge "libstdc++: make operator new call abort on failure."
...
* commit 'd0909a874a0b4e2de1468021942c75712a4463fa':
libstdc++: make operator new call abort on failure.
2011-06-17 03:33:49 -07:00
David 'Digit' Turner
d0909a874a
am 4d9b75a9
: Merge "libstdc++: make operator new call abort on failure."
...
* commit '4d9b75a9b08c19cef81b22f889edba61257fb356':
libstdc++: make operator new call abort on failure.
2011-06-17 03:22:21 -07:00
David 'Digit' Turner
4d9b75a9b0
Merge "libstdc++: make operator new call abort on failure."
2011-06-17 02:51:58 -07:00
David 'Digit' Turner
7c72513bfa
libstdc++: make operator new call abort on failure.
...
This change ensures that operator new will call abort() in case
of memory allocation failure. Note that due to our usage of memory
overcommit, this can only happen under very rare circumstances
(i.e. trying to allocate memory larger than the larger free range
of virtual address space, or when memory is corrutped in various
ways).
Change-Id: I128b8bf626216e899c22a00f24492cd148a1fc94
2011-06-14 21:58:55 +02:00
Jeff Brown
d9dd4bcd9e
Update linux/input.h header to 2.6.39.
...
Change-Id: I48e32adb78aac7e9a79163177fcea827159bd906
2011-06-12 18:09:00 -07:00
Elliott Hughes
3398ee9c15
Fix build.
...
prebuilt/linux-x86/toolchain/arm-linux-androideabi-4.4.x/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: out/target/product/stingray/obj/lib/libc.so: error: undefined reference to '_inet_pton'
Change-Id: Iee9f1ee87d0a37fa6aa91ecfb6283a7e03fb91c2
2011-06-09 13:03:17 -07:00
Jean-Baptiste Queru
af149077bd
am 09dc7fb1
: am b127b1f2
: Merge "libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto."
...
* commit '09dc7fb1b893221776ef5d35d9aaecd07f95eceb':
libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
2011-06-08 17:31:37 -07:00
Jean-Baptiste Queru
19c40c7801
am 1952c8f4
: am e1bd6aa4
: Merge "Update netlink-related kernel includes"
...
* commit '1952c8f43087511fa54ee30a71abf6965597384b':
Update netlink-related kernel includes
2011-06-08 17:31:34 -07:00
Jean-Baptiste Queru
e84dca9b80
am 2cc0f8e9
: am 81ec4e43
: Merge "Add icmp6.h and ip6.h files from current NetBSD libc."
...
* commit '2cc0f8e9b9e5df8439072f1548a90ee48dda0e63':
Add icmp6.h and ip6.h files from current NetBSD libc.
2011-06-08 17:31:31 -07:00
Elliott Hughes
b1fd729d63
Update to the latest NetBSD inet_pton.c.
...
Bug: 4580520
Change-Id: I1079574b14e78e153e10ac527ca406ef560af310
2011-06-08 17:17:53 -07:00
Jean-Baptiste Queru
09dc7fb1b8
am b127b1f2
: Merge "libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto."
...
* commit 'b127b1f208e67d74a7ee94ad2bd0ffb2fed3af6b':
libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
2011-06-07 13:24:04 -07:00
Jean-Baptiste Queru
1952c8f430
am e1bd6aa4
: Merge "Update netlink-related kernel includes"
...
* commit 'e1bd6aa4e10e6b05e74d915c52e11a3998217522':
Update netlink-related kernel includes
2011-06-07 13:24:01 -07:00
Jean-Baptiste Queru
2cc0f8e9b9
am 81ec4e43
: Merge "Add icmp6.h and ip6.h files from current NetBSD libc."
...
* commit '81ec4e437a192189d6abdf32988504c371e52c27':
Add icmp6.h and ip6.h files from current NetBSD libc.
2011-06-07 13:23:58 -07:00
David 'Digit' Turner
cfaf49ddea
am 4aa32153
: am 2cae7967
: Merge "libc: Fix prctl() declaration."
...
* commit '4aa321538afde20a632ed666f83f40f892505550':
libc: Fix prctl() declaration.
2011-06-07 10:49:32 -07:00
Martijn Coenen
fd88dd19f7
Revert "Update X86 Bionic CRT files for unwind/exceptions"
...
This reverts commit dc3bc87b43
,
causes netd to crash.
2011-06-07 17:19:36 +02:00
Martijn Coenen
a903811819
Revert "x86: Enable -fstack-protector"
...
This reverts commit e0b4844a20
,
causes netd to crash.
2011-06-07 17:19:12 +02:00
David Turner
65fb884d28
am 204d1f65
: am b2c7e0c1
: Merge "x86: Enable -fstack-protector"
...
* commit '204d1f65dbfc6d5a14a90627d9d1efcfce8261ee':
x86: Enable -fstack-protector
2011-06-06 12:57:08 -07:00
David Turner
1dae997ca4
am a57270b6
: am 56baceca
: Merge "Update X86 Bionic CRT files for unwind/exceptions"
...
* commit 'a57270b6ab2978764920ade17448f94875249001':
Update X86 Bionic CRT files for unwind/exceptions
2011-06-06 12:57:00 -07:00
David 'Digit' Turner
4aa321538a
am 2cae7967
: Merge "libc: Fix prctl() declaration."
...
* commit '2cae7967e6049e45eaef71207481b6f8b2456025':
libc: Fix prctl() declaration.
2011-06-06 12:27:10 -07:00
David Turner
204d1f65db
am b2c7e0c1
: Merge "x86: Enable -fstack-protector"
...
* commit 'b2c7e0c18b7ab04cfe306277c79165de0612a2d1':
x86: Enable -fstack-protector
2011-06-06 11:32:49 -07:00
David Turner
a57270b6ab
am 56baceca
: Merge "Update X86 Bionic CRT files for unwind/exceptions"
...
* commit '56baceca024f1cc2a5e8ef8c5e7ba7ea463d1ae2':
Update X86 Bionic CRT files for unwind/exceptions
2011-06-06 11:32:38 -07:00
Brian Carlstrom
78d18badef
Merge commit 'a7f976c9de3c20cc8cdde4f3dfeeb48a1a89adb7' into honeycomb-mr2-release-to-dalvik-dev
2011-06-03 12:40:34 -07:00
Jean-Baptiste Queru
b127b1f208
Merge "libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto."
2011-06-02 15:31:01 -07:00
JP Abgrall
8a51237407
libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.
...
Make netinet/ip.h have IPTOS_MINCOST which matches what
kernel/common/linux/ip.h has to say.
Fixup gethostbyaddr() 1st arg to match what man has to say.
Change-Id: Iff9647d4a46ea88b1fc32163eb69bb9b27cdf370
2011-06-02 15:28:16 -07:00
Jean-Baptiste Queru
e1bd6aa4e1
Merge "Update netlink-related kernel includes"
2011-06-02 15:16:48 -07:00
Dmitry Shmidt
b78220573a
Update netlink-related kernel includes
...
Change-Id: I7e41bb168a1036093b598383d663a6a2e036ea42
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-06-02 15:05:34 -07:00
Jean-Baptiste Queru
81ec4e437a
Merge "Add icmp6.h and ip6.h files from current NetBSD libc."
2011-06-02 07:49:14 -07:00
Steinar H. Gunderson
c18d76f6ec
Add icmp6.h and ip6.h files from current NetBSD libc.
...
Change-Id: I6b304dfbefaec74c5fb15b216f38d698a55f0642
2011-06-01 11:12:38 -07:00
Brian Carlstrom
1f8e2672a8
Implement getpwnam_r(3) and getpwuid_r(3).
...
These functions were already declared in <pwd.h>, but hadn't been implemented
yet.
git cherry-pick --no-commit 081504af74
Change-Id: I316acf4cffb9f2c6788e8e342aa620f9a00886d5
2011-05-27 00:52:21 -07:00
Simon Wilson
fe88a194a3
Merge "sound/asound.h: add header for ALSA"
2011-05-26 09:37:32 -07:00
David 'Digit' Turner
2cae7967e6
Merge "libc: Fix prctl() declaration."
2011-05-25 18:24:51 -07:00
David 'Digit' Turner
b083bb57f5
libc: Fix prctl() declaration.
...
This change fixes the prctl() declaration to match GLibc, and allow us
to build gcc-4.6 for Android (among other things). Note that this does
not change the source and binary interfaces.
Change-Id: I3900c957f0da8b3548cbe9da8c41d50099dc19d6
2011-05-26 02:46:41 +02:00
Frank Maker
7b6795dad9
Fixed bug where -k option would not be passed to cleanupFile function
...
Changed cleanupFile to have no default original path, forcing it to be passed instead, thereby conforming to the Google Python style guide.
2011-05-25 17:28:37 -07:00
Simon Wilson
f67e03274d
sound/asound.h: add header for ALSA
...
Change-Id: If9680194846752a2fae6a4a3b8e6dba4175fb9ca
2011-05-25 14:16:34 -07:00
Michael I. Gold
9d91860612
am 5c7384fa
: am 8f7cdff4
: am a7f976c9
: update linux/tegrafb.h
...
* commit '5c7384fa791dafe6cdf9769c5166e683e29f189e':
update linux/tegrafb.h
2011-05-25 11:04:06 -07:00
David Turner
b2c7e0c18b
Merge "x86: Enable -fstack-protector"
2011-05-24 17:43:27 -07:00
David Turner
56baceca02
Merge "Update X86 Bionic CRT files for unwind/exceptions"
2011-05-24 17:26:45 -07:00
Michael I. Gold
5c7384fa79
am 8f7cdff4
: am a7f976c9
: update linux/tegrafb.h
...
* commit '8f7cdff45557c937e6c7a7e010dc961feeb60c16':
update linux/tegrafb.h
2011-05-24 16:48:48 -07:00
Michael I. Gold
8f7cdff455
am a7f976c9
: update linux/tegrafb.h
...
* commit 'a7f976c9de3c20cc8cdde4f3dfeeb48a1a89adb7':
update linux/tegrafb.h
2011-05-24 16:46:27 -07:00
Bruce Beare
e0b4844a20
x86: Enable -fstack-protector
...
Change-Id: Ib69514c3afcb4c1f5e5f3f8cd91acfd145a0866c
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-05-24 13:32:14 -07:00
Mark D Horn
dc3bc87b43
Update X86 Bionic CRT files for unwind/exceptions
...
Several updates to Bionic crt*.o files to implement Linux/x86
stack unwind/exception handling.
Mark __dso_handle as hidden.
Note: Requires complete rebuild due to CRT changes. Google will
need to regenerate and check-in all the prebuilt x86 CRT object
files and libraries which link to them.
Change-Id: I191ce1afb0dee7bbc28dcd9694e5919226dbd070
Signed-off-by: Bruce J Beare <bruce.j.beare@intel.com>
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Lu, Hongjiu <hongjiu.lu@intel.com>
2011-05-24 13:31:50 -07:00
Michael I. Gold
a7f976c9de
update linux/tegrafb.h
...
Change-Id: I6bccdb7e0eb34fc4ca370458f44ed187ccb67ac8
2011-05-24 13:02:58 -07:00
David 'Digit' Turner
5fd462951b
am 5b07b5de
: am 9062a236
: Merge "libc: Fix leak in the DNS thread-specific state."
...
* commit '5b07b5de9112f1d6adc38d3c5e2c7463b9379534':
libc: Fix leak in the DNS thread-specific state.
2011-05-21 21:35:29 -07:00