Elliott Hughes
0f7814264c
am 4d71adbc
: am 10225071
: Merge "Fixes x86 build."
...
* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
Fixes x86 build.
2012-10-18 13:58:18 -07:00
Elliott Hughes
4d71adbc0d
am 10225071
: Merge "Fixes x86 build."
...
* commit '102250719f8aff443741e54ba5633c7722544620':
Fixes x86 build.
2012-10-18 13:56:02 -07:00
Elliott Hughes
102250719f
Merge "Fixes x86 build."
2012-10-18 13:43:41 -07:00
Elliott Hughes
8b95404d00
Fixes x86 build.
...
Change-Id: I0e576784b2224668d58ebea03986d534ee0e43b4
2012-10-18 13:42:59 -07:00
Elliott Hughes
c0e8400361
am 79c6a8d2
: am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit '79c6a8d2b163e40eb6f19bbf8f59eb85fb7996e6':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:40:19 -07:00
Elliott Hughes
79c6a8d2b1
am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit 'ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:37:54 -07:00
Elliott Hughes
ca7466d2b8
Merge "Make bionic's dependency on the tzdata explicit."
2012-10-18 13:19:14 -07:00
Elliott Hughes
914d8d4cff
Make bionic's dependency on the tzdata explicit.
...
Also stop building the obsolete three files, now bionic and libcore
both use the new single file.
Bug: 7012465
Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
2012-10-18 12:23:34 -07:00
Elliott Hughes
c63dda22dd
am 1b315363
: am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '1b315363c22fdf53d77fc83ec0bbada32e73ccc7':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 11:02:01 -07:00
Elliott Hughes
1b315363c2
am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '5ae762a393168932602eb7269a7d30a53de1c83c':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 10:59:27 -07:00
Elliott Hughes
5ae762a393
Merge "Pull bionic's time zone data from the new single 'tzdata' file."
2012-10-18 10:48:11 -07:00
Elliott Hughes
9648b588b4
am e5c8ced4
: am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit 'e5c8ced4f95e97b2fadc0c64fbdbeeb023677035':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:28:52 -07:00
Elliott Hughes
e5c8ced4f9
am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit '9ffaabcc49776676cb2ea60f0846f2c208f6d715':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:26:36 -07:00
Elliott Hughes
9ffaabcc49
Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
2012-10-18 10:09:47 -07:00
Elliott Hughes
d23af23268
Pull bionic's time zone data from the new single 'tzdata' file.
...
Bug: 7012465
Change-Id: Iec71e448bf7a40af30ca89150b3c336e67a44a43
2012-10-17 16:30:47 -07:00
Elliott Hughes
f190a16e5e
am c2e4c310
: am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit 'c2e4c310ff9ace06be0376d649a09abb51813981':
Put all the tzdata in one file.
2012-10-17 16:12:19 -07:00
Elliott Hughes
c2e4c310ff
am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
Put all the tzdata in one file.
2012-10-17 16:09:31 -07:00
Elliott Hughes
32ea9fe578
Merge "Put all the tzdata in one file."
2012-10-17 15:52:09 -07:00
Elliott Hughes
fb018a2dde
Put all the tzdata in one file.
...
I'll come back and remove the separate files (and change the regular 'generate'
script) when the separate files are obsolete, but in the interim period, it's
easier to have both old and new files available.
Bug: 7012465
Change-Id: I36e2fd49c08ff79ded6eca1c5bc4c08837cc490a
2012-10-17 14:24:50 -07:00
Elliott Hughes
ead7819f51
Remove obsolete CHANGES.TXT and ISSUES.TXT.
...
These haven't been updated in a long time, and "git log" is the source of truth.
Change-Id: I99036f6111e53425f32df510b7b717deb77513a5
2012-10-17 11:33:59 -07:00
Elliott Hughes
9eaa953642
am 06abe13c
: am a2f596b6
: Merge "Make dlerror(3) thread-safe."
...
* commit '06abe13c5f7a318eef316268d0d25d92ff128c19':
Make dlerror(3) thread-safe.
2012-10-17 11:05:19 -07:00
Elliott Hughes
06abe13c5f
am a2f596b6
: Merge "Make dlerror(3) thread-safe."
...
* commit 'a2f596b65075db7916ffffa2f5059e7953719578':
Make dlerror(3) thread-safe.
2012-10-17 11:03:12 -07:00
Elliott Hughes
a2f596b650
Merge "Make dlerror(3) thread-safe."
2012-10-17 10:50:48 -07:00
David 'Digit' Turner
826215bec2
am c7dc8425
: am 42ac0e50
: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit 'c7dc842529ea6f8801164eb8b4f7d036acc53955':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:32:36 -07:00
David 'Digit' Turner
c7dc842529
am 42ac0e50
: Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
...
* commit '42ac0e50302c4d5ce855444e44615489ab662452':
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 10:30:01 -07:00
David 'Digit' Turner
42ac0e5030
Merge "Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>""
2012-10-17 10:11:23 -07:00
David 'Digit' Turner
c1b44ecc53
Revert "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
This creates build issues in the internal Android tree.
Will investigate later.
Original patch: https://android-review.googlesource.com/#/c/38875/
Change-Id: I12c5995ebf172890051af42a5d3b31014c9c5117
2012-10-17 19:10:11 +02:00
David 'Digit' Turner
87f487f6ce
am 423a0740
: am 4136c3a2
: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '423a0740b536f688b0c1866437dfe59e06413435':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:34:57 -07:00
David 'Digit' Turner
423a0740b5
am 4136c3a2
: Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
...
* commit '4136c3a2b7f7546968c5a305aa2ef0663fcb6c6d':
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
2012-10-17 07:32:56 -07:00
David 'Digit' Turner
4136c3a2b7
Merge "libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>"
2012-10-17 07:20:54 -07:00
David 'Digit' Turner
c124baaf29
libc: Provide ucontext_t/mcontext_t/<sys/ucontext.h>
...
This patch updates the C library headers to provide ucontext_t
definitions for three architectures.
+ Fix <signal.h> to always define 'struct sigcontext'.
The new declarations are announced with new macros defined in
<sys/cdefs.h> in order to make it easier to adapt client code
that already defines its own, incompatible, versions of the
structures seen here.
http://code.google.com/p/android/issues/detail?id=34784
Change-Id: Ie78c48690a4ce61c50593f6c39639be7fead3596
2012-10-17 15:59:23 +02:00
Elliott Hughes
5419b94747
Make dlerror(3) thread-safe.
...
I gave up trying to use the usual thread-local buffer idiom; calls to
calloc(3) and free(3) from any of the "dl" functions -- which live in
the dynamic linker -- end up resolving to the dynamic linker's stubs.
I tried to work around that, but was just making things more complicated.
This alternative costs us a well-known TLS slot (instead of the
dynamically-allocated TLS slot we'd have used otherwise, so no difference
there), plus an extra buffer inside every pthread_internal_t.
Bug: 5404023
Change-Id: Ie9614edd05b6d1eeaf7bf9172792d616c6361767
2012-10-16 17:58:17 -07:00
Elliott Hughes
2734345095
am ee7a28c5
: am a9944cfe
: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'ee7a28c529dad9f51aa86271350a4e2d7cddc9d4':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:25:32 -07:00
Elliott Hughes
ee7a28c529
am a9944cfe
: Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
...
* commit 'a9944cfe9e152ca46afb0a77300ec5a2a1a24e64':
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
2012-10-15 20:20:50 -07:00
Elliott Hughes
a9944cfe9e
Merge "LONG_LONG_MIN/MAX: Move declarations to <limits.h>"
2012-10-15 17:34:13 -07:00
David 'Digit' Turner
f8a2c51bf3
LONG_LONG_MIN/MAX: Move declarations to <limits.h>
...
LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX are
GLibc-specific macros that are better defined in <limits.h>
instead of the current exotic location (<pthread.h>).
Note that GCC's <limits.h> only defines these macros
when __GNU_LIBRARY__ is also defined. This is only the
case when building against GLibc, so manually redefine
the macros here.
Note that using LLONG_MIN/LLONG_MAX/ULLONG_MAX is the
C99-compliant way to get these values, but it's easier
to define these compatibility macros for the sake of
porting existing code.
Change-Id: I8023918d73b4685238054932f94a4006c1ca7d03
2012-10-15 18:52:55 +02:00
Elliott Hughes
b2d2b30a13
am 1452324f
: am fcf901d5
: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit '1452324ff551f3aa7f9d61186d3b9cb04f7e9d39':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:15:39 -07:00
Elliott Hughes
1452324ff5
am fcf901d5
: Merge "Fix realloc(3) when chk_malloc debugging is on."
...
* commit 'fcf901d5c0924a71a1405a2535051663281da048':
Fix realloc(3) when chk_malloc debugging is on.
2012-10-12 17:14:29 -07:00
Elliott Hughes
fcf901d5c0
Merge "Fix realloc(3) when chk_malloc debugging is on."
2012-10-12 17:09:03 -07:00
Elliott Hughes
e7e274b13a
Fix realloc(3) when chk_malloc debugging is on.
...
The tests for a NULL pointer and size 0 were the wrong way round.
From Intel's patch 9cae4f2ffc4778ed82be04711d8775a84092d4e2.
Change-Id: I118aff3358aa5f34126d74bfaa43f6e2f1a89055
2012-10-12 17:05:05 -07:00
Elliott Hughes
4089dea451
am c2483ea9
: am 9434e8fe
: Merge "Make the dlfcn mutex static."
...
* commit 'c2483ea9b63de373e7521e39162395a8c667239a':
Make the dlfcn mutex static.
2012-10-12 11:24:25 -07:00
Elliott Hughes
c2483ea9b6
am 9434e8fe
: Merge "Make the dlfcn mutex static."
...
* commit '9434e8febc8b223db2d49e7f97140771700113b9':
Make the dlfcn mutex static.
2012-10-12 11:21:59 -07:00
Elliott Hughes
9434e8febc
Merge "Make the dlfcn mutex static."
2012-10-12 10:59:59 -07:00
Elliott Hughes
22d629211d
Make the dlfcn mutex static.
...
More style fixes too, and removal of yet another lingering SH reference!
Change-Id: Iebc34a46475dd11845ad172b9108bb6ddd7585bb
2012-10-12 10:50:21 -07:00
Elliott Hughes
66d71c8f13
am ab4e2ed1
: am db4fdf1a
: Merge "Fix dlerror(3)."
...
* commit 'ab4e2ed182011998751ff5d6c321ff5bae20c6cd':
Fix dlerror(3).
2012-10-12 10:49:08 -07:00
Elliott Hughes
ab4e2ed182
am db4fdf1a
: Merge "Fix dlerror(3)."
...
* commit 'db4fdf1aafb63b09ee967066d9b8107a9812db2d':
Fix dlerror(3).
2012-10-12 10:47:59 -07:00
Elliott Hughes
db4fdf1aaf
Merge "Fix dlerror(3)."
2012-10-12 10:27:44 -07:00
The Android Open Source Project
aff37491a1
am cf3fa7f4
: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
...
* commit 'cf3fa7f45742c870f1478b1bf7717d3042d599d7':
2012-10-12 07:32:05 -07:00
The Android Open Source Project
cf3fa7f457
Reconcile with jb-mr1-factory-release - do not merge
...
Change-Id: I833db3c1458b360d17442413b86b546dc650bc0c
2012-10-12 07:30:26 -07:00
Elliott Hughes
3b297c4079
Fix dlerror(3).
...
Add unit tests for dlerror(3) in various situations. I think We're at least
as good as glibc now.
Also factor out the ScopedPthreadMutexLock and use it here too.
Bug: http://code.google.com/p/android/issues/detail?id=38398
Change-Id: I040938b4366ab836e3df46d1d8055b92f4ea6ed8
2012-10-11 16:08:51 -07:00