Shih-wei Liao
184216696a
am 1ee6e3b7
: Merge "Install crt(begin|end)_so.o to target library path."
...
* commit '1ee6e3b7370b36ac72a14c0e31c34963b1bdbbb2':
Install crt(begin|end)_so.o to target library path.
2012-07-30 13:10:11 -07:00
Shih-wei Liao
1ee6e3b737
Merge "Install crt(begin|end)_so.o to target library path."
2012-07-30 12:44:58 -07:00
Shih-wei Liao
fc0725ec5c
Install crt(begin|end)_so.o to target library path.
...
BUG=6886348.
Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 00:33:28 -07:00
Elliott Hughes
7a450b4d9e
am 643e5722
: Merge "Report errors to the log, not just stderr."
...
* commit '643e5722338d303c0b5aac41107432d8fde4081c':
Report errors to the log, not just stderr.
2012-07-27 18:28:11 -07:00
Elliott Hughes
643e572233
Merge "Report errors to the log, not just stderr."
2012-07-27 18:16:17 -07:00
Elliott Hughes
52d6233296
Report errors to the log, not just stderr.
...
In particular this affects assert(3) and __cxa_pure_virtual, both of
which have managed to confuse people this week by apparently aborting
without reason. (Because stderr goes nowhere, normally.)
Bug: 6852995
Bug: 6840813
Change-Id: I7f5d17d5ddda439e217b7932096702dc013b9142
2012-07-27 17:43:38 -07:00
Elliott Hughes
616f368076
am a7916509
: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
...
* commit 'a7916509a3446afd0e863b03e4204cee73e81555':
Fix a TEMP_FAILURE_RETRY usage error in the linker.
2012-07-27 15:58:57 -07:00
Elliott Hughes
514ace9534
am 9061c6e7
: Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
...
* commit '9061c6e7ae1d9b0e4d2f8a62b3682a565282f9b9':
Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-07-27 15:47:37 -07:00
Elliott Hughes
a7916509a3
Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."
2012-07-27 15:43:11 -07:00
Elliott Hughes
8dfc073b14
Fix a TEMP_FAILURE_RETRY usage error in the linker.
...
Similar to the fix in c20d0f3993
.
grep(1) says this was the only other instance in bionic.
Change-Id: I1729038762ee1c7c4743a6bd11d5558afd6f5749
2012-07-27 15:30:51 -07:00
The Android Open Source Project
e35ae86e70
Reconcile with jb-release
...
Change-Id: I89a2498aeb91f29a70f1e100c41f03cf41a2e49e
2012-07-27 14:49:51 -07:00
Elliott Hughes
9061c6e7ae
Merge "Replace ALL_PREBUILTS with BUILD_PREBUILT"
2012-07-27 14:14:41 -07:00
Ying Wang
6171d11e72
Replace ALL_PREBUILTS with BUILD_PREBUILT
...
(cherry-picked from 186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug: 6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
2012-07-27 13:44:01 -07:00
Elliott Hughes
45038ae483
am 12f411d9
: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
...
* commit '12f411d9a696ca7a0fe490fb530a9accbda66a99':
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
2012-07-27 10:14:50 -07:00
Elliott Hughes
12f411d9a6
Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"
2012-07-27 10:02:59 -07:00
Jens Gulin
c20d0f3993
Correction to use of TEMP_FAILURE_RETRY in send_prop_msg
...
RETRY macro may retry command if result is -1. In this
case the command was "connect < 0" instead of just
connect. The comparison will not return -1 and thus
retry is never done. This is now corrected so that
interrupts will cause retry instead of fail.
(There was no other negative side effect of the bug.
The result code from RETRY was used in an if-statement
and it would be true for all negative connect results.
This was according to expectations.)
Change-Id: Ie206b39878e9befea4e3be9a4061ee39eb232d80
2012-07-27 15:18:23 +02:00
Peter Enderborg
3460db9490
bionic: Stack pointer/signal race condition.
...
Move the stackpointer so a captured signal does not corrupt
stack variables needed for __thread_entry.
Change-Id: I3e1e7b94a6d7cd3a07081f849043262743aa8064
2012-07-27 15:11:01 +02:00
Elliott Hughes
9a9ca7c1e8
am 7d6c3f70
: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."
...
* commit '7d6c3f700b8089d31a33ba0f9f6eed9407724d0d':
Remove the 'Factory' time zone by not processing the 'factory' file.
2012-07-26 17:44:38 -07:00
Elliott Hughes
7d6c3f700b
Merge "Remove the 'Factory' time zone by not processing the 'factory' file."
2012-07-26 17:36:21 -07:00
Elliott Hughes
541c225320
Remove the 'Factory' time zone by not processing the 'factory' file.
...
The factory file (and Factory time zone) was meant as a way to say
"not configured" that would give a clear error when running date(1).
For us it would just look like UTC, so it is of no value.
Bug: 2997381
Change-Id: I1a4b85dce97d1d9370b22ba79e8fe5dafff56541
2012-07-26 16:19:46 -07:00
Nick Kralevich
b4fc64c96c
am cc5edd83
: Merge "vfprintf: fix spelling."
...
* commit 'cc5edd83ec0303ceb682c563073d98f8a592737d':
vfprintf: fix spelling.
2012-07-25 22:22:20 -07:00
Nick Kralevich
cc5edd83ec
Merge "vfprintf: fix spelling."
2012-07-25 16:09:34 -07:00
Nick Kralevich
9145ad3f0a
vfprintf: fix spelling.
...
Change-Id: I6dc611143fb1f3e9ccf0a77b40ee48a3c1d72ca9
2012-07-25 16:01:38 -07:00
The Android Automerger
a501f6c7e3
merge in jb-release history after reset to jb-dev
2012-07-24 20:23:07 -07:00
Elliott Hughes
9dbd4c06fe
am c27103d8
: Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
...
* commit 'c27103d84c124d40f3f4cff46d7cfa74342e0585':
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
2012-07-24 18:03:22 -07:00
Elliott Hughes
860dc7e25d
am c98e2365
: Merge "Fix implementation of generic atomic operations"
...
* commit 'c98e2365cdd0c2330711118b689171df143f6399':
Fix implementation of generic atomic operations
2012-07-24 18:03:12 -07:00
Elliott Hughes
c27103d84c
Merge "[MIPS] Use an aligned address to provoke SIGSEGV in abort()"
2012-07-24 17:42:51 -07:00
Chris Dearman
00a66a6fe8
[MIPS] Use an aligned address to provoke SIGSEGV in abort()
...
Change-Id: I269c9ccc07058773fb0f9d70673673157ab38f6a
2012-07-24 17:42:06 -07:00
Elliott Hughes
c98e2365cd
Merge "Fix implementation of generic atomic operations"
2012-07-24 17:21:47 -07:00
Chris Dearman
958dad705a
Fix implementation of generic atomic operations
...
Change-Id: Ie1ea5aacc561e2d6d40125d2952ed0e9116b7b0d
2012-07-24 13:56:38 -07:00
Elliott Hughes
d33ce20e6d
am 344aca8c
: Merge "[MIPS] Add atomic routines"
...
* commit '344aca8ced2522074f799439e201226377d02dba':
[MIPS] Add atomic routines
2012-07-24 13:51:10 -07:00
Elliott Hughes
344aca8ced
Merge "[MIPS] Add atomic routines"
2012-07-24 13:41:06 -07:00
Raghu Gandham
f7fb9e1ef1
[MIPS] Add atomic routines
...
Change-Id: I2cb20ce44dd230d222b7fc1ede2e1e3dce6e692b
2012-07-24 10:30:22 -07:00
Elliott Hughes
5e2a2705f2
am b109e437
: Merge "Upgrade to tzdata2012d."
...
* commit 'b109e437fcbc1cbe09fce8ce2abb6f951d5a0274':
Upgrade to tzdata2012d.
2012-07-21 14:20:17 -07:00
Elliott Hughes
b109e437fc
Merge "Upgrade to tzdata2012d."
2012-07-21 14:09:24 -07:00
Elliott Hughes
5d967e43d0
Upgrade to tzdata2012d.
...
This upgrade involved rewriting the script; the data has moved to ftp.iana.org,
where it's slightly less convenient to access, so it's time to use something
that can talk FTP...
As for tzdata2012d, it's just updating Morocco for this weekend's changes, now
they've been decided at the last minute (as usual).
Change-Id: I772df57a6e09b3bf3d9541bfc08930d6f18633b4
2012-07-20 16:53:32 -07:00
Elliott Hughes
a94c708a15
am 654b1501
: Merge "Update time.h for CLOCK_BOOTTIME."
...
* commit '654b1501f7a936034d07f579c3d4a15d1319dac2':
Update time.h for CLOCK_BOOTTIME.
2012-07-19 17:37:33 -07:00
Elliott Hughes
654b1501f7
Merge "Update time.h for CLOCK_BOOTTIME."
2012-07-19 17:18:37 -07:00
Nick Pelly
0351955a68
Update time.h for CLOCK_BOOTTIME.
...
(cherry-pick of 8958a38329
)
Change-Id: Ie8de6b32fa81566db53ad7e9fd4b197f4cede628
2012-07-19 17:10:14 -07:00
The Android Open Source Project
6591be6c52
Reconcile with jb-mr0-release
...
Change-Id: I5e181b92fbcc4b3d312396124a149f1c5224e55b
2012-07-19 08:35:39 -07:00
The Android Automerger
59fae8abaf
merge in jb-release history after reset to jb-dev
2012-07-18 23:04:34 -07:00
Nick Kralevich
f6ee33cee7
Merge "linker: Fix LD_PRELOADS for calling constructors"
2012-07-18 14:02:22 -07:00
Elliott Hughes
3fd5e91e58
Merge "bionic: Report linker relocation address to gdb"
2012-07-16 11:38:23 -07:00
Elliott Hughes
05f03b8875
Merge "linker: cleanup of undefined state handling, which is really dead code"
2012-07-16 10:08:17 -07:00
Robin Burchell
8211bc6325
linker: cleanup of undefined state handling, which is really dead code
...
Given that _elf_lookup (and thus, _do_lookup) cannot possibly return an
undefined symbol (due to the check for SHN_UNDEF in _elf_lookup), there's
no need for spurious checks for SHN_UNDEF on its return value.
Conflicts:
linker/linker.c
Change-Id: Ic73cf439924b45f72d4d9ba3f64a888c96cbbd9b
2012-07-16 10:03:35 -07:00
Elliott Hughes
decb531ce2
Merge "linker: Use SHN_UNDEF instead of describing what it is trying to do."
2012-07-16 10:00:38 -07:00
Robin Burchell
439fa8ea8c
linker: Use SHN_UNDEF instead of describing what it is trying to do.
2012-07-16 09:51:17 -07:00
Elliott Hughes
8d7355ac2f
Merge "Use std=gnu99 for the dynamic linker as well as libc."
2012-07-16 09:45:27 -07:00
Elliott Hughes
856512ea9c
Use std=gnu99 for the dynamic linker as well as libc.
...
Change-Id: I76dd78576c5af6eb6282555f069647b6260edc31
2012-07-16 09:43:14 -07:00
Elliott Hughes
fabddfe833
Merge "limits.h: Include page.h when relying on PAGE_SIZE"
2012-07-16 09:39:24 -07:00