The Android Automerger
a500fdb18e
merge in master-release history after reset to master
2013-03-25 07:49:24 -07:00
Elliott Hughes
4584721b5a
am 9792b2d1
: am ba61bb55
: am a3fe475c
: am c019345a
: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit '9792b2d16062c3fa334a47501a1cde9bfbedb5c2':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 22:13:44 +00:00
Elliott Hughes
9792b2d160
am ba61bb55
: am a3fe475c
: am c019345a
: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'ba61bb55c4f3d468dd93bedc3deb24a0ef28a948':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 22:12:16 +00:00
Elliott Hughes
ba61bb55c4
am a3fe475c
: am c019345a
: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'a3fe475c9ff444f45eb3c4dd7fd462326dfdb13d':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 15:09:13 -07:00
Elliott Hughes
a3fe475c9f
am c019345a
: Merge "Use the correct names for the __ARM_NR_* syscalls."
...
* commit 'c019345a3a0f3ee8561e595917b75d6419ee4cc8':
Use the correct names for the __ARM_NR_* syscalls.
2013-03-22 15:07:06 -07:00
Elliott Hughes
c019345a3a
Merge "Use the correct names for the __ARM_NR_* syscalls."
2013-03-22 21:50:49 +00:00
Elliott Hughes
cda62094ef
Use the correct names for the __ARM_NR_* syscalls.
...
This lets us move all the ARM syscall stubs over to the kernel <asm/unistd.h>.
Our generated <sys/linux-syscalls.h> is now unused, but I'll remove that in a
later change.
Change-Id: Ie5ff2cc4abce1938576af7cbaef615a79c7f310d
2013-03-22 13:53:43 -07:00
Elliott Hughes
cf3fc45376
am dce1b3e2
: am e0e5b2f6
: am 65163750
: am c37dd599
: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'dce1b3e26a9f85fcc9a768cc69919299fcb2b5a5':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 18:26:45 +00:00
Elliott Hughes
dce1b3e26a
am e0e5b2f6
: am 65163750
: am c37dd599
: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'e0e5b2f6e731c639107e29abec17db2e6eb498e8':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 18:24:53 +00:00
Elliott Hughes
e0e5b2f6e7
am 65163750
: am c37dd599
: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit '65163750b11c814d6a75940ab1ede1e907b14d81':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 11:20:22 -07:00
Elliott Hughes
65163750b1
am c37dd599
: Merge "Fix builds where _FORTIFY_SOURCE is off."
...
* commit 'c37dd599561ac07a895bc435d818f000054a498d':
Fix builds where _FORTIFY_SOURCE is off.
2013-03-22 11:18:26 -07:00
Elliott Hughes
749a9e022c
am fbb41988
: am b826ebf4
: am 85598626
: am 34895c1b
: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'fbb4198857374b816a6c444a52cb3209101e02c9':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 18:17:51 +00:00
Elliott Hughes
fbb4198857
am b826ebf4
: am 85598626
: am 34895c1b
: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b826ebf41e701d0d73be2897cecd560606193bd2':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 18:15:47 +00:00
Elliott Hughes
b826ebf41e
am 85598626
: am 34895c1b
: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '85598626f4ca7914d996371ce0471ab154aa7585':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 11:11:34 -07:00
Elliott Hughes
c37dd59956
Merge "Fix builds where _FORTIFY_SOURCE is off."
2013-03-22 18:01:50 +00:00
Elliott Hughes
85598626f4
am 34895c1b
: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '34895c1bdfa5df48ee9a7b4368b6def403f24cf1':
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 10:59:57 -07:00
Elliott Hughes
890c8ed6ef
Fix builds where _FORTIFY_SOURCE is off.
...
Also add a more intention-revealing guard so we don't have loads of
places checking whether our inlining macro is defined.
Change-Id: I168860cedcfc798b07a5145bc48a125700265e47
2013-03-22 10:58:55 -07:00
Elliott Hughes
34895c1bdf
Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 17:51:43 +00:00
Elliott Hughes
74c7d3ff03
am f30ff61e
: am b44f9600
: am b80a05fa
: am 5c5f303e
: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'f30ff61ef61f3d8b73257e89e4635fc1436f4bbc':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:47:49 +00:00
Elliott Hughes
90763e0aee
am f0fc7b9b
: am a0dcecc5
: am bc0d7f73
: am e7cb795c
: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'f0fc7b9bf93029e2e0e2a21ac037d14c7f4db7a2':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:47:48 +00:00
Elliott Hughes
f30ff61ef6
am b44f9600
: am b80a05fa
: am 5c5f303e
: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b44f9600a38988749d9f893fc5d2e3b3a07e6938':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:45:18 +00:00
Elliott Hughes
f0fc7b9bf9
am a0dcecc5
: am bc0d7f73
: am e7cb795c
: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'a0dcecc53e2f45939fdcb0f1ec1d592d91cf41c7':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 16:45:18 +00:00
Elliott Hughes
b44f9600a3
am b80a05fa
: am 5c5f303e
: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'b80a05fa678b287f46dc596353d285a9a7d09fbc':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:43:28 -07:00
Elliott Hughes
a0dcecc53e
am bc0d7f73
: am e7cb795c
: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'bc0d7f736c2c66868844f2b5c9e6507d3e7a7982':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:43:28 -07:00
Elliott Hughes
b80a05fa67
am 5c5f303e
: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit '5c5f303e4c661a71ae8e4c7fd99fc7674360321e':
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:41:46 -07:00
Elliott Hughes
bc0d7f736c
am e7cb795c
: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
...
* commit 'e7cb795cb639ef4e04b0417ebf4b16b12ea5dc4e':
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
2013-03-22 09:41:46 -07:00
Elliott Hughes
5c5f303e4c
Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 16:30:56 +00:00
Elliott Hughes
e7cb795cb6
Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
2013-03-22 16:30:37 +00:00
The Android Automerger
847a62270f
merge in master-release history after reset to master
2013-03-22 07:49:16 -07:00
Elliott Hughes
8794ece296
Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
For some reason, socketcalls.c was only being compiled for ARM, where
it makes no sense. For x86 we generate stubs for the socket functions
that use __NR_socketcall directly.
Change-Id: I84181e6183fae2314ae3ed862276eba82ad21e8e
2013-03-21 23:07:11 -07:00
Elliott Hughes
1d509cc043
am 472d7115
: am ddda044a
: am 5686bb30
: am 3323628d
: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '472d7115f1ec8968b645d72d18222687d39f189e':
The SYS_ constants should cover all __NR_ values.
2013-03-22 05:57:05 +00:00
Elliott Hughes
472d7115f1
am ddda044a
: am 5686bb30
: am 3323628d
: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit 'ddda044a81b6be2ccdf351ad5c9a2b9800a60f5f':
The SYS_ constants should cover all __NR_ values.
2013-03-22 05:55:47 +00:00
Elliott Hughes
ddda044a81
am 5686bb30
: am 3323628d
: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '5686bb300304f5de0597f356c6da72b8a090a647':
The SYS_ constants should cover all __NR_ values.
2013-03-21 22:54:49 -07:00
Elliott Hughes
5686bb3003
am 3323628d
: Merge "The SYS_ constants should cover all __NR_ values."
...
* commit '3323628d635d3973965ee458c1fee7d8ab45136f':
The SYS_ constants should cover all __NR_ values.
2013-03-21 22:53:44 -07:00
Elliott Hughes
56d161bb62
Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
Change-Id: I193a35f9790b82c83fd3b5672e24ac1b2034d0b0
2013-03-21 22:52:25 -07:00
Elliott Hughes
4cdde5f123
Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.
...
Change-Id: I9d016ee8e8329cccf244d27c336d9524348af996
2013-03-21 22:48:18 -07:00
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