Jean-Baptiste Queru
681c4bd782
Merge b3773e9c
...
Change-Id: I5787d9ac5e745a08e1c891e9ce9efc4e7f97ace8
2011-07-06 13:00:05 -07:00
Jean-Baptiste Queru
cb5529efd8
Merge 784515ad
...
Change-Id: I3e5b691d008e9548f43339635bafdd95bc2f56fe
2011-07-06 12:59:55 -07:00
Jean-Baptiste Queru
c993768360
Revert "Revert "libc: Add logcat error message for memory corruption""
...
This reverts commit 368ee1e4d65c555fdb0fa4b3a91d75a397936908.
2011-07-06 12:58:56 -07:00
David 'Digit' Turner
b3773e9cc8
am 9c95cbf7: Merge "Really fix the build."
...
* commit '9c95cbf75094c15d251bb3d57a55ce47d7c6c2c8':
Really fix the build.
2011-07-06 10:27:49 -07:00
David 'Digit' Turner
9c95cbf750
Merge "Really fix the build."
2011-07-06 10:19:47 -07:00
David 'Digit' Turner
c51871d4b2
Really fix the build.
...
libcutils/mspace.c includes libc/bionic/dlmalloc.c, we need to
take care of the fact that any internal C library function cannot
be used from it.
Change-Id: I0bc81ae090b7ac2d464f26b97fc6b94a08cdad9c
2011-07-06 19:02:15 +02:00
David 'Digit' Turner
784515ad93
am 01eb7f72: Merge "Fix broken build"
...
* commit '01eb7f72434830bb14cec906d885d2b7ee40d53b':
Fix broken build
2011-07-06 09:08:47 -07:00
David 'Digit' Turner
01eb7f7243
Merge "Fix broken build"
2011-07-06 08:56:48 -07:00
David 'Digit' Turner
a4824467c3
Fix broken build
...
Change-Id: Ia46b50aec51a55434c8828a73e07f4732f8f6c1c
2011-07-06 17:54:35 +02:00
Mathew Inwood
368ee1e4d6
Revert "libc: Add logcat error message for memory corruption"
...
This fixes the build.
This reverts commit 7708a89c60e7b024d31c48c8034932c5e9f0aceb.
2011-07-06 16:51:54 +01:00
David 'Digit' Turner
877923d369
am d25ea49e: am b73b6783: Merge "libc: Add logcat error message for memory corruption"
...
* commit 'd25ea49e632c00d57d893563dac3f6dae5493b7e':
libc: Add logcat error message for memory corruption
2011-07-06 07:53:10 -07:00
David 'Digit' Turner
d25ea49e63
am b73b6783: Merge "libc: Add logcat error message for memory corruption"
...
* commit 'b73b6783a595cf4b1cef6463c23317a8b417f1e9':
libc: Add logcat error message for memory corruption
2011-07-06 07:46:40 -07:00
David 'Digit' Turner
b73b6783a5
Merge "libc: Add logcat error message for memory corruption"
2011-07-05 11:59:42 -07:00
David 'Digit' Turner
7708a89c60
libc: Add logcat error message for memory corruption
...
Our dlmalloc implementation currently calls abort() when it detects
that the heap is corrupted, or that an invalid pointer is passed to
one of its functions.
The only way to detect this is because abort() will force-fully
crash the current program with a magic fault address of '0xdeadbaad'.
However, this is not really well documented, and a frequent topic
on the android-ndk forum (among others).
This change makes our dlmalloc code dump a simple message to the
log just before the abort() call (and hence before the stack trace)
to better help identify the problem.
Change-Id: Iebf7eb7fe26463ecadfaca8f247d237edb441e3c
2011-07-05 19:53:53 +02:00
repo sync
d625b56d6b
am 946f3ad1: resolved conflicts for merge of 2f5c6d2d to honeycomb-plus-aosp
...
* commit '946f3ad199e4c20606f4461751f510220b22e7b8':
Update to tzdata2011h.
2011-07-01 09:21:18 -07:00
repo sync
946f3ad199
resolved conflicts for merge of 2f5c6d2d to honeycomb-plus-aosp
...
Change-Id: I858210fce4a04531afd9337a098db1dbf2308c2c
2011-06-30 17:28:59 -07:00
Elliott Hughes
2f5c6d2d66
Merge "Update to tzdata2011h."
2011-06-30 17:00:17 -07:00
Elliott Hughes
1ee2cbe919
Update to tzdata2011h.
...
This includes the Egyptian and Russian DST changes.
(Cherry pick of dd0ffc738e3f956cf4f0ae409cda22595a33f08b.)
Change-Id: Ibf4b6a1f004c997a0b8df66e78f8867425d15dbe
2011-06-30 16:03:23 -07:00
Rebecca Schultz Zavin
015f3a770d
Merge "Add cleaned headers for ion to bionic"
2011-06-30 15:10:37 -07:00
Elliott Hughes
dd0ffc738e
Update to tzdata2011h.
...
This reflects the Russia and Curacao changes.
Change-Id: Id324b5b7690e0e7e46e1984f51647a6d6e7f0df3
2011-06-30 14:56:34 -07:00
Rebecca Schultz Zavin
1079eb1747
Add cleaned headers for ion to bionic
...
Change-Id: I0e2c35e8fb5cd20a796c4f588954205eacde0ae2
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2011-06-30 14:16:17 -07:00
Robert Greenwalt
8f88cbedc1
am e0a4b678: am cc32fbc3: Merge "Add support for a dns cache per interface"
...
* commit 'e0a4b67811981ab4c04c437b23c36ae42c444bce':
Add support for a dns cache per interface
2011-06-27 14:14:07 -07:00
David 'Digit' Turner
2d2dbd3024
x86: fix full_x86-eng build
...
The latest merge conflict resolution worked only for ARM, but not for x86
Both ARM and x86 builds have been tested with this fix.
Change-Id: I4ec1f1b0ea32fa86e7e2515b221133473d6550a3
NOTE: Care has been taken to not change the compiler flags for ARM builds.
In particular, when building crtbegin_so.so, the -fPIC flag is only
used for x86 (previous reports indicate that it breaks the ARM
build at runtime for obscure reasons).
2011-06-25 17:26:38 +02:00
David Turner
afc92c7023
am c643a4d4: am 2be3f09f: Merge "time: Improve C99 compliance"
...
* commit 'c643a4d4c71c2caaf016ab402fba99c1c9377567':
time: Improve C99 compliance
2011-06-24 17:16:56 -07:00
David Turner
8bac1c0dfc
am cd9f1f0b: am ac56f5ca: Merge "strftime: Use snprintf() instead of sprintf()"
...
* commit 'cd9f1f0b2726fbaac75b47231eb80a91841231f9':
strftime: Use snprintf() instead of sprintf()
2011-06-24 10:50:37 -07:00
David 'Digit' Turner
67cbb25865
resolved conflicts for merge of b4896660 to master
...
Change-Id: I40451873c006e5bbcbd17d3bddc1a44773ba16a0
2011-06-24 18:00:04 +02:00
Robert Greenwalt
e0a4b67811
am cc32fbc3: Merge "Add support for a dns cache per interface"
...
* commit 'cc32fbc3050079aa020ac39afb1c84b5e72737a8':
Add support for a dns cache per interface
2011-06-23 11:12:19 -07:00
Robert Greenwalt
cc32fbc305
Merge "Add support for a dns cache per interface"
2011-06-23 10:20:38 -07:00
David Turner
c643a4d4c7
am 2be3f09f: Merge "time: Improve C99 compliance"
...
* commit '2be3f09f2d9b6d35b262f7a6148f51c164bb8cbb':
time: Improve C99 compliance
2011-06-23 10:01:11 -07:00
David Turner
2be3f09f2d
Merge "time: Improve C99 compliance"
2011-06-23 09:10:39 -07:00
David Turner
cd9f1f0b27
am ac56f5ca: Merge "strftime: Use snprintf() instead of sprintf()"
...
* commit 'ac56f5ca2f4c54ddbd37b033f9465d89542c2cbe':
strftime: Use snprintf() instead of sprintf()
2011-06-23 06:13:53 -07:00
David Turner
ac56f5ca2f
Merge "strftime: Use snprintf() instead of sprintf()"
2011-06-23 06:04:28 -07: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
Jim Huang
e6cff939e6
strftime: Use snprintf() instead of sprintf()
...
Change-Id: I112ac012894eddc96e5f3e77cb87bb300596e3ce
Signed-off-by: Jim Huang <jserv@0xlab.org>
2011-06-23 11:10:32 +08: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
Jim Huang
21edf366ea
time: Improve C99 compliance
...
Quote from Linux Programmer's Manual:
"If t is non-NULL, the return value is also stored in the memory
pointed to by t."
Change-Id: I8cb66b67e5f34c536ce2f0db76a6dc337c42ea3f
Signed-off-by: Jim Huang <jserv@0xlab.org>
2011-06-22 16:44:45 +08: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