Commit Graph

1271 Commits

Author SHA1 Message Date
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
Elliott Hughes
e86ee5e707 am 9b5e64a8: am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
* commit '9b5e64a80878131dbf1e78d92565f4c39bff5c63':
  Remove "-mstackrealign" option from all x86 builds.
2014-10-13 23:18:17 +00: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
462bd5fcb3 am ddbf420d: am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'ddbf420dae697510ea4d4b91f8082cd1396ccb8d':
  Stash original values of CC and CXX.
2014-10-06 19:31:16 +00: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
b3a33ab8a1 am 5a217a9a: am dcc376ab: am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '5a217a9a105c861682e1bbd6017804ea6db66d24':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-02 12:52:11 +00: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
bb27be166f am 21ba3a3b: am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '21ba3a3b6624d377ed886291af96a1cdb8d042ba':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:58:06 +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
5c00e9cf5c am 740e46b5: am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit '740e46b549e170bec96c1a7103ccf51bd84ab908':
  Test __GLIBC__ is defined before using its value.
2014-09-26 16:01:58 +00: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
3beb83e518 am b43af880: resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp
* commit 'b43af8807f5420d9f4abc62f40f5fd8780fd9932':
  Add option for generating coverage info.
2014-09-24 17:25:56 +00: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
09b04f372f am c6794514: am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit 'c679451484b9450f53bbef4ec0cb3de64671f974':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:47:44 +00: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
eb06275e16 am c1dd3578: am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit 'c1dd3578a7a014be94f57a3d64cf389db9edec3d':
  Remove the unused IPC macros.
2014-09-23 19:08:01 +00:00
Elliott Hughes
b1db3ccef8 am ff9fd2c3: am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit 'ff9fd2c3edc5db2f7fd15d17bee083d4b2006327':
  build: remove HAVE_OOM_ADJ
2014-09-23 16:20:23 +00: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
2cf3f3afdf am 6666562c: am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '6666562c275f854efbab580ad16ab7b38932fdf3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:41:08 +00: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