diff options
| author | David Turner <digit@android.com> | 2011-03-07 13:45:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-07 13:45:59 -0800 |
| commit | 1c908fa1889d82fd58548c6f0aba0676f3d7b7c8 (patch) | |
| tree | b592c42fcf049c12a6b0ec92d4b80c33d5cdc1b9 /core/combo | |
| parent | 64a8eb111819ebba18c2bbf3a5772f1795d2a477 (diff) | |
| parent | b9c627c6a0c6f0af57d0912175bfc739b0eb6249 (diff) | |
| download | build-1c908fa1889d82fd58548c6f0aba0676f3d7b7c8.zip build-1c908fa1889d82fd58548c6f0aba0676f3d7b7c8.tar.gz build-1c908fa1889d82fd58548c6f0aba0676f3d7b7c8.tar.bz2 | |
am b9c627c6: am 0683a773: Merge "x86: Use GCC 4.4.3"
* commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
x86: Use GCC 4.4.3
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 412ec69..b0cc80c 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -38,7 +38,7 @@ endif # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) TARGET_TOOLS_PREFIX := \ - prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-unknown-linux-gnu-4.2.1/bin/i686-unknown-linux-gnu- + prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin/i686-android-linux- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) @@ -51,8 +51,7 @@ TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-debug $< -o $@ ifneq ($(wildcard $(TARGET_CC)),) TARGET_LIBGCC := \ - $(shell $(TARGET_CC) -m32 -print-file-name=libgcc.a) \ - $(shell $(TARGET_CC) -m32 -print-file-name=libgcc_eh.a) + $(shell $(TARGET_CC) -m32 -print-file-name=libgcc.a) endif TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined @@ -85,7 +84,7 @@ TARGET_GLOBAL_CPPFLAGS += \ -fno-use-cxa-atexit ifeq ($(TARGET_ARCH_VARIANT),x86-atom) - TARGET_GLOBAL_CFLAGS += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2 -mfpmath=sse -msse2 + TARGET_GLOBAL_CFLAGS += -march=atom -mstackrealign -DUSE_SSSE3 -DUSE_SSE2 -mfpmath=sse else TARGET_GLOBAL_CFLAGS += -march=i686 endif |