The Android Automerger
680e3f94a0
merge in master-release history after reset to master
2013-06-04 07:49:30 -07:00
Brian Carlstrom
20b0fec8ab
am 81bfade8
: am 06713930
: Merge "Small cleanup of soinfo_elf_lookup."
...
* commit '81bfade818f1b76cf822f0e7e0862fe61e7c580a':
Small cleanup of soinfo_elf_lookup.
2013-06-03 20:43:30 -07:00
Brian Carlstrom
81bfade818
am 06713930
: Merge "Small cleanup of soinfo_elf_lookup."
...
* commit '0671393072a78e75a726c58aa3ca718e55eeac3e':
Small cleanup of soinfo_elf_lookup.
2013-06-03 20:21:04 -07:00
Brian Carlstrom
0671393072
Merge "Small cleanup of soinfo_elf_lookup."
2013-06-04 03:18:23 +00:00
Christopher Ferris
6bec5b792a
Small cleanup of soinfo_elf_lookup.
...
- Remove unnecessary line.
- Move declarations to first use.
Change-Id: I1d8398d6c13f7cb86bffe0b68af849e35a4b234d
2013-06-03 20:15:14 -07:00
Rom Lemarchand
8ea08d3ff9
Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"
2013-06-03 19:40:21 +00:00
The Android Automerger
b472f50057
merge in master-release history after reset to master
2013-06-03 07:49:38 -07:00
Ben Cheng
7ca9057f53
am 72ce296f
: am 404d491e
: Merge "Use bl instead of blx to support interworking properly."
...
* commit '72ce296f282803cb026aff5ab180e8a43656612e':
Use bl instead of blx to support interworking properly.
2013-06-01 09:51:29 -07:00
Ben Cheng
72ce296f28
am 404d491e
: Merge "Use bl instead of blx to support interworking properly."
...
* commit '404d491eb655839bf4260cc168bb79864473e129':
Use bl instead of blx to support interworking properly.
2013-06-01 08:19:07 -07:00
Ben Cheng
404d491eb6
Merge "Use bl instead of blx to support interworking properly."
2013-05-31 21:40:37 +00:00
Ben Cheng
a123b5d319
Use bl instead of blx to support interworking properly.
...
(cherry picked from commit 9e1905794b
in
master)
Change-Id: I9b8c35ea9e201e00f84315f9f105013c23c94d85
2013-05-31 14:39:23 -07:00
Ben Cheng
dc1782b156
Merge "Use bl instead of blx to support interworking properly."
2013-05-31 21:36:55 +00:00
Ben Cheng
9e1905794b
Use bl instead of blx to support interworking properly.
...
BUG: 9227177
Change-Id: I742c2f2ecbe332f9c9743e3f4bde8de791a1d289
2013-05-31 14:25:48 -07:00
Nick Kralevich
75c9e17682
am 027a8fae
: am 8539961f
: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
...
* commit '027a8fae7750855af2ec0f8dd655e4a48ebf9352':
FORTIFY_SOURCE: strcat / strncat optimize
2013-05-31 11:21:18 -07:00
Nick Kralevich
027a8fae77
am 8539961f
: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
...
* commit '8539961ff299b05d8feac9be8b119698be22da03':
FORTIFY_SOURCE: strcat / strncat optimize
2013-05-31 11:14:56 -07:00
Nick Kralevich
8539961ff2
Merge "FORTIFY_SOURCE: strcat / strncat optimize"
2013-05-31 18:13:23 +00:00
Rom Lemarchand
c702a90467
mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
...
Reinstate mmap calling madvise(MADV_MERGEABLE) removed in
635df850e5
Change-Id: I290bc5ac6bb32735a3f61dd21e2fce1dfb6dfd4b
Signed-off-by: Rom Lemarchand <romlem@google.com>
2013-05-31 10:05:50 -07:00
Nick Kralevich
cf870199d5
FORTIFY_SOURCE: strcat / strncat optimize
...
__strcat_chk and __strncat_chk are slightly inefficient,
because they end up traversing over the same memory region
two times.
This change optimizes __strcat_chk / __strncat_chk so they
only access the memory once. Although I haven't benchmarked these
changes, it should improve the performance of these functions.
__strlen_chk - expose this function, even if -D_FORTIFY_SOURCE
isn't defined. This is needed to compile libc itself without
-D_FORTIFY_SOURCE.
Change-Id: Id2c70dff55a276b47c59db27a03734d659f84b74
2013-05-31 09:07:46 -07:00
Nick Kralevich
b5aa654be6
am d9349abf
: am 72f59c84
: Merge "Add strncpy FORTIFY_SOURCE tests."
...
* commit 'd9349abf29506529790abf83cd239b77fa771038':
Add strncpy FORTIFY_SOURCE tests.
2013-05-30 17:02:01 -07:00
Nick Kralevich
9b7ae336ee
am 5630e54c
: am d515f468
: Merge "libc x86: Remove strcat.S"
...
* commit '5630e54c3b1a90ee741bbcff129d0c711160ba02':
libc x86: Remove strcat.S
2013-05-30 17:02:01 -07:00
Nick Kralevich
d9349abf29
am 72f59c84
: Merge "Add strncpy FORTIFY_SOURCE tests."
...
* commit '72f59c84fd73a0a701ce6448d103e9021c1cb060':
Add strncpy FORTIFY_SOURCE tests.
2013-05-30 16:54:24 -07:00
Nick Kralevich
5630e54c3b
am d515f468
: Merge "libc x86: Remove strcat.S"
...
* commit 'd515f46888cf381c1fbbc99a62be727174b30a23':
libc x86: Remove strcat.S
2013-05-30 16:54:18 -07:00
Nick Kralevich
72f59c84fd
Merge "Add strncpy FORTIFY_SOURCE tests."
2013-05-30 20:33:02 +00:00
Nick Kralevich
8cc145edf4
Add strncpy FORTIFY_SOURCE tests.
...
Change-Id: Id108b1d72b44d7e5fb911268e80bbdf896808f60
2013-05-30 13:21:14 -07:00
Nick Kralevich
d515f46888
Merge "libc x86: Remove strcat.S"
2013-05-30 19:59:38 +00:00
Nick Kralevich
4fe461b3a6
libc x86: Remove strcat.S
...
This file is never used.
Change-Id: Iae4bba4a5a12a86a775af05e7477fb7b6511480b
2013-05-30 11:15:40 -07:00
The Android Automerger
fe09748a5f
merge in master-release history after reset to master
2013-05-27 07:50:00 -07:00
Nick Kralevich
3010061a53
am cf342653
: am 8d79fd1c
: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
...
* commit 'cf342653388682c96b3c4eec6a5ed4dbcb6112ef':
libc x86: Remove index.S, strcpy.S, strchr.S
2013-05-24 13:02:11 -07:00
Nick Kralevich
af5d6029e5
am 080d2aa8
: am 2317275f
: Merge "libc: delete x86 memchr.S"
...
* commit '080d2aa8dc0ae318a12f7a424f9bca32b1216791':
libc: delete x86 memchr.S
2013-05-24 13:02:06 -07:00
Nick Kralevich
cf34265338
am 8d79fd1c
: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
...
* commit '8d79fd1c94cb021b6852e6f44e27183ec83fe04c':
libc x86: Remove index.S, strcpy.S, strchr.S
2013-05-24 11:37:30 -07:00
Nick Kralevich
8d79fd1c94
Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
2013-05-24 18:34:57 +00:00
Nick Kralevich
e4c4ada580
libc x86: Remove index.S, strcpy.S, strchr.S
...
These files are never used.
Change-Id: Iab8474bdff3bd4d225597c62b3c0f0849f808818
2013-05-24 10:50:05 -07:00
Nick Kralevich
080d2aa8dc
am 2317275f
: Merge "libc: delete x86 memchr.S"
...
* commit '2317275f859a685386889139855f2f3314337d53':
libc: delete x86 memchr.S
2013-05-24 10:43:58 -07:00
Nick Kralevich
2317275f85
Merge "libc: delete x86 memchr.S"
2013-05-24 17:27:47 +00:00
Nick Kralevich
615684c256
libc: delete x86 memchr.S
...
This file is never used.
Change-Id: Ief08ad176713b5194048852609613801969e1364
2013-05-24 08:52:04 -07:00
The Android Automerger
88cc328c17
merge in master-release history after reset to master
2013-05-22 07:49:33 -07:00
Brian Carlstrom
47b2e046cd
am 46bf467a
: am f5f29de6
: Merge "Fix bionic linker to support segments with zero p_filesz"
...
* commit '46bf467a151eafaf37f6e3578d8d9bad705b8e44':
Fix bionic linker to support segments with zero p_filesz
2013-05-21 17:28:40 -07:00
Brian Carlstrom
46bf467a15
am f5f29de6
: Merge "Fix bionic linker to support segments with zero p_filesz"
...
* commit 'f5f29de6ae5a0b74234f111b5691a1e5588671cb':
Fix bionic linker to support segments with zero p_filesz
2013-05-21 17:23:09 -07:00
Brian Carlstrom
f5f29de6ae
Merge "Fix bionic linker to support segments with zero p_filesz"
2013-05-21 23:59:52 +00:00
Brian Carlstrom
82dcc7910d
Fix bionic linker to support segments with zero p_filesz
...
(cherry picked from commit 96362fb9d11beef6233aa03db396f25688e70860)
Change-Id: Ib075a6dfc45d5d0746d8b278f317dd9b8d772f2a
2013-05-21 16:57:55 -07:00
The Android Automerger
33cf35317b
merge in master-release history after reset to master
2013-05-20 07:49:40 -07:00
Erik Gilling
d5234a3b08
am 4c8eba6f
: am 2e317075
: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '4c8eba6f2aaf351e29881ca4dc2ec47fc0246446':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:20:53 -07:00
Erik Gilling
4c8eba6f2a
am 2e317075
: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '2e317075b044e94fc75e36d08bec8a7eb5fc31ae':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:19:07 -07:00
Erik Gilling
2e317075b0
Merge "libc/arm: add cortex-a8 cpu variant"
2013-05-16 19:57:28 +00:00
The Android Open Source Project
0ae3304f83
am 5b75f3bf
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5b75f3bfa1a8f380ce213a0088afec7a7901a25b':
2013-05-16 05:44:28 -07:00
The Android Open Source Project
5b75f3bfa1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc
2013-05-16 05:42:53 -07:00
Rom Lemarchand
22bda4bd67
libc/arm: add cortex-a8 cpu variant
...
Change-Id: I30e8dd6d4b2e7889aea8f5ed21182a5941bfb489
2013-05-15 20:13:28 -07:00
The Android Automerger
231ea5a414
merge in master-release history after reset to master
2013-05-15 07:49:27 -07:00
Elliott Hughes
217c816480
am 0a7fe991
: am 5217fb52
: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
...
* commit '0a7fe991530308fbae9ca033c0045bfc27a7f4c1':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
2013-05-14 18:11:57 -07:00
Elliott Hughes
0a7fe99153
am 5217fb52
: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
...
* commit '5217fb528ca40ece0dbb459dedf7d6fae81dde68':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
2013-05-14 18:10:45 -07:00