Merge "Do not resolve to real/absolute link in GCC 4.6 / 4.7"
diff --git a/toolchains/arm-linux-androideabi-4.6/setup.mk b/toolchains/arm-linux-androideabi-4.6/setup.mk
index 3c2f017..26596db 100644
--- a/toolchains/arm-linux-androideabi-4.6/setup.mk
+++ b/toolchains/arm-linux-androideabi-4.6/setup.mk
@@ -29,9 +29,10 @@
-funwind-tables \
-fstack-protector \
-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
- -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+ -no-canonical-prefixes
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/arm-linux-androideabi-4.7/setup.mk b/toolchains/arm-linux-androideabi-4.7/setup.mk
index aaa1f08..d6c2e88 100644
--- a/toolchains/arm-linux-androideabi-4.7/setup.mk
+++ b/toolchains/arm-linux-androideabi-4.7/setup.mk
@@ -29,9 +29,10 @@
-funwind-tables \
-fstack-protector \
-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
- -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+ -no-canonical-prefixes
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
index 282e2ed..2a47cc2 100644
--- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk
+++ b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
@@ -53,10 +53,12 @@
-funwind-tables \
-fstack-protector \
-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
- -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+ -no-canonical-prefixes
TARGET_LDFLAGS := \
- -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT))
+ -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
+ -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-4.6/setup.mk b/toolchains/mipsel-linux-android-4.6/setup.mk
index 5aa74f9..c764e92 100644
--- a/toolchains/mipsel-linux-android-4.6/setup.mk
+++ b/toolchains/mipsel-linux-android-4.6/setup.mk
@@ -34,8 +34,9 @@
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
+ -no-canonical-prefixes
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-4.7/setup.mk b/toolchains/mipsel-linux-android-4.7/setup.mk
index 6cdc1de..fbff3b0 100644
--- a/toolchains/mipsel-linux-android-4.7/setup.mk
+++ b/toolchains/mipsel-linux-android-4.7/setup.mk
@@ -34,8 +34,9 @@
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
+ -no-canonical-prefixes
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk
index b61b38c..56115c5 100644
--- a/toolchains/mipsel-linux-android-clang3.1/setup.mk
+++ b/toolchains/mipsel-linux-android-clang3.1/setup.mk
@@ -56,11 +56,13 @@
-finline-functions \
-ffunction-sections \
-funwind-tables \
- -fmessage-length=0
+ -fmessage-length=0 \
+ -no-canonical-prefixes
TARGET_LDFLAGS := \
-gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
- -target $(LLVM_TRIPLE)
+ -target $(LLVM_TRIPLE) \
+ -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
diff --git a/toolchains/x86-4.6/setup.mk b/toolchains/x86-4.6/setup.mk
index 4b9b53f..c52bcad 100644
--- a/toolchains/x86-4.6/setup.mk
+++ b/toolchains/x86-4.6/setup.mk
@@ -28,13 +28,14 @@
TARGET_CFLAGS := \
-ffunction-sections \
- -funwind-tables
+ -funwind-tables \
+ -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
# Add and LDFLAGS for the target here
-# TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_CFLAGS += -fstack-protector
diff --git a/toolchains/x86-4.7/setup.mk b/toolchains/x86-4.7/setup.mk
index 46f2eb7..da26fa3 100644
--- a/toolchains/x86-4.7/setup.mk
+++ b/toolchains/x86-4.7/setup.mk
@@ -28,13 +28,14 @@
TARGET_CFLAGS := \
-ffunction-sections \
- -funwind-tables
+ -funwind-tables \
+ -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
# Add and LDFLAGS for the target here
-# TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
TARGET_CFLAGS += -fstack-protector
diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk
index ccfdbda..40e3c08 100644
--- a/toolchains/x86-clang3.1/setup.mk
+++ b/toolchains/x86-clang3.1/setup.mk
@@ -50,7 +50,8 @@
-ffunction-sections \
-funwind-tables \
-fstack-protector \
- -fPIC
+ -fPIC \
+ -no-canonical-prefixes
TARGET_C_INCLUDES := \
$(SYSROOT)/usr/include
@@ -58,7 +59,8 @@
# Add and LDFLAGS for the target here
TARGET_LDFLAGS := \
-gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
- -target $(LLVM_TRIPLE)
+ -target $(LLVM_TRIPLE) \
+ -no-canonical-prefixes
TARGET_x86_release_CFLAGS := -O2 \
-g \
