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
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
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
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
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
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
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
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
Elliott Hughes
f0f052f28d
am 2facd5b5
: am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '2facd5b5ef3e52b11590b4de01e17f6923a85aee':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:43:49 -07:00
Elliott Hughes
2facd5b5ef
am 417fd233
: Merge "Fix perf_event_open syscall for x86 and mips"
...
* commit '417fd2334a694cf6a831b81cd672b4ca31ff2f54':
Fix perf_event_open syscall for x86 and mips
2012-10-11 10:42:00 -07:00
Shuo Gao
4e75c4b2d7
Fix perf_event_open syscall for x86 and mips
...
perf_event_open syscall has a different syscall number for
the 3 supported architectures: arm, x86 and mips. Currenlty
only the arm syscall number is defined for all architectures.
Tracing tools like perf will not work on other architectures
than arm.
Add the different values for perf_event_open on x86 and mips
and run gensyscalls.py to update generated headers.
Change-Id: I2ed78bd42c0e5df8dbc51d784be49cccda5fab30
Author: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-10-11 10:24:51 -07:00
Elliott Hughes
c41e2216f4
am 4c3d7a86
: am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '4c3d7a86bb568e0b3fa5c9e24d32fa1ee9404b2e':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:29:25 -07:00
Elliott Hughes
4c3d7a86bb
am 1ceb9824
: Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
...
* commit '1ceb9824ab39501e98300bc87f7984ee6b455ce8':
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
2012-10-09 18:27:11 -07:00
Elliott Hughes
1ceb9824ab
Merge "Fix a getcwd(3) bug and make our tests run correctly under valgrind."
2012-10-09 18:14:37 -07:00
Elliott Hughes
5a16e92eb5
am c7f654df
: am b83cad79
: Merge "Fix two comment typos."
...
* commit 'c7f654dffea47a80ba566cd05f9212c8c7359a67':
Fix two comment typos.
2012-10-09 17:39:51 -07:00
Elliott Hughes
c7f654dffe
am b83cad79
: Merge "Fix two comment typos."
...
* commit 'b83cad79838f780779bd129da9ed4662b741bd31':
Fix two comment typos.
2012-10-09 17:38:01 -07:00
Elliott Hughes
e5d5f7f0d8
Fix two comment typos.
...
Change-Id: Icb2d6f7fa97ef5a4409a7606875e416cfab0a4b3
2012-10-09 17:23:09 -07:00
Elliott Hughes
156da96621
Fix a getcwd(3) bug and make our tests run correctly under valgrind.
...
The getcwd(3) bug was found by valgrind.
Bug: 7291287
Change-Id: I59f3bff1c1392a408b905934eebcd5d894d37492
2012-10-09 17:17:24 -07:00
Naseer Ahmed
2d5d80985e
am 9c389255
: am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '9c3892558f68ec8791283844e2d7d7326bcd3574':
bionic: update processed msm_mdp.h
2012-10-03 01:05:02 -07:00
Naseer Ahmed
9c3892558f
am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '6b1ba1184a5e0884686b63da837a85f8c861d1fc':
bionic: update processed msm_mdp.h
2012-10-03 01:03:04 -07:00
Naseer Ahmed
6b1ba1184a
am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30
bionic: update processed msm_mdp.h
...
-- Has display commit ioctl
Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 23:37:34 -07:00
Andreas Huber
ae554abd41
am 3a0aa5e0
: am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '3a0aa5e0a01c26278438513a73bc0150d5fc215c':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:44:32 -07:00
Andreas Huber
3a0aa5e0a0
am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit 'cafbc9404310828ecddc55a1eed5fc897008b1f3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:42:35 -07:00
Andreas Huber
cafbc94043
am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1
bionic: update processed msm_vidc_enc.h
...
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 14:34:03 -07:00
Elliott Hughes
f0a9cd7847
am 92e6de6f
: am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit '92e6de6f940fee6362dd306ad77c6d7bfa56e4cb':
Fix MIPS build.
2012-10-02 11:34:14 -07:00
Elliott Hughes
92e6de6f94
am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
Fix MIPS build.
2012-10-02 11:33:03 -07:00
Elliott Hughes
857fed50cb
Fix MIPS build.
...
ARM and x86 have custom memcpy implementations, but MIPS relies on the generic
one, which I recently moved.
Change-Id: I9e49243f63b27a4123f2c6623d6286ec82d333c7
2012-10-02 11:20:07 -07:00
Elliott Hughes
6cdf8dd025
am 80a29832
: am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '80a298327299aa28b564941f90818911023ae544':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:28:31 -07:00
Elliott Hughes
80a2983272
am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '90172541866696a5a46fae7ff7e186126ee37318':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:25:12 -07:00
Elliott Hughes
b98204a9fb
Merge "Move non-upstream code into the libc/bionic directory."
2012-10-02 09:13:34 -07:00
Elliott Hughes
95114ff5c5
am 15edd80a
: am 39d7c607
: am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '15edd80a696c1b5243874f7db9ef2d753016ade8':
Always take GCC's definition of NULL.
2012-10-01 18:23:31 -07:00
Elliott Hughes
15edd80a69
am 39d7c607
: am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '39d7c6072dc4d587c32405f3c7de12e60559cfc8':
Always take GCC's definition of NULL.
2012-10-01 18:21:35 -07:00
Elliott Hughes
7d56ccbfaa
Always take GCC's definition of NULL.
...
There's a (bad) definition of NULL in <linux/stddef.h>, and this
definition of NULL, and the One True definition in the <stddef.h> provided
by the compiler. This change at least kills one of the bad duplicates.
Killing the <linux/stddef.h> one is harder, because it's in a generated
file.
Change-Id: Iea4ccb12d6758199f312ea9cd753b84322d5c471
2012-10-01 17:56:58 -07:00
Elliott Hughes
a89864a20b
Move non-upstream code into the libc/bionic directory.
...
I'll need at least one more pass, because there's some upstream code
lurking in libc/bionic, but this is still a step in the right direction.
Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-01 17:35:49 -07:00
Elliott Hughes
be02504f5f
am baa7ee03
: am bb7dfcd3
: am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'baa7ee0370fcb88625a666141431a4187c0f91b2':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:54:48 -07:00
Elliott Hughes
baa7ee0370
am bb7dfcd3
: am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'bb7dfcd3b8744fdf37857375ffe279d2b87a8b22':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:52:56 -07:00
Elliott Hughes
0cc0d250fd
Remove useless #defines and incorrect claims from header files.
...
The various __need_* macros were write-only.
Change-Id: Id3cca34188e0801fdf93a038b22f2817226ad9c2
2012-10-01 15:12:40 -07:00
Elliott Hughes
b5d5173139
am a54d08a7
: am a428bc12
: am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'a54d08a7c15e15f24d94ca6fb97329134d4441a2':
Upgrade seed48 too.
2012-10-01 14:48:57 -07:00
Elliott Hughes
a54d08a7c1
am a428bc12
: am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'a428bc1288e28a05b036597db4f0409fa7f3923d':
Upgrade seed48 too.
2012-10-01 14:47:52 -07:00
Elliott Hughes
b28c547aa4
am 6ed5bc12
: am b650111a
: am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit '6ed5bc12dac544004f8e79b6393b2a8e260a7cc1':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:16:53 -07:00
Elliott Hughes
6ed5bc12da
am b650111a
: am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit 'b650111a11b84d7c91145c4f29b58b5742afa572':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:15:36 -07:00
Elliott Hughes
31a1060a5a
Upgrade seed48 too.
...
Missed this in 774c7f54ff
.
Change-Id: Ic24fd67f003d0e2d192cfb08f96f63024ca817eb
2012-10-01 14:14:21 -07:00
Elliott Hughes
774c7f54ff
Upgrade to the current NetBSD rand implementation.
...
Also add basic unit tests.
Change-Id: I7fc7ef61d47c1e8fdf8b8eff67a635220c3afd56
2012-10-01 13:53:41 -07:00
Saurabh Shah
04373fe6fe
am c556da9e
: am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit 'c556da9ed7b0142523d349e7af8ba6492b98a683':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:52:50 -07:00
Saurabh Shah
c556da9ed7
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:00:03 -07:00
Saurabh Shah
52b4ccbc49
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 14:59:36 -07:00
Saurabh Shah
204b26b440
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
This change adds msm_mdp.h header changes to bionic.
This IOCTL is a substitute for PAN on external panel. It waits for DMAE to
finish before returning and avoid delays in the PAN path.
Bug: 7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org>
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-28 13:46:13 -07:00
Elliott Hughes
326e4037e9
am 8e1a87b5
: am bb892a1b
: am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit '8e1a87b5470d0708b0503c3a33580e1782e2bda2':
Define ssize_t if necessary.
2012-09-28 10:31:09 -07:00
Elliott Hughes
8e1a87b547
am bb892a1b
: am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit 'bb892a1b63a2e88c98a2ba31aa659b7efac44e4f':
Define ssize_t if necessary.
2012-09-28 10:28:30 -07:00
Elliott Hughes
422b6ef92c
Define ssize_t if necessary.
...
Change-Id: I63801cc1f09be5e4ca20a6da7ec3366ba6441afd
2012-09-28 10:15:52 -07:00
Elliott Hughes
2e223d208f
am fb1e192e
: am 72b08af3
: am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit 'fb1e192e12fb4047bf5f01ccf0fd4e5644743adb':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:57:11 -07:00
Elliott Hughes
fb1e192e12
am 72b08af3
: am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit '72b08af300703a08bf2081304ab81b9e4dba003c':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:55:02 -07:00
Irina Tirdea
eac9eb462e
Add getdelim(3) and getline(3) to bionic
...
Some userspace programs (e.g. perf) need getline.
Changes:
() add getdelim.c, getline.c from NetBSD (http://netbsd.org/ ) under the
NetBSD Foundation's (TNF) license ("2 clause" Berkeley-style license).
() add stub for reentrant.h header that is needed by getdelim.c
() add tests for getdelim(3) and getline(3).
() update NOTICE file.
Change-Id: I22ed82dd5904b9d7a3695535c04f502be3c27c5d
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-27 11:38:57 -07:00
Elliott Hughes
4137d67cde
am 209d67d4
: am fd6ca57f
: am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit '209d67d448a64d147521b3d2efb3efa392dd3ccd':
Fix several compiler warnings.
2012-09-26 16:09:26 -07:00
Elliott Hughes
209d67d448
am fd6ca57f
: am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit 'fd6ca57f24cbfd8a8074ee6f1c22dd973f1b172f':
Fix several compiler warnings.
2012-09-26 16:07:02 -07:00
Elliott Hughes
e4030e0bfc
Merge "Fix several compiler warnings."
2012-09-26 15:51:01 -07:00
Elliott Hughes
6a3d9af46e
am bdc51470
: am 2c29bcf7
: am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit 'bdc514700d9f766f5a44a95bb80dab15846bd1c4':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:20:38 -07:00
Elliott Hughes
bdc514700d
am 2c29bcf7
: am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit '2c29bcf77f0d7dd7fce284ac0c17ff12663413d0':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:19:22 -07:00
Elliott Hughes
827a2604ee
Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
2012-09-26 14:58:11 -07:00
Elliott Hughes
ac184b2142
Fix several compiler warnings.
...
Change-Id: I55caa50a5937442734f4fcbdb4edf1c70f335bf8
2012-09-26 14:20:22 -07:00
Elliott Hughes
0a2d31838f
am 66569e3d
: am a48d5e5f
: am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit '66569e3d53643fe4682091c4e11c25449e9b7fdc':
Fix tmpfile(3).
2012-09-26 12:21:02 -07:00
Elliott Hughes
66569e3d53
am a48d5e5f
: am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit 'a48d5e5f127df0f76b49e046be042f46f211e8bc':
Fix tmpfile(3).
2012-09-26 12:19:33 -07:00
Elliott Hughes
855dde4426
Merge "Fix tmpfile(3)."
2012-09-26 12:04:59 -07:00
Elliott Hughes
91875dcd6e
Fix tmpfile(3).
...
This could be better, but at least now it works.
Change-Id: I88b7cf3f7ce8e5fa0b3fe678b7d1679a68ffffc9
2012-09-26 12:02:17 -07:00
Nick Kralevich
0147bd2f78
am 06abf4ed
: am 5989ed5c
: am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '06abf4edbf4b6d10ee82369ed48b8145a94ba1aa':
FORTIFY_SOURCE: add umask check
2012-09-26 11:15:38 -07:00
Nick Kralevich
06abf4edbf
am 5989ed5c
: am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '5989ed5cb8a1d11c140aa61a718e386c2cc88307':
FORTIFY_SOURCE: add umask check
2012-09-26 11:14:12 -07:00
Nick Kralevich
cd587701c8
FORTIFY_SOURCE: add umask check
...
Verify that the call to umask makes sense. While this wouldn't
have detected bug 7094213 (because the low order bits were all zero),
it might detect other similar bugs.
References: https://code.google.com/p/android-source-browsing/source/detail?r=acba45cc4b1f98f67fcdeda2f7c13ed57659b92a&repo=platform--libcore
Change-Id: I966a531d6b3cf8e1c5eacd69bd3cbec475b5fa58
2012-09-26 10:19:31 -07:00
Raghu Gandham
0e77287209
Replace __unused in kernel headers with __linux_unused to avoid
...
conflicts with __unused macro in sys/cdefs.h
Change-Id: Ice664397e0b7c7a90795012f30be5e43a9675525
2012-09-25 17:54:43 -07:00
Elliott Hughes
a638642f44
am 354867d7
: am 0eb4f255
: am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '354867d7020d4c7fb001c659245b60bff82a1a32':
Add the cleaned kernel headers
2012-09-24 13:52:05 -07:00
Elliott Hughes
354867d702
am 0eb4f255
: am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '0eb4f255d2dc1778b9a5fabb0f65c81ac4dad4a4':
Add the cleaned kernel headers
2012-09-24 13:50:04 -07:00
Elliott Hughes
51d1a14c80
am a06e11cc
: am c746bed8
: am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit 'a06e11cc34612ef814a0f73bccdd43059111a735':
[MIPS] Removed the unused header
2012-09-24 13:43:59 -07:00
Elliott Hughes
a06e11cc34
am c746bed8
: am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit 'c746bed88931fab8abcc4d01a5c53b95fff1ba8f':
[MIPS] Removed the unused header
2012-09-24 13:40:53 -07:00
Raghu Gandham
bfeb8a98b6
Add the cleaned kernel headers
...
Change-Id: Ied4e3ca765672ebaebe9d4d0909b3278c2ff3cd8
2012-09-24 12:33:57 -07:00
Raghu Gandham
d769826b0d
[MIPS] Removed the unused header
...
Change-Id: I8756a862669d4e5f283945496983f11a59dea30c
2012-09-24 11:52:00 -07:00
Elliott Hughes
f4b34b6c39
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
This reverts commit 3a936a4980
.
We don't want this in jb-mr1.
2012-09-24 10:13:12 -07:00
Elliott Hughes
c08088376a
am 82ec6850
: am 6c0e373d
: am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '82ec685054bd14e596fcb0661c7f5c398743b4b3':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:48:35 -07:00
Elliott Hughes
9f3c0d32a4
am 6da07f02
: am ecf67e15
: am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '6da07f02bd064cfae852df2b8ac82203432aef35':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:48:34 -07:00
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