Commit graph

937 commits

Author SHA1 Message Date
Yabin Cui
a9653012fb am 9f7c5fef: Merge "kill HAVE_MADVISE"
* commit '9f7c5fef0e7c00d00c67242c2a360911b53374e0':
  kill HAVE_MADVISE
2014-11-19 04:31:49 +00:00
Yabin Cui
16ccc03746 kill HAVE_MADVISE
Bug: 18397020
Change-Id: I6b9c7d30432858131379759e738d3e04bc8d5fb5
2014-11-18 18:14:37 -08:00
Elliott Hughes
e5029aa295 am 39961b92: Merge "Remove another unused definition."
* commit '39961b926e637fd29cc6a32d956553c59c65e37c':
  Remove another unused definition.
2014-11-18 22:22:32 +00:00
Elliott Hughes
bce40c38ce Remove another unused definition.
We have a lot of definitions around the tree, of which this is but one,
but we have no users.

Change-Id: Ic411505a0370be2b56150275fa9b8f5329241ce8
2014-11-18 14:10:27 -08:00
Elliott Hughes
6665600642 am 3c0682c6: Merge "Kill unused ARCH_* defines."
* commit '3c0682c6b52f30301a909a6f8376384a8547d376':
  Kill unused ARCH_* defines.
2014-11-18 22:02:28 +00:00
Elliott Hughes
436c73931a Kill unused ARCH_* defines.
No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more
aspirational than real.

Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6
2014-11-18 12:57:34 -08:00
Yabin Cui
94a1469914 am 57ed1ddf: Merge "kill HAVE_TERMIO_H"
* commit '57ed1ddf78ecf7815a1b57137ea42893237a4756':
  kill HAVE_TERMIO_H
2014-11-18 03:46:34 +00:00
Yabin Cui
a16825ff7a kill HAVE_TERMIO_H
Bug: 18398307
Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
2014-11-17 14:49:39 -08:00
Dan Albert
7d5fe24251 am a05a04cc: Merge "Refactor transform-o-to-* definitions."
* commit 'a05a04cc754a6374c2ce6406dece9bbafa0abea0':
  Refactor transform-o-to-* definitions.
2014-11-14 18:09:48 +00:00
Dan Albert
a05a04cc75 Merge "Refactor transform-o-to-* definitions." 2014-11-14 18:01:21 +00:00
Dmitriy Ivanov
0cd1bbd048 am 3537692d: Merge "Switch --hash-style to gnu"
* commit '3537692df3f64f68bf202d9857ae67e19bc4eaa4':
  Switch --hash-style to gnu
2014-11-14 02:13:13 +00:00
Dmitriy Ivanov
3537692df3 Merge "Switch --hash-style to gnu" 2014-11-14 01:47:00 +00:00
Dan Albert
e088c0d281 Refactor transform-o-to-* definitions.
Previously, there was one generic definition for each of the
transform-o-to-* functions in definitions.mk, and one target specific
one in each combo/TARGET_*.mk. The generic one was entirely unused,
and the target specific ones were all nearly identical.

Changing anything in these functions was tedious at best, and often
error prone. The differences between any 32-bit arch and its 64-bit
equivalent were restricted to the name of the linker, and the ARM and
MIPS definitions were identical. The few differences between ARM and
x86 looked to be compatibility for an old (ca. 2008) toolchain issue
with --gc-sections, and a bug (LDFLAGS coming first rather than
later).

To simplify things, I've moved the definitions for these out of
combo/TARGET_*.mk and back into definitions.mk. The differences
between ARM and x86 have been scrapped. Anything that really does
still need to be target specific can be handled as I have the linker:
add a TARGET_FOO variable to the given target and then add it to the
generic definition.

Change-Id: I54dc1bffc32ac39f27f0b87247dd6a6dbaf0b162
2014-11-13 16:21:46 -08:00
Yabin Cui
6da7611890 am eddd9fb0: Merge "kill HAVE_FORKEXEC"
* commit 'eddd9fb03faa607c77feed1cea8f435df7f64140':
  kill HAVE_FORKEXEC
2014-11-13 23:35:27 +00:00
Yabin Cui
eddd9fb03f Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:46 +00:00
Dmitriy Ivanov
179685c1c3 Switch --hash-style to gnu
Bug: 18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
2014-11-13 14:51:10 -08:00
Yabin Cui
b4157cd7c5 am d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit 'd3d6c3830f2c1b25f97a8e0001edfda4583a309a':
  kill HAVE_LOCALTIME_R
2014-11-13 20:09:30 +00:00
Yabin Cui
e9ae59b47f kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
2014-11-13 11:51:37 -08:00
Yabin Cui
faddef7018 am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R"
* commit '044568be18bb67a254398d65c15fe5e9caeb9d02':
  kill HAVE_GETHOSTBYNAME_R
2014-11-13 19:21:48 +00:00
Yabin Cui
19230103ee kill HAVE_GETHOSTBYNAME_R
Bug: 18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
2014-11-13 10:25:56 -08:00
Elliott Hughes
cc12050f34 am 6c706222: Merge "Remove HAVE_SHORT_ENUMS."
* commit '6c7062221b7582c5d41acdb7a1d865ca629707ed':
  Remove HAVE_SHORT_ENUMS.
2014-11-13 05:27:44 +00:00
Elliott Hughes
0e3a0fcb95 Remove HAVE_SHORT_ENUMS.
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
2014-11-12 21:07:07 -08:00
Yabin Cui
e9680c2212 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
2014-11-12 17:15:30 -08:00
Yabin Cui
eb793be2c7 am 957037dc: Merge "kill HAVE_POSIX_FILEMAP"
* commit '957037dc40c7be54e7ffa6f56cca48e9db31dc7b':
  kill HAVE_POSIX_FILEMAP
2014-11-13 00:15:25 +00:00
Yabin Cui
957037dc40 Merge "kill HAVE_POSIX_FILEMAP" 2014-11-13 00:02:25 +00:00
Chih-Hung Hsieh
7d8b4df9c4 am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"
* commit 'aea83e0dca9a70e53677c22c72034155311287ab':
  Upgrade host tool to x86_64-linux-glibc2.15-4.8
2014-11-12 23:23:20 +00:00
Chih-Hung Hsieh
aea83e0dca Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 2014-11-12 23:13:36 +00:00
Yabin Cui
3b9d876f93 kill HAVE_POSIX_FILEMAP
Bug: 18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
2014-11-11 10:34:37 -08:00
Elliott Hughes
20228b6e4a am b3893943: Merge "Remove unused variables from select.mk."
* commit 'b38939436199c65299809f6adb50db6d3b44f7b0':
  Remove unused variables from select.mk.
2014-11-11 18:07:44 +00:00
Elliott Hughes
b389394361 Merge "Remove unused variables from select.mk." 2014-11-11 17:59:17 +00:00
Yabin Cui
899b18775b am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h"
* commit '4dc8e8561fa807fb6417f1405f4364a1bf6d4060':
  remove __linux__ in AndroidConfig.h
2014-11-11 17:40:51 +00:00
Elliott Hughes
a3850a976c Remove unused variables from select.mk.
I've no idea what these were meant to be for, but they're unused.

Change-Id: I978568bd83f91eb952c35a3a481bd517312062f0
2014-11-10 20:47:49 -08:00
Yabin Cui
70af4d3796 remove __linux__ in AndroidConfig.h
Bug: 18316409
Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3
2014-11-10 19:14:56 -08:00
Yabin Cui
1f4d40be5d am 86596342: Merge "kill OS_CASE_SENSITIVE"
* commit '8659634285d29edbbb364277f5950f41e26a15d4':
  kill OS_CASE_SENSITIVE
2014-11-11 02:15:34 +00:00
Yabin Cui
8659634285 Merge "kill OS_CASE_SENSITIVE" 2014-11-11 01:08:46 +00:00
Yabin Cui
2c1eb2fe21 am d8e38e1b: Merge "kill HAVE_INOTIFY"
* commit 'd8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
  kill HAVE_INOTIFY
2014-11-11 00:19:22 +00:00
Yabin Cui
c0ce08cc79 am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM"
* commit '3dbac214c22a44042f3e12da37f0fada341123da':
  kill HAVE_STAT_ST_MTIM
2014-11-11 00:14:25 +00:00
Yabin Cui
d8e38e1b1a Merge "kill HAVE_INOTIFY" 2014-11-11 00:11:04 +00:00
Elliott Hughes
499ed6c496 am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
  Remove HAVE_DIRENT_D_TYPE.
2014-11-11 00:07:17 +00:00
Yabin Cui
3dbac214c2 Merge "kill HAVE_STAT_ST_MTIM" 2014-11-11 00:04:35 +00:00
Yabin Cui
e8e5e99b76 kill HAVE_INOTIFY
Bug: 18314841
Change-Id: Idfcbeb62a57f72a47eb732f085fbd1ab27302f85
2014-11-10 15:44:27 -08:00
Elliott Hughes
07793e1880 Remove HAVE_DIRENT_D_TYPE.
Only Windows doesn't have it, and we don't build atree for Windows.

Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
2014-11-10 15:33:39 -08:00
Yabin Cui
4120e835fb kill HAVE_STAT_ST_MTIM
Bug: 18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
2014-11-10 15:27:49 -08:00
Yabin Cui
772034bc95 kill OS_CASE_SENSITIVE
Bug: 18314594
Change-Id: I5dc5072d43299c0e5d96ce9640e8405cbb633506
2014-11-10 15:03:11 -08:00
Yabin Cui
ca28c6379c am 1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER"
* commit '1036850f8f8607f4d2898fcc73abb1fff23570d6':
  kill HAVE_SCHED_SETSCHEDULER
2014-11-10 22:30:42 +00:00
Yabin Cui
35e8e323bc kill HAVE_SCHED_SETSCHEDULER
Bug: 18300670
Change-Id: I66fb3d0070751ffaa2bc6b53274b22d967350312
2014-11-10 12:20:15 -08:00
Al Sutton
1199f7388c Fix building on modern versions of Xcode and OS X.
Add the build options to support the most recent versions of XCode and
add 10.9 to the list of OS X SDKs which the AOSP code can be built with.

Based on patch from https://groups.google.com/d/msg/android-building/kePgJmYBUdM/0C_d1OZflvcJ

Change-Id: I97ffe45d3c54a095952a4ac6accb938623b8fa1e
Signed-off-by: Al Sutton <al@funkyandroid.com>
2014-11-10 14:42:30 +00:00
Elliott Hughes
65f5175f06 am 652ff716: Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)."
* commit '652ff716b819b694be76e63f059dca50e7febb8d':
  Remove more namespace pollution (HAVE_TM_GMTOFF).
2014-11-08 23:38:56 +00:00
Elliott Hughes
89ac6e4c6f Remove more namespace pollution (HAVE_TM_GMTOFF).
Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
2014-11-08 14:21:12 -08:00
Elliott Hughes
954729cc17 am 3581753f: Merge "Remove more namespace pollution (HAVE_FUNOPEN)."
* commit '3581753ffae63e32b2b2e2be1e447cb2e83dec5e':
  Remove more namespace pollution (HAVE_FUNOPEN).
2014-11-08 22:17:44 +00:00
Elliott Hughes
e5e26e2196 Remove more namespace pollution (HAVE_FUNOPEN).
Change-Id: I25a64ce39cd7bdd99aa6412413554b96d3cb113e
2014-11-08 12:39:28 -08:00
Elliott Hughes
011710ba48 am 9e95a0f4: Merge "Remove more namespace pollution."
* commit '9e95a0f4d0172b1669d404c3d605e689234f4dcf':
  Remove more namespace pollution.
2014-11-08 19:03:04 +00:00
Elliott Hughes
9e95a0f4d0 Merge "Remove more namespace pollution." 2014-11-08 18:55:53 +00:00
Elliott Hughes
b63a7c0dd9 Remove more namespace pollution.
Nothing in our tree is using this HAVE_BACKTRACE definition, but we do have
a hack in external/llvm to work around the namespace pollution.

Change-Id: Ib51d8bbd598dd2961a028216bf0b489dc7ad4880
2014-11-08 10:14:19 -08:00
Ying Wang
2874d0ba8c am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."
* commit '87bde62df4e5bb76f058394cd7fff8eaaf7e0d0c':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
2014-11-07 18:37:42 +00:00
Ying Wang
2ad87ebf26 Fix error of PRIVATE_LDLIBS introduced by de36cd72.
Change-Id: I85644899c8527e061c331eecc707ca1bb0e3fac4
2014-11-07 10:05:03 -08:00
Chih-Hung Hsieh
3be11c6e61 Upgrade host tool to x86_64-linux-glibc2.15-4.8
BUG: 17915392
Change-Id: I301b8ae70fabedfafea5ae0094bbd46c208f4622
2014-11-06 11:47:08 -08:00
Chih-hung Hsieh
1834008417 am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '51e55c1d22576de38ca4b65deaded7b3a1af8387':
  Revert "Continue to use march=i686 before fix of g++ ICE."
2014-10-30 16:08:20 +00:00
Chih-hung Hsieh
51e55c1d22 Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit f70f009ca8.

Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
2014-10-30 01:55:45 +00:00
Chih-Hung Hsieh
23103f4fa9 am f70f009c: Continue to use march=i686 before fix of g++ ICE.
* commit 'f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
  Continue to use march=i686 before fix of g++ ICE.
2014-10-29 22:07:26 +00:00
Chih-Hung Hsieh
f70f009ca8 Continue to use march=i686 before fix of g++ ICE.
BUG: 18174291
BUG: 18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
2014-10-29 14:46:15 -07:00
Ian Rogers
c156f68cff am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '508e27bfd7f470a945978c2b24403b0827dcde18':
  Specify -mcpu=krait for clang.
2014-10-29 19:43:16 +00:00
Chih-Hung Hsieh
3b5261ac75 am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '6555580d35ac570005923866fb4035265a0b5b98':
  Raise x86 arch requirement to prescott.
2014-10-29 17:11:49 +00:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Ian Rogers
508e27bfd7 am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
2014-10-29 12:32:37 +00:00
Ian Rogers
e270873407 Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
2014-10-28 15:50:02 -07:00
Adam Lesinski
256ea6cad0 Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
automerge: 708e021

* commit '708e021a319eea4cb549a73745fafb9467776fcf':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 18:09:11 +00:00
Chih-Hung Hsieh
6555580d35 am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit 'ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
  Raise x86 arch requirement to prescott.
2014-10-28 04:46:49 +00:00
Adam Lesinski
b4efae440b Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
It's better practice to include the minimal set of windows APIs anyways
and we're not doing anything that requires more.

Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac
2014-10-27 14:26:35 -07:00
Neil Fuller
f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Chih-Hung Hsieh
ea503d21c7 Merge "Raise x86 arch requirement to prescott." 2014-10-23 20:47:30 +00:00
Neil Fuller
4dfda1fa42 Merge "Remove Java 6 build support" 2014-10-23 09:00:15 +00:00
Chih-Hung Hsieh
c248fa3e01 Raise x86 arch requirement to prescott.
Atomic functions used in external/libcxx/include/atomic when compiled with Clang
will require intrinsic functions exist only for prescott or newer CPUs.

BUG: 17530542
Change-Id: I0c9660ed2ffa75b940981eb8165d88934b39aec5
2014-10-22 15:25:49 -07:00
Neil Fuller
46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Ying Wang
89897723ea resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp
Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
2014-10-20 17:51:50 -07:00
Naseer Ahmed
3a2b9f0a49 core: OSX: Support 10.9 SDK as well
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
2014-10-20 17:34:49 -07:00
Stephen Hines
52b4d2f096 am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '7d86749da7033dcf230ceb67f9ae0cd676441e4d':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:30:27 +00:00
Stephen Hines
554e514c21 am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '7d86749da7033dcf230ceb67f9ae0cd676441e4d':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:30:08 +00:00
Stephen Hines
ed8206dba4 Merge "Remove unnecessary 10.8-specific build rules" 2014-10-20 18:06:35 +00:00
Dan Albert
ecc5e3218a am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.
2014-10-18 02:42:35 +00:00
Dan Albert
82f820e416 am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.
2014-10-18 02:42:07 +00:00
Stephen Hines
781094fa43 Remove unnecessary 10.8-specific build rules
We no longer need gcc for host builds, since those all run through clang. This
header include, however, triggers errors about SSE intrinsics by replacing
the more relevant include dirs that we should be using.

Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
2014-10-17 17:36:42 -07:00
Dan Albert
403ab71eba Fix breakage for x86_64 static executables.
Yikes. Don't know how this slipped through code review.

I had actually mentioned a need for cleanup in this part of the build
system earlier, since the amount of duplication between
transform-o-to-* for each arch means we might fix things incorrectly
in one of them (as I've just shown). Similarly, code reviewers are
likely to skim each one after the first if they all look close enough
(which is presumably what happened here).

Change-Id: I9b85914510f0b114485021deb97f42740712aae5
2014-10-17 16:58:38 -07:00
Ian Rogers
7cbe40efbb am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:11 +00:00
Ian Rogers
1bd593ca0b am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:13:05 +00:00
Ian Rogers
63e551f0ae Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.

Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
2014-10-15 15:44:16 -07:00
Dan Albert
a8abcb365b resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp
Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea
2014-10-14 17:17:22 -07:00
Dan Albert
ae66eba6f3 resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
2014-10-14 17:15:17 -07:00
Dan Albert
e1b17e7ef5 Link compiler-rt in the correct order.
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.

Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
2014-10-14 10:45:33 -07:00
Elliott Hughes
9b5e64a808 am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
  Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:43 +00:00
Elliott Hughes
337dd2e637 am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
  Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:42 +00:00
Alexander Ivchenko
ae2d47a47f Remove "-mstackrealign" option from all x86 builds.
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/

Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-10-13 19:08:01 +04:00
Dan Albert
ddbf420dae am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 19:28:48 +00:00
Dan Albert
cb6992b4b4 am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 18:46:03 +00:00
Dan Albert
ec1b90f81f Stash original values of CC and CXX.
This way we can still access the real compiler as opposed to a wrapped
one.

Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
2014-10-06 10:43:29 -07:00
Stephen Hines
5a217a9a10 am dcc376ab: am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit 'dcc376abc3a085339e89faccccef61aaf8336966':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-02 12:41:49 +00:00
Stephen Hines
f075ad906d am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '07a11d31f0baa355f9c3da60f965a56ff1d125e5':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-01 23:01:30 +00:00
Dan Albert
21ba3a3b66 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:54:43 +00:00
Dan Albert
3a4ae05422 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:50:08 +00:00
Dan Albert
2251ea40ba Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
2014-10-01 10:12:25 -07:00
Stephen Hines
dc64c7b460 Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug: 14416410

prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".

Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
2014-09-30 02:38:41 -07:00
Ian Rogers
ed51a9d21e am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit 'd1f73b018d3815eec54a6614a57ff3e25bbaf64a':
  Test __GLIBC__ is defined before using its value.
2014-09-26 15:53:57 +00:00
Ian Rogers
740e46b549 am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit 'd1f73b018d3815eec54a6614a57ff3e25bbaf64a':
  Test __GLIBC__ is defined before using its value.
2014-09-26 15:53:12 +00:00
Ian Rogers
850a4cb72b Test __GLIBC__ is defined before using its value.
Avoids -Wundef warning.

Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
2014-09-25 17:34:40 -07:00
Dan Albert
b43af8807f resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp
Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c
2014-09-24 09:51:05 -07:00
Dan Albert
7655a97984 resolved conflicts for merge of 326f9450 to lmp-dev-plus-aosp
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
2014-09-24 09:42:39 -07:00
Dan Albert
3302924802 Merge "Add option for generating coverage info." 2014-09-24 16:03:27 +00:00
Dan Albert
4bbc6c790b Add option for generating coverage info.
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.

Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.

This is currently not supported for clang (b/17574078, b/17583330).

If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.

Bug: 10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
2014-09-23 15:19:02 -07:00
Elliott Hughes
c679451484 am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:37:19 +00:00
Elliott Hughes
f811b82b4d am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:37:05 +00:00
Elliott Hughes
8fe8dc83e3 Remove unused HAVE_OFF64_T.
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
2014-09-23 13:36:01 -07:00
Elliott Hughes
c1dd3578a7 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
2014-09-23 16:17:33 +00:00
Elliott Hughes
0b1529d064 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
2014-09-23 16:16:48 +00:00
Elliott Hughes
76ab00f189 Remove the unused IPC macros.
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.

Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
2014-09-22 20:43:32 -07:00
Elliott Hughes
c08b4f0389 am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
2014-09-23 02:09:15 +00:00
Elliott Hughes
ff9fd2c3ed am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
2014-09-23 02:07:01 +00:00
Todd Poynor
9c226d1f9e build: remove HAVE_OOM_ADJ
This define is no longer used.

Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
2014-09-22 18:47:48 -07:00
Elliott Hughes
6666562c27 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:17:04 +00:00
Elliott Hughes
ae9c91b8b1 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:11:08 +00:00
Elliott Hughes
e2f5470606 Merge "Remove unused HAVE_EPOLL." 2014-09-19 22:54:17 +00:00
Elliott Hughes
67839a58be Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.

Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
2014-09-19 15:12:56 -07:00
Dan Albert
220b01ba27 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:16:16 +00:00
Dan Albert
46edd9b103 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
2014-09-19 00:15:23 +00:00
Dan Albert
b05f2ca150 Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).

The selection of the STL is as follows:

    if LOCAL_CXX_STL == 'default'
      ifdef LOCAL_SDK_VERSION
        Use whatever STL the other NDK options have selected.
      else
        Use bionic's libstdc++ for target, GNU libstdc++ for host. This
        is compatible with the existing build options.
      endif
    else
      if LOCAL_CXX_STL == 'stlport'
        Use stlport.
      else if LOCAL_CXX_STL == 'libc++'
        Use libc++.
      else if LOCAL_CXX_STL == ''
        Don't use any STL.
      endif
    endif

Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-18 16:38:20 -07:00
Alexander Ivchenko
4ee006e012 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
(cherry picked from commit 388dce3192)
2014-09-10 11:50:21 -07:00
Ying Wang
a33c6151b0 am ecc28e95: am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit 'ecc28e9525e869f72ea0b1c70250db32d2d81e0a':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
2014-09-10 17:16:58 +00:00
Alexander Ivchenko
388dce3192 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
2014-09-09 17:27:32 +04:00
Andrew Hsieh
360b851034 Change mips64 default to mips64r6 from mips64r2
Also add back mips flags previously can't be handled by clang

See aosp/build
  13066a8d4c
  10326b3d7f

Change-Id: Iedc8dadd24f72fbd9c5589eec34677c1827290f3
2014-09-04 19:01:22 -07:00
Ying Wang
180b22590d am 729c9ff5: am 7754e0ce: Merge "[MIPS64] Modify the default MIPS64 build to MIPS64R6."
* commit '729c9ff5ec2085461027a5174d053e77b8c9a100':
  [MIPS64] Modify the default MIPS64 build to MIPS64R6.
2014-09-03 19:59:17 +00:00
Raghu Gandham
10326b3d7f [MIPS64] Modify the default MIPS64 build to MIPS64R6.
Change-Id: I797e4c2e5b69c6991545c26886b5b25e6f8c2a67
2014-09-02 16:30:00 -07:00
Ying Wang
7e5b951e4b am 33f14e60: am 7852b80c: Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don\'t support 64-bit on old Atom."
* commit '33f14e60729443b8c3958ea4246c914fc18891f9':
  Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom.
2014-09-01 18:10:33 +00:00
Ying Wang
7852b80c05 Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom." 2014-09-01 17:47:55 +00:00
Dehao Chen
19aa0acbf4 am 2d83365c: Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov." into lmp-dev
* commit '2d83365c9d852874bee790e2047178959933133e':
  Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
2014-08-21 17:52:54 +00:00
Elliott Hughes
5ba5283aee am 9f6ae4ba: am d61f0ffd: Merge "HAVE_FUTEX is unused."
* commit '9f6ae4ba5379df08d3bd6f60878718598bfa76d7':
  HAVE_FUTEX is unused.
2014-08-21 05:21:37 +00:00
Elliott Hughes
8f36565bc9 am 242f0540: am a9ec8350: Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP."
* commit '242f054094c5cafcd1d92c7ab1ed7b4459aedbf3':
  Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
2014-08-21 04:35:00 +00:00
Elliott Hughes
d397f4ec9f am 3a2fc08d: am 10f5a420: Merge "HAVE_OPEN_MEMSTREAM is no longer used."
* commit '3a2fc08ddcbc9ddec1fa65722515501a406afbf4':
  HAVE_OPEN_MEMSTREAM is no longer used.
2014-08-21 04:34:58 +00:00
Elliott Hughes
0fa6a4063d HAVE_FUTEX is unused.
I missed this the other day.

Change-Id: Ifb6912de3aae6d03593ffb08d8d9555dc9e53f4d
2014-08-20 21:26:19 -07:00
Elliott Hughes
a9ec8350b0 Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP." 2014-08-21 04:20:34 +00:00
Elliott Hughes
70f3f33c2d Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
https://android-review.googlesource.com/104945 removes the only user.

Change-Id: I303d941036ab889ab747f26561506a5e1c93f0c2
2014-08-20 20:21:29 -07:00
Dehao Chen
f4294cd816 Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
Change-Id: I33a94abe58391a8564ada14417b0158ddd7ed2d6
2014-08-20 16:48:17 -07:00
Elliott Hughes
31c667ed3a HAVE_OPEN_MEMSTREAM is no longer used.
Bug: 17164505
Change-Id: I8055e52019d8cdea957d0fb8cbd46ca9b52564e1
2014-08-20 16:17:28 -07:00
Dehao Chen
dcb92358c8 am 67ce4110: Merge "Check existance of profile directory for specific device." into lmp-dev
* commit '67ce41105eac775f90b129a295489a2ae3265cd1':
  Check existance of profile directory for specific device.
2014-08-18 23:12:25 +00:00
Elliott Hughes
1653580011 am ccf7c39d: am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."
* commit 'ccf7c39d628ca5a2070c8f7972178156460d6125':
  Remove unused entries from AndroidConfig.h.
2014-08-18 19:52:55 +00:00
Elliott Hughes
9b691ad231 am e70f4ed1: am f8d88579: Merge "Remove HAVE_GETTID."
* commit 'e70f4ed1d1bd558e04ab7ae181e7197c4e46e1b0':
  Remove HAVE_GETTID.
2014-08-18 19:34:51 +00:00
Elliott Hughes
032ac32bdb Remove unused entries from AndroidConfig.h.
We should probably try to remove these files completely, but this at
least takes care of the stuff that's completely obsolete.

Change-Id: Ic71b7b491c119963068294e258dc6afe5a45b40d
2014-08-18 12:18:59 -07:00
Elliott Hughes
1ac1401a06 Remove HAVE_GETTID.
Bug: 17048545
Change-Id: Ib5b72ecb451a26cb393147a44601566400ca1dd6
2014-08-18 10:49:12 -07:00
Dehao Chen
4e8f2ea6e8 Check existance of profile directory for specific device.
Change-Id: I149c257e98c8483b79f2afc1e5b871731f6f6519
2014-08-18 09:43:42 -07:00
Dan Albert
04cf315970 Inhibit implicit -Bsymolic in -shared.
Bug: 16853291

Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
(cherry picked from commit b6bb71b85d)
2014-08-08 08:15:19 -07:00
Dan Albert
908ab54fda Fix uses of -fPIC and -fPIE.
We've been using -fPIC and -fPIE together in the global cflags all this
time. These options are incompatible. The only reason we haven't been
hit by this before is because of the forced -Bsymbolic in GCC. To fix
this, pass -fpic when compiling objects for shared libraries and -fpie
when compiling objects for executables. For static libraries, also use
-fpic. We have to do this because static libraries might be included in
either a shared library or an executable. Code compiled with -fpie
cannot be included in a shared library, but code compiled with -fpic
may be included in an executable.

We've also been using -fpic and -fPIC together. These are different
options, and only the latter will take effect.
http://stackoverflow.com/a/967010

The final thing this fixes is that we had -f(PIC|PIE) flags being passed
to link commands. These are compile time flags, and don't do anything at
link time.

Bug: 16823325
Change-Id: Ic76f47e63dc2c81b7e1a8058bae1b3dc8565d606
(cherry picked from commit 4803ce2696)
2014-08-08 08:15:14 -07:00
Ying Wang
5a5d443f15 am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
  Consistent use of USE_MINGW
2014-08-08 03:26:07 +00:00