Commit Graph

6270 Commits

Author SHA1 Message Date
Elliott Hughes
4b83271437 am 97288549: Merge "Let the compiler worry about implementing ffs(3)."
* commit '972885499255a9368e96332f9da0d28b2436d042':
  Let the compiler worry about implementing ffs(3).
2013-10-24 16:37:27 -07:00
Elliott Hughes
9728854992 Merge "Let the compiler worry about implementing ffs(3)." 2013-10-24 23:35:51 +00:00
Elliott Hughes
bf425680e4 Let the compiler worry about implementing ffs(3).
It does at least as good a job as our old hand-written assembly anyway.

Change-Id: If7c4a1ac508bace0b71ee7b67808caa6eabf11d2
2013-10-24 16:29:40 -07:00
Elliott Hughes
0c4778d8a2 am a1b9f0d4: Merge "Revert "Don\'t warn about x86 text relocations. They\'re too prevalent.""
* commit 'a1b9f0d4436fea551f641ad02d49610fb5eab0f0':
  Revert "Don't warn about x86 text relocations. They're too prevalent."
2013-10-24 16:10:20 -07:00
Elliott Hughes
a1b9f0d443 Merge "Revert "Don't warn about x86 text relocations. They're too prevalent."" 2013-10-24 23:05:24 +00:00
Elliott Hughes
b8b0b6b412 Revert "Don't warn about x86 text relocations. They're too prevalent."
This reverts commit 5be2c5998c.

Change-Id: I3fc8ca530cdbd74c834fb9cfabe812c9386419fc
2013-10-24 22:58:28 +00:00
Elliott Hughes
557a5e08c6 am e4ab1b67: am f8dfb6f2: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls."
* commit 'e4ab1b6795e325fe346c792e6254592a8db16d4e':
  Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
2013-10-24 15:56:17 -07:00
Elliott Hughes
e4ab1b6795 am f8dfb6f2: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls."
* commit 'f8dfb6f249da6fc9c91cc8b94fa28c19e598faa6':
  Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
2013-10-24 15:53:10 -07:00
Elliott Hughes
f8dfb6f249 Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls." 2013-10-24 22:49:49 +00:00
Elliott Hughes
11952073af Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls.
(aarch64 kernels don't have these system calls.)

Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-24 15:48:32 -07:00
Ben Cheng
112b7088e7 am 8b113f75: am fcb37b87: Merge "Add __EXPORTED_HEADERS__ as predefined macro."
* commit '8b113f75b3e3835da00d0af61f033410fc29a8ca':
  Add __EXPORTED_HEADERS__ as predefined macro.
2013-10-23 15:54:04 -07:00
Ben Cheng
8b113f75b3 am fcb37b87: Merge "Add __EXPORTED_HEADERS__ as predefined macro."
* commit 'fcb37b876e3589e8a749610cd8228ed9f6020f44':
  Add __EXPORTED_HEADERS__ as predefined macro.
2013-10-23 15:50:45 -07:00
Ben Cheng
fcb37b876e Merge "Add __EXPORTED_HEADERS__ as predefined macro." 2013-10-23 22:47:21 +00:00
Ben Cheng
460fa7033b Add __EXPORTED_HEADERS__ as predefined macro.
To weed out stuff like this in uapi/linux/types.h

ifndef __EXPORTED_HEADERS__
warning "Attempt to use kernel headers from user space, see
http://kernelnewbies.org/KernelHeaders"
endif /* __EXPORTED_HEADERS__ */

Change-Id: I6506cea6248f7a3b44a839b98e91bdd0d3a6c4cd
2013-10-23 14:44:38 -07:00
Elliott Hughes
dc57fe3389 am 7b9aa1a3: am 9098344a: Merge "Don\'t warn about x86 text relocations. They\'re too prevalent."
* commit '7b9aa1a3e7fd3e42782b10965b9e5cde6a17b74c':
  Don't warn about x86 text relocations. They're too prevalent.
2013-10-23 14:04:07 -07:00
Elliott Hughes
7b9aa1a3e7 am 9098344a: Merge "Don\'t warn about x86 text relocations. They\'re too prevalent."
* commit '9098344afe98ace7b9f7af8898c02d267f1335a5':
  Don't warn about x86 text relocations. They're too prevalent.
2013-10-23 14:01:58 -07:00
Elliott Hughes
9098344afe Merge "Don't warn about x86 text relocations. They're too prevalent." 2013-10-23 20:58:38 +00:00
Elliott Hughes
5be2c5998c Don't warn about x86 text relocations. They're too prevalent.
We should fix this (and disallow it for x86_64), but for now let's get CTS
running again.

libdvm.so and libcutils.so are the main problems.

$ scanelf -qT out/target/product/generic_x86/symbols/system/lib/libcutils.so
  libcutils.so: (memory/data?) [0x4125] in (optimized out: previous android_memset16) [0x4100]
  libcutils.so: (memory/data?) [0x424F] in (optimized out: previous android_memset16) [0x4100]
  libcutils.so: (memory/data?) [0x42F8] in (optimized out: previous android_memset16) [0x4100]
  libcutils.so: (memory/data?) [0x4349] in (optimized out: previous android_memset16) [0x4100]
  libcutils.so: (memory/data?) [0x4406] in (optimized out: previous android_memset16) [0x4100]
  libcutils.so: (memory/data?) [0x45AC] in (optimized out: previous android_memset32) [0x4590]
  libcutils.so: (memory/data?) [0x4650] in (optimized out: previous android_memset32) [0x4590]
  libcutils.so: (memory/data?) [0x46F9] in (optimized out: previous android_memset32) [0x4590]
  libcutils.so: (memory/data?) [0x474A] in (optimized out: previous android_memset32) [0x4590]
  libcutils.so: (memory/data?) [0x4807] in (optimized out: previous android_memset32) [0x4590]

Bug: 11353056
Change-Id: Id4a76b310be7fe858a8a60d0d260b09913b66be9
2013-10-23 13:45:01 -07:00
Elliott Hughes
977f91f5bf am ae61f49b: am cdac5f73: Merge "MIPS\' pipe(2) is weird, but MIPS\' pipe2(2) is the same as everyone else\'s."
* commit 'ae61f49b130e65997750f4ffb84f22512e055c5f':
  MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
2013-10-23 11:33:24 -07:00
Elliott Hughes
c410e75c68 am 0e1faa2e: am 1370854c: Merge "Fix header file dependencies."
* commit '0e1faa2e00a4f1d4508b26a6411ac1daa1ce8b6d':
  Fix header file dependencies.
2013-10-23 11:33:23 -07:00
Elliott Hughes
ae61f49b13 am cdac5f73: Merge "MIPS\' pipe(2) is weird, but MIPS\' pipe2(2) is the same as everyone else\'s."
* commit 'cdac5f73aca015287d1f40ff50d4fbf293a0c549':
  MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
2013-10-23 11:30:08 -07:00
Elliott Hughes
0e1faa2e00 am 1370854c: Merge "Fix header file dependencies."
* commit '1370854cc0a4aa652213e44d4a8b268fe614c11f':
  Fix header file dependencies.
2013-10-23 11:30:07 -07:00
Elliott Hughes
cdac5f73ac Merge "MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's." 2013-10-23 18:27:35 +00:00
Elliott Hughes
1370854cc0 Merge "Fix header file dependencies." 2013-10-23 18:27:01 +00:00
Elliott Hughes
93de3d881d Fix header file dependencies.
MIPS' asm/fcntl.h assumes a bunch of __kernel_* types are already declared.

Change-Id: Iff701bbb5ede9667a78230c2de3a8f4fe41371c5
2013-10-23 11:25:54 -07:00
Elliott Hughes
b8cf18b4dd MIPS' pipe(2) is weird, but MIPS' pipe2(2) is the same as everyone else's.
arch/mips/kernel/syscall.c has a special sysm_pipe wrapper, but there's
no special treatment of pipe2 because it carries no historical baggage.

Change-Id: I892c0f690b21992c8a48276a9b732126f18fc0ee
2013-10-23 11:21:36 -07:00
Elliott Hughes
623fcf1e98 am db7f8eb0: am 97dc3309: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls."
* commit 'db7f8eb011db18c69ec872823906e5f9660deaf7':
  Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
2013-10-23 10:34:03 -07:00
Elliott Hughes
db7f8eb011 am 97dc3309: Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls."
* commit '97dc3309f3d403c391581444ad656c2f3c61303d':
  Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
2013-10-23 10:30:15 -07:00
Elliott Hughes
97dc3309f3 Merge "Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls." 2013-10-23 17:26:40 +00:00
Elliott Hughes
cac7b9d6ec Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.
(aarch64 kernels only have the newer system calls.)

Also expose the new functionality that's exposed by glibc in our header files.

Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5
2013-10-23 09:48:29 -07:00
Elliott Hughes
e514d2fe66 resolved conflicts for merge of 1dbf56aa to klp-dev-plus-aosp
Change-Id: Ia1d1467065320941d6dc3a50f7ea85eb4dbf3841
2013-10-22 16:41:42 -07:00
Elliott Hughes
1dbf56aab5 am ec40edc9: Merge "Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls."
* commit 'ec40edc9188aebe5207e47c0a66e89e1ed368bd6':
  Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls.
2013-10-22 16:34:20 -07:00
Elliott Hughes
ec40edc918 Merge "Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls." 2013-10-22 23:32:25 +00:00
Elliott Hughes
f8fcfbc85a Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls.
Modern architectures only get the *at(2) system calls. For example,
aarch64 doesn't have open(2), and expects userspace to use openat(2)
instead.

Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 16:31:01 -07:00
Elliott Hughes
0775b1dae8 am 3f0505cc: am f0ed9bf2: Merge "AArch64: Fix definitions for STDINT_LIMITS"
* commit '3f0505cc87ff452f79842ab14aef44d0e4e1a2f2':
  AArch64: Fix definitions for STDINT_LIMITS
2013-10-22 12:46:55 -07:00
Elliott Hughes
3f0505cc87 am f0ed9bf2: Merge "AArch64: Fix definitions for STDINT_LIMITS"
* commit 'f0ed9bf2537e861ae75e6ab71efb4b4722ad0eee':
  AArch64: Fix definitions for STDINT_LIMITS
2013-10-22 12:43:35 -07:00
Elliott Hughes
f0ed9bf253 Merge "AArch64: Fix definitions for STDINT_LIMITS" 2013-10-22 19:41:26 +00:00
Serban Constantinescu
debc021491 AArch64: Fix definitions for STDINT_LIMITS
This patches fixes the definitions for STDINT_LIMITS on __LP64__
systems.

Change-Id: I5eb1664e9ef7c303432a2b041c99cec663816b75
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2013-10-22 12:40:16 -07:00
Nick Kralevich
52185f37ae am b8280db7: am 1756f5a4: Merge "change wording on text relocation message."
* commit 'b8280db78b9b6db8851f12d26c49d27179d44366':
  change wording on text relocation message.
2013-10-22 12:37:03 -07:00
Nick Kralevich
b8280db78b am 1756f5a4: Merge "change wording on text relocation message."
* commit '1756f5a422446237945682c8811587a29d56fdef':
  change wording on text relocation message.
2013-10-22 12:32:04 -07:00
Nick Kralevich
1756f5a422 Merge "change wording on text relocation message." 2013-10-22 19:28:50 +00:00
Elliott Hughes
081b40f378 am 550ccc2e: am 8c39e58b: Merge "Make sure we have a mkfifo symbol."
* commit '550ccc2e20cb1998a959a7abb24f5ec382a93192':
  Make sure we have a mkfifo symbol.
2013-10-22 12:08:51 -07:00
Elliott Hughes
65104ba533 am 9805f3ec: am 23148470: Merge "AArch64: Fix uses of stack size for 32/64bit libc builds"
* commit '9805f3ec5b4ebfbe892e79a086c7d23a0bd393cf':
  AArch64: Fix uses of stack size for 32/64bit libc builds
2013-10-22 12:08:50 -07:00
Nick Kralevich
3d4470c14a change wording on text relocation message.
The current message is too alarmist.

Change-Id: I53e8eadca239f867b4e6b9c193eba96e267950c3
2013-10-22 12:06:36 -07:00
Elliott Hughes
550ccc2e20 am 8c39e58b: Merge "Make sure we have a mkfifo symbol."
* commit '8c39e58b6a6744c5e7ae08424a6281d75af23072':
  Make sure we have a mkfifo symbol.
2013-10-22 12:05:23 -07:00
Elliott Hughes
9805f3ec5b am 23148470: Merge "AArch64: Fix uses of stack size for 32/64bit libc builds"
* commit '231484705bea118259200da6019722a026021f4b':
  AArch64: Fix uses of stack size for 32/64bit libc builds
2013-10-22 12:05:22 -07:00
Elliott Hughes
8c39e58b6a Merge "Make sure we have a mkfifo symbol." 2013-10-22 19:03:57 +00:00
Elliott Hughes
594b1a4af2 Make sure we have a mkfifo symbol.
Bug: https://code.google.com/p/android/issues/detail?id=58888
Change-Id: Ic0a883a5f30beb82cb7be3c4e81b6d693d5fbb4d
2013-10-22 12:03:19 -07:00
Elliott Hughes
231484705b Merge "AArch64: Fix uses of stack size for 32/64bit libc builds" 2013-10-22 19:02:29 +00:00
Serban Constantinescu
7f70c9b64e AArch64: Fix uses of stack size for 32/64bit libc builds
This patch fixes stack size uses to size_t.

Change-Id: I0671c85ddb1c1aceaf9440a7c73c21fe528653fa
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2013-10-22 12:01:29 -07:00