Elliott Hughes
3323628d63
Merge "The SYS_ constants should cover all __NR_ values."
2013-03-22 05:39:06 +00:00
Elliott Hughes
5c2772f59d
The SYS_ constants should cover all __NR_ values.
...
<sys/linux-syscalls.h> only contains constants for the syscalls
we're generating stubs for. We want all the syscalls available
on the architecture in question.
Keep using <sys/linux-syscalls.h> on ARM for now because the
__NR_ARM_set_tls and __NR_ARM_cacheflush values aren't in <asm/unistd.h>.
Change-Id: I66683950d87d9b18d6107d0acc0ed238a4496f44
2013-03-21 22:26:20 -07:00
Elliott Hughes
731381ad5f
am dfde829f
: am c8ded7c6
: am a3167257
: am babb72dc
: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'dfde829fc1c97fe3fbdaf244d2444562b7c2fbfe':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-22 05:25:17 +00:00
Elliott Hughes
dfde829fc1
am c8ded7c6
: am a3167257
: am babb72dc
: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'c8ded7c6b1b95ca530383b9698719892d13a4f9e':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-22 05:24:12 +00:00
Elliott Hughes
c8ded7c6b1
am a3167257
: am babb72dc
: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'a316725740ac123de65e225f5bfbf99450f66e6b':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-21 22:22:49 -07:00
Elliott Hughes
a316725740
am babb72dc
: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."
...
* commit 'babb72dc292a567674f6d7d2ccf7f63edaf77b80':
Fix pthread_setname_np's behavior on invalid pthread_ts.
2013-03-21 22:20:53 -07:00
Elliott Hughes
babb72dc29
Merge "Fix pthread_setname_np's behavior on invalid pthread_ts."
2013-03-22 05:11:35 +00:00
Elliott Hughes
bd43b613b8
am 3a6178f8
: am 1e40ace4
: am a596aa6a
: am 26c815c4
: Merge "Drop magic number in strrchr and strchr"
...
* commit '3a6178f8b9498ece5383fac9feb692e8ed2d4ce0':
Drop magic number in strrchr and strchr
2013-03-22 03:03:15 +00:00
Elliott Hughes
06a06d5091
am 71afd315
: am 17a0d191
: am 01c0e19e
: am 612333f6
: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '71afd3153544a2795fcb74c86fd895df59aa5feb':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-22 03:03:15 +00:00
Elliott Hughes
a41ba2f0bf
Fix pthread_setname_np's behavior on invalid pthread_ts.
...
Change-Id: I0a154beaab4d164ac812f2564d12e4d79b80a8e8
2013-03-21 20:02:35 -07:00
Elliott Hughes
3a6178f8b9
am 1e40ace4
: am a596aa6a
: am 26c815c4
: Merge "Drop magic number in strrchr and strchr"
...
* commit '1e40ace49e25ee4c469ed4613fe09656d3c0a5d7':
Drop magic number in strrchr and strchr
2013-03-22 03:00:36 +00:00
Elliott Hughes
71afd31535
am 17a0d191
: am 01c0e19e
: am 612333f6
: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '17a0d1915f871ad67608a582a4fb3352000cf719':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-22 03:00:35 +00:00
Elliott Hughes
1e40ace49e
am a596aa6a
: am 26c815c4
: Merge "Drop magic number in strrchr and strchr"
...
* commit 'a596aa6abfdd8ecdb4bcdd9bcad24a19adcf7525':
Drop magic number in strrchr and strchr
2013-03-21 19:58:23 -07:00
Elliott Hughes
17a0d1915f
am 01c0e19e
: am 612333f6
: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '01c0e19e426df5620c5ca822ab546907dbf1fa7d':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-21 19:58:22 -07:00
Elliott Hughes
a596aa6abf
am 26c815c4
: Merge "Drop magic number in strrchr and strchr"
...
* commit '26c815c489197259e3692d4a1e35463989f7c7a3':
Drop magic number in strrchr and strchr
2013-03-21 19:56:39 -07:00
Elliott Hughes
01c0e19e42
am 612333f6
: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."
...
* commit '612333f671a59d98fad6f594f5bf657dbd6c9c4d':
Don't #define SYS_ constants unless they make sense for the current architecture.
2013-03-21 19:56:38 -07:00
Elliott Hughes
26c815c489
Merge "Drop magic number in strrchr and strchr"
2013-03-22 02:48:32 +00:00
Elliott Hughes
612333f671
Merge "Don't #define SYS_ constants unless they make sense for the current architecture."
2013-03-22 02:46:22 +00:00
Elliott Hughes
9724ce3a09
Don't #define SYS_ constants unless they make sense for the current architecture.
...
Fixes the MIPS and x86 builds. strace tests whether syscalls
are supported using #ifdef of the appropriate SYS_ constant.
Change-Id: I90be118dc42abfdaf5b0f9b1e676e8601f55106e
2013-03-21 19:44:36 -07:00
Elliott Hughes
2810ec5464
am 5bed5501
: am 3077d883
: am c48968d2
: am 4453c51c
: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '5bed5501d7048acc77f5365e87fd8487b21ef1f6':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-22 02:43:23 +00:00
Elliott Hughes
5bed5501d7
am 3077d883
: am c48968d2
: am 4453c51c
: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '3077d88347f4b120ee93e73efdbfb017e0e968ec':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-22 02:42:02 +00:00
Elliott Hughes
3077d88347
am c48968d2
: am 4453c51c
: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit 'c48968d268820ee64986f738e227910b29290eab':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-21 19:40:15 -07:00
Elliott Hughes
c48968d268
am 4453c51c
: Merge "Drop unnecessary execution permission for .cpp/.c/.h"
...
* commit '4453c51c8269457b337578f809670d0fdb755132':
Drop unnecessary execution permission for .cpp/.c/.h
2013-03-21 19:38:53 -07:00
Elliott Hughes
4453c51c82
Merge "Drop unnecessary execution permission for .cpp/.c/.h"
2013-03-22 02:30:28 +00:00
Kito Cheng
8f7120bbac
Drop unnecessary execution permission for .cpp/.c/.h
...
Change-Id: I9ac2b9d8f6bdb4fab8962210c5ec8f9c3e8c0ebf
2013-03-22 10:28:15 +08:00
Kito Cheng
a6cc67c9b5
Drop magic number in strrchr and strchr
...
Change-Id: Ic7391be8575eaaac76914dab62bc41c9773d703d
2013-03-22 10:18:09 +08:00
Elliott Hughes
b11037a42a
am 455637f2
: am 5c9a25cc
: am f977d2dc
: am 800ad824
: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '455637f25180709f7baf261715873f4a0109583c':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-22 01:55:26 +00:00
Elliott Hughes
455637f251
am 5c9a25cc
: am f977d2dc
: am 800ad824
: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '5c9a25cc2369846f7cf7f4fe1bdb32cf3dc8a469':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-22 01:54:20 +00:00
Elliott Hughes
5c9a25cc23
am f977d2dc
: am 800ad824
: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit 'f977d2dc1dce28a517329e8b4990ebee696faec1':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-21 18:51:51 -07:00
Elliott Hughes
f977d2dc1d
am 800ad824
: Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
...
* commit '800ad8249a398e94d039b6f6597e2a51558e41dd':
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
2013-03-21 18:49:24 -07:00
Elliott Hughes
800ad8249a
Merge "Provide glibc-compatible SYS_* aliases for the __NR_* constants."
2013-03-22 01:41:57 +00:00
Elliott Hughes
8ecf225827
Provide glibc-compatible SYS_* aliases for the __NR_* constants.
...
This helps us remove another external/strace bionic hack.
Change-Id: I3e82c0d2fd27e479be98f096e05b666fd16f8eb3
2013-03-21 18:06:55 -07:00
Elliott Hughes
a2e42c3798
am 6d460efe
: am c9edc079
: am 39e2a408
: am 6eb978c9
: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '6d460efed94e3d5825b5c842c112aa6b26357d93':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 23:25:38 +00:00
Elliott Hughes
6d460efed9
am c9edc079
: am 39e2a408
: am 6eb978c9
: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit 'c9edc0797779187ad1b429e956820928051047ae':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 23:23:46 +00:00
Elliott Hughes
c9edc07977
am 39e2a408
: am 6eb978c9
: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '39e2a408a64bd24fb0fe7f5eb444b55af1160480':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 16:19:29 -07:00
Elliott Hughes
39e2a408a6
am 6eb978c9
: Merge "Expose wait4 as wait4 rather than __wait4."
...
* commit '6eb978c9bf02d2bcdece2826577cc65900030690':
Expose wait4 as wait4 rather than __wait4.
2013-03-21 16:18:22 -07:00
Elliott Hughes
6eb978c9bf
Merge "Expose wait4 as wait4 rather than __wait4."
2013-03-21 23:14:48 +00:00
Elliott Hughes
17a8b0db63
Expose wait4 as wait4 rather than __wait4.
...
This helps strace(1) compile with one fewer hack.
Change-Id: I5296d0cfec5546709cda990abd705ad33d7c4626
2013-03-21 16:14:06 -07:00
Christopher Ferris
e269711a1b
am 774266bf
: am f46e1454
: am 9088af19
: am 86c31849
: Merge "Create arch specific versions of strcmp."
...
* commit '774266bfa281880e16c2447555177c037575cdaf':
Create arch specific versions of strcmp.
2013-03-20 22:40:13 +00:00
Christopher Ferris
774266bfa2
am f46e1454
: am 9088af19
: am 86c31849
: Merge "Create arch specific versions of strcmp."
...
* commit 'f46e14544b446e6dbc241aabb8090cd8e62c158d':
Create arch specific versions of strcmp.
2013-03-20 22:37:58 +00:00
Christopher Ferris
f46e14544b
am 9088af19
: am 86c31849
: Merge "Create arch specific versions of strcmp."
...
* commit '9088af19b45d1b7339b982c92ef9113337f5d2c6':
Create arch specific versions of strcmp.
2013-03-20 15:33:54 -07:00
Christopher Ferris
9088af19b4
am 86c31849
: Merge "Create arch specific versions of strcmp."
...
* commit '86c318497270c80a3791b4cd9835367653636377':
Create arch specific versions of strcmp.
2013-03-20 15:29:06 -07:00
Christopher Ferris
86c3184972
Merge "Create arch specific versions of strcmp."
2013-03-20 22:14:48 +00:00
Christopher Ferris
31dea25b8b
Create arch specific versions of strcmp.
...
This uses the new strcmp.a15.S code as the basis for new versions
of strcmp.S.
The cortex-a15 code is the performance optimized version of strcmp.a15.S
taken with only the addition of a few pld instructions.
The cortex-a9 code is the same as the cortex-a15 code except that the
unaligned strcmp code was taken from the original strcmp.S.
The krait code is the same as the cortex-a15 code except that one path
in the unaligned strcmp code was taken from the original strcmp.S code
(the 2 byte overlap case).
The generic code is the original unmodified strmp.S from the bionic
subdirectory.
All three new versions underwent these test cases:
Strings the same, all same size:
- Both pointers double word aligned.
- One pointer double word aligned, one pointer word aligned.
- Both pointers word aligned.
- One pointer double word aligned, one pointer 1 off a word alignment.
- One pointer double word aligned, one pointer 2 off a word alignment.
- One pointer double word aligned, one pointer 3 off a word alignment.
- One pointer word aligned, one pointer 1 off a word alignment.
- One pointer word aligned, one pointer 2 off a word alignment.
- One pointer word aligned, one pointer 3 off a word alignment.
For all cases where it made sense, the two pointers were also tested
swapped.
Different strings, all same size:
- Single difference at double word boundary.
- Single difference at word boudary.
- Single difference at 1 off a word alignment.
- Single difference at 2 off a word alignment.
- Single difference at 3 off a word alignment.
Different sized strings, strings the same until the end:
- Shorter string ends on a double word boundary.
- Shorter string ends on word boundary.
- Shorter string ends at 1 off a word boundary.
- Shorter string ends at 2 off a word boundary.
- Shorter string ends at 3 off a word boundary.
For all different cases, run them through the same pointer alignment
cases when the strings are the same size.
For all cases the two pointers were also tested swapped.
Bug: 8005082
Merge from internal master.
(cherry-picked from commit a9a5870d16
)
Change-Id: I4c2b98f8a50804fb98ab67f75e9d660f1315a144
2013-03-20 14:33:54 -07:00
The Android Open Source Project
fd56f2a3cc
am bad0c4d8
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'bad0c4d8bb85d91affb7274022f671b40b0a9305':
am 2e7b8d63
: am f861bc5c
: Merge "Don\'t search off the end of the index for bad Olson ids."
2013-03-20 16:42:00 +00:00
The Android Open Source Project
bad0c4d8bb
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I9358f7d5fb867340fa18195fbbd6394c4ad53fce
2013-03-20 09:32:10 -07:00
The Android Automerger
ed12f36a09
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-18 05:55:24 -07:00
Elliott Hughes
6380d21a05
am 92a197f3
: am d7dc414a
: am 987fc5a3
: am adeec096
: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit '92a197f3051c5befd5e40ec7f23c0643999da259':
Hide various symbols that shouldn't be exposed.
2013-03-16 00:11:52 +00:00
Elliott Hughes
92a197f305
am d7dc414a
: am 987fc5a3
: am adeec096
: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit 'd7dc414afd1847e76ae317880bcedc9678953f9e':
Hide various symbols that shouldn't be exposed.
2013-03-16 00:10:24 +00:00
Elliott Hughes
d7dc414afd
am 987fc5a3
: am adeec096
: Merge "Hide various symbols that shouldn\'t be exposed."
...
* commit '987fc5a3c4046831dc9e6c252e99a9c694bbd9ee':
Hide various symbols that shouldn't be exposed.
2013-03-15 17:09:17 -07:00