Commit Graph

1260 Commits

Author SHA1 Message Date
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
f3fb63577b am 2874d0ba: am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."
* commit '2874d0ba8c71a464629fc148908d8c59854212df':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
2014-11-07 18:41:41 +00: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
a5d7970715 am 18340084: am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '18340084172b98e44e44d994a2c326b2157c6c49':
  Revert "Continue to use march=i686 before fix of g++ ICE."
2014-10-30 18:38:51 +00: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
Chih-Hung Hsieh
be971fc19b Continue to use march=i686 before fix of g++ ICE.
BUG: 18174291
Change-Id: Idb76afd715b7b7049b9e47f92f2658f6923c8448
2014-10-29 13:57:33 -07:00
Ian Rogers
5f60710fc9 am c156f68c: am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit 'c156f68cffdbd4bfd0c064d99e9968c466bb7309':
  Specify -mcpu=krait for clang.
2014-10-29 19:56:48 +00: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
66cca24a2c am 3b5261ac: am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '3b5261ac75f7d8d912e92fcdfdd76534a9bbe41b':
  Raise x86 arch requirement to prescott.
2014-10-29 17:32:09 +00:00
Neil Fuller
c6adac18fe am c5c60e2c: am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'c5c60e2c2af542294d38dc0e2284115a62dbb310':
  Remove Java 6 build support
2014-10-29 17:32:08 +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
Ying Wang
f122cb8151 Merge "Support "LOCAL_FDO_SUPPORT := always"." 2014-10-28 22:47:30 +00:00
Ying Wang
45d0143ab1 Support "LOCAL_FDO_SUPPORT := always".
"LOCAL_FDO_SUPPORT := always" enables FDO without user specifying
"BUILD_FDO_OPTIMIZE := true", i.e. it turns on FDO for a
module in any build configuration.

Change-Id: I05d8db2edb2b3f5db073fa14d5bf1083a04571c0
2014-10-28 14:50:59 -07:00
Adam Lesinski
6143aeead0 am 256ea6ca: Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev automerge: 708e021
* commit '256ea6cad056df901785b8834c865fbb3f5afa71':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 19:18:18 +00: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
298baafdaa am 89897723: resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp
* commit '89897723ea6f197168c8aa4a58b5aa1b4ba635e1':
  core: OSX: Support 10.9 SDK as well
2014-10-21 00:58:08 +00: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
8ed26c3e98 am 52b4d2f0: am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '52b4d2f0964feea351e931a32a0671424dc00583':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:35:52 +00: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
934af716ac am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
automerge: ecc5e32

* commit 'ecc5e3218aeeeed423ec226c5c87c42e62ec931c':
  Fix breakage for x86_64 static executables.
2014-10-18 03:31:06 +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
b55201f2b6 am 7cbe40ef: am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit '7cbe40efbb192f52ac27d9d6cebe01d465704058':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
2014-10-16 20:16:29 +00: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
1b756930a2 am a8abcb36: resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp
* commit 'a8abcb365b8ea94c7672b09e851488d9454135ba':
  Link compiler-rt in the correct order.
2014-10-15 00:22:43 +00: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