Christopher Ferris
4a96c1b216
am 40b85d34
: am eee5f173
: Merge "[MIPS64] Adjust kernel/tools for mips32,mips64 headers"
...
* commit '40b85d34e0f87bdb0ede4c36d6389a7af9c6548c':
[MIPS64] Adjust kernel/tools for mips32,mips64 headers
2014-06-21 01:06:57 +00:00
Duane Sand
a69eaec4d4
[MIPS64] Adjust kernel/tools for mips32,mips64 headers
...
Define CONFIG_32BIT as _ABIO32 rather than as 1;
it needs to be undefined for calls from mips64.
We need defined(CONFIG_32BIT) == !defined(CONFIG_64BIT),
and get that via defined(_ABIO32) == !defined(__LP64__).
Define CONFIG_CPU_LITTLE_ENDIAN to get correctly-placed
struct msqid64_ds fillers on ipc calls from mips32.
Without this, big-endian fillers were erroneously used.
This bug exists in prior mips32 Android releases.
Define __SANE_USERSPACE_TYPES__ to use int_ll64.h
rather than int_ll64.h on mips64.
This depends on external/kernel-headers patch
https://android-review.googlesource.com/#/c/98915/
http://patchwork.linux-mips.org/patch/6890/
Change-Id: If65fa80746533723cdf46eebe95733bea7ce24ba
2014-06-20 10:46:28 -07:00
Christopher Ferris
28f321aa0f
am 1b8163f5
: am 1cada9b3
: Merge "Remove unused scripts."
...
* commit '1b8163f5e686bc2405731d529c684c06bae65f17':
Remove unused scripts.
2014-06-07 02:11:49 +00:00
Christopher Ferris
4ff5aa3568
am 5261fd2c
: am b837767a
: Merge "Update kernel header generation docs."
...
* commit '5261fd2cacc8a53643089cab9fbbeb8142f98dea':
Update kernel header generation docs.
2014-06-06 22:35:55 +00:00
Christopher Ferris
ab39aba70e
Remove unused scripts.
...
Change-Id: I3391d6c903f710b45e62bcf01058cf3ad9abe399
2014-06-06 15:28:42 -07:00
Christopher Ferris
08b60747fe
Update kernel header generation docs.
...
Also move the description of the cleanup data to the cleanup script.
Bug: 15433575
Change-Id: I21e2cbbfab55da483af1bbe36bbe59126b518e3c
2014-06-06 13:54:36 -07:00
Elliott Hughes
c571c26820
am 9eb2d38d
: am b9fdad77
: am ec81b4a3
: Merge "Scrub uapi headers slightly harder."
...
* commit '9eb2d38d53b2d00a9b5bd189a34f51afb7c385bf':
Scrub uapi headers slightly harder.
2014-05-15 23:12:23 +00:00
Elliott Hughes
8ed7a23309
Scrub uapi headers slightly harder.
...
There's no point having always-false tests. It just makes the headers
harder to read.
Bug: 11560081
Change-Id: I6187755e1514ca9ff5642b3c1b0489f22edddaf5
2014-05-15 12:01:11 -07:00
Elliott Hughes
834c136cec
am 0d443726
: am d2623501
: am 8979cfe1
: Merge "Keep the kernel header scrubber\'s data structures in sync."
...
* commit '0d4437263e65b7acc4546753ac79577b94ccc6ba':
Keep the kernel header scrubber's data structures in sync.
2014-05-01 17:36:06 +00:00
Elliott Hughes
fddbafdc0a
Keep the kernel header scrubber's data structures in sync.
...
If you rewrite the tokens of a #if you need to rewrite the expression to match
because either might be used later. This was showing up as SIGRTMAX being
rewritten in a #define but not in the #ifndef that guarded it, for which case
I've added a unit test.
Change-Id: I6929675461a1afe272edd667594529fd84a3dc4d
2014-05-01 10:27:49 -07:00
Elliott Hughes
fc4d9263a3
am 01dc4152
: am 4a41581a
: am 9fb53dd4
: Merge "Make SIGRTMIN hide the real-time signals we use internally."
...
* commit '01dc4152b736c822a11cbbff3240eec7143659e3':
Make SIGRTMIN hide the real-time signals we use internally.
2014-04-30 18:48:56 +00:00
Elliott Hughes
0990d4fda8
Make SIGRTMIN hide the real-time signals we use internally.
...
__SIGRTMIN will continue to tell the truth. This matches glibc's
behavior (as evidenced by the fact that we don't need a special case
in the strsignal test now).
Change-Id: I1abe1681d516577afa8cd39c837ef12467f68dd2
2014-04-30 10:06:09 -07:00
Ruchi Kandoi
eba6501c20
am 88920300
: am aa3d46a4
: Merge "prctl: Adds the PR_SET_TIMERSLACK_PID option"
...
* commit '889203005b62f0c2124a7fcae12f9824cbc78868':
prctl: Adds the PR_SET_TIMERSLACK_PID option
2014-04-23 19:29:32 +00:00
Ruchi Kandoi
b84926b95c
prctl: Adds the PR_SET_TIMERSLACK_PID option
...
Allows software to set timer clack for other thread.
Change-Id: Ifa9d2cc7844ec581356bce15434609242fd898a8
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-04-23 19:13:15 +00:00
Elliott Hughes
fc38de6b0d
am fc50845e
: am 0b0387c9
: Merge "Fix kernel header scrubbing for LP64."
...
* commit 'fc50845e7d921763152753b60417ece57158cf2e':
Fix kernel header scrubbing for LP64.
2014-04-08 18:05:33 +00:00
Elliott Hughes
9195a258ee
Fix kernel header scrubbing for LP64.
...
Change-Id: I4caf44d41edd1b03a20d4c565e169c2b7a2f3686
2014-04-08 10:15:06 -07:00
Greg Hackmann
ff14a40c80
am 9b0fa57c
: am e2a0f15c
: Merge "Regenerate adf header"
...
* commit '9b0fa57cb1e9722a07d601db9520cebaa04d743c':
Regenerate adf header
2014-04-03 02:11:16 +00:00
Greg Hackmann
8061facb7c
Regenerate adf header
...
Fixes 64-bit related alignment issues
Change-Id: Ie90b920a7489e807e953f45a6db72350b80f6f22
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-04-02 16:07:32 -07:00
Elliott Hughes
dc6cd351b9
am f1f19464
: am 819c132e
: Merge "Fix NSIG."
...
* commit 'f1f19464c52e663ade6c18833eaa30bfcd5194de':
Fix NSIG.
2014-02-12 23:01:26 +00:00
Elliott Hughes
199346a2ab
Fix NSIG.
...
Our sigset_t definition hasn't been tied to our NSIG definition since we
switched to uapi headers, so we can now fix it without breaking the LP32 ABI.
The kernel uapi headers define and use _NSIG, so we need to have our scripts
rename the kernel's definitions out of the way, then we can define _NSIG
and NSIG in terms of the kernel's off-by-one value.
Bug: 12938442
Change-Id: Ic7c86fd5be5ad1d822f7b2b1d88c8a0d70a1ac0f
2014-02-11 22:16:04 -08:00
Arve Hjønnevåg
ba7c3079bf
am eb26da9a
: am fb4da1e7
: Merge "Regenerate binder header"
...
* commit 'eb26da9af841c60e69f44a3affb46ec48fdaa6d3':
Regenerate binder header
2014-02-03 22:11:16 +00:00
Arve Hjønnevåg
fbaa254016
Regenerate binder header
...
Adds 64 bit support
Change-Id: I6db3c4f68bf2c337bff753599af193e2b062ec05
2014-01-28 19:29:46 -08:00
Colin Cross
771524267b
am 3aa1e605
: am 35377004
: am 513f83bb
: Merge "bionic: rename aarch64 target to arm64"
...
* commit '3aa1e605ea1167e59976bf82922fd06c728b518b':
bionic: rename aarch64 target to arm64
2014-01-24 21:24:50 +00:00
Colin Cross
d1973ca513
bionic: rename aarch64 target to arm64
...
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 18:35:39 -08:00
Christopher Ferris
f36c3ea8ff
resolved conflicts for merge of 85e0dd89
to master
...
Change-Id: I21f7ffb9a582681877e2dbad54185ee37d18410e
2013-12-18 23:43:36 -08:00
Christopher Ferris
be5231442b
Remove the non-uapi kernel headers.
...
Bug: 11559337
Change-Id: Id1ee4dadbd673cf35b9c79bc87f9a6fb7b2253c6
2013-12-18 10:34:18 -08:00
Christopher Ferris
9bed351f79
am 64edf779
: am 7dfd8ae1
: am 513d2770
: Merge "Add ioprio.h."
...
* commit '64edf779d79fd81a39ee5e0327f585b37cd828f2':
Add ioprio.h.
2013-12-12 23:51:17 +00:00
Christopher Ferris
802a0a7285
Add ioprio.h.
...
Change-Id: I153d05c5b6e9d640e319d65acb48b9cb12b6dafb
2013-12-12 15:23:22 -08:00
Elliott Hughes
356a4e4a32
Regenerate the bionic headers to match external/kernel-headers.
...
(This undoes the AOSP-only ion.h hack.)
Bug: 11859767
Change-Id: Id863c70d63b2716ae22cafd7ddb1163bbc7a3d11
2013-11-25 14:09:12 -08:00
Elliott Hughes
ee6b6f167a
am aee38bc0
: am 5a52bd34
: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
...
* commit 'aee38bc05ff0cd1294d079909c27732249507abd':
Regenerate the bionic kernel headers to match external/kernel-headers.
2013-11-25 14:05:10 -08:00
Elliott Hughes
c43d16a458
Regenerate the bionic kernel headers to match external/kernel-headers.
...
Bug: 11859767
Change-Id: I3d746188a1c4bdf8db1358521438435d3e63dbac
2013-11-25 13:50:55 -08:00
Christopher Ferris
2884789cfa
am cf8500fd
: am cda0c61d
: am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit 'cf8500fd4359bd026829bdfd0dc4968ed07cc842':
Delete non-uapi headers.
2013-11-24 00:27:51 -08:00
Christopher Ferris
cda0c61dc7
am 14d6be45
: Merge "Delete non-uapi headers."
...
* commit '14d6be45b960f8fbb039bd946e22ce406e8b65c3':
Delete non-uapi headers.
2013-11-24 00:20:23 -08:00
Christopher Ferris
59a6012367
am 30aebed9
: am 038919d3
: am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '30aebed98ab66329d62e0884209fd9d04a8b056f':
Update script to copy in extra generated files.
2013-11-23 12:41:04 -08:00
Christopher Ferris
e5a9200534
Delete non-uapi headers.
...
Update headers and delete non-uapi headers that have been removed from
external/kernel-headers project.
Change-Id: I9ed9632a941095fe1bf3b207bafe1151f00de033
2013-11-23 08:01:25 -08:00
Christopher Ferris
038919d37c
am 507f95e2
: Merge "Update script to copy in extra generated files."
...
* commit '507f95e22b39fb58b9ffbba38ab593475b926af5':
Update script to copy in extra generated files.
2013-11-22 17:22:10 -08:00
Christopher Ferris
b4091e69f1
Update script to copy in extra generated files.
...
There are files in generated/asm that simply include asm-generic files. The
script now copies any file in generated/asm that also exists in asm-generic.
Change-Id: I075161c68624e9e9e81797224831988ce02220eb
2013-11-22 17:04:34 -08:00
The Android Open Source Project
f00c938c7f
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
...
Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
2013-11-22 13:38:33 -08:00
Christopher Ferris
bbbf505c1d
am e3bc2254
: am a626e4d8
: am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit 'e3bc2254138e92d1b4746709ec355a5bd43bbccd':
Script to grab uapi headers from android kernel.
2013-11-21 23:00:03 -08:00
Elliott Hughes
6211255a6b
am 68a4187c
: am 50f6b836
: am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit '68a4187c4a88a885b36412607797e7ca65662968':
Regenerate uapi header files.
2013-11-21 23:00:02 -08:00
Elliott Hughes
6bc95b6906
am 8acd5dd2
: am 84336795
: am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit '8acd5dd2f82ecbf57c275528d5f2e5db0ef60a34':
Add support for the ternary operator to the header scrubber.
2013-11-21 23:00:01 -08:00
Elliott Hughes
57f4718cfc
am 03adedfc
: am a18a01f5
: am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit '03adedfc3c8d25939d8799ed2ce9292b063d8bc7':
Remove obsolete kernel/arch-mips headers.
2013-11-21 22:59:59 -08:00
Elliott Hughes
15428215c6
am b749a010
: am 8637bb53
: am b135f6e5
: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit 'b749a010a3cf6b1544d1e27b360ffcb98ae1cdbc':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 22:59:59 -08:00
Christopher Ferris
e3bc225413
am a626e4d8
: am 26f0e54a
: Merge "Script to grab uapi headers from android kernel."
...
* commit 'a626e4d8bc3d59cc328942fc30ffc04981b154ed':
Script to grab uapi headers from android kernel.
2013-11-21 18:43:58 -08:00
Elliott Hughes
68a4187c4a
am 50f6b836
: am fa7b48bf
: Merge "Regenerate uapi header files."
...
* commit '50f6b8363e1429316311450f2a3041040977d67c':
Regenerate uapi header files.
2013-11-21 18:43:57 -08:00
Elliott Hughes
8acd5dd2f8
am 84336795
: am eec57b37
: Merge "Add support for the ternary operator to the header scrubber."
...
* commit '843367953f40ee84bcc53e08a60c82215303e1fb':
Add support for the ternary operator to the header scrubber.
2013-11-21 18:43:48 -08:00
Elliott Hughes
03adedfc3c
am a18a01f5
: am 15a64948
: Merge "Remove obsolete kernel/arch-mips headers."
...
* commit 'a18a01f553ce5350923c470c144dca87dfc8e992':
Remove obsolete kernel/arch-mips headers.
2013-11-21 18:43:47 -08:00
Elliott Hughes
b749a010a3
am 8637bb53
: am b135f6e5
: Merge "Remove the unused arch-x86 and arch-x86-64 kernel headers."
...
* commit '8637bb5345bce20374ed345490d6de80cb874554':
Remove the unused arch-x86 and arch-x86-64 kernel headers.
2013-11-21 18:43:46 -08:00
Christopher Ferris
26f0e54ae0
Merge "Script to grab uapi headers from android kernel."
2013-11-21 22:20:14 +00:00
Christopher Ferris
e994d41578
Script to grab uapi headers from android kernel.
...
Change-Id: Ia140e3ab27fbfee6b02f04c085f3e0e351bbe68d
2013-11-21 14:09:54 -08:00