summaryrefslogtreecommitdiff
path: root/Rules.mak
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-04 15:18:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-04 15:18:54 +0200
commit36043b37739dffdaea8d31457570810e492268d7 (patch)
tree0045cba85b862ecca89cf7b5aff336bddbabad89 /Rules.mak
parenta5352e212fcd4da83c8ff4fe542ef23c8e3187f8 (diff)
parent6d550ddd129b18cf800eab604f74536754526cd8 (diff)
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'Rules.mak')
-rw-r--r--Rules.mak7
1 files changed, 5 insertions, 2 deletions
diff --git a/Rules.mak b/Rules.mak
index 19cc38a1e..cb657008c 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -201,7 +201,7 @@ check_as=$(shell \
if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
then echo "-Wa,$(1)"; fi)
check_ld=$(shell \
- if $(CC) $(LDFLAG-fuse-ld) -Wl,$(1) $(CFLAG_-nostdlib) -o /dev/null -Wl,-b,binary /dev/null > /dev/null 2>&1; \
+ if $(CC) $(LDFLAG-fuse-ld) $(CFLAG_-Wl--no-warn-mismatch) -Wl,$(1) $(CFLAG_-nostdlib) -o /dev/null -Wl,-b,binary /dev/null > /dev/null 2>&1; \
then echo "$(1)"; fi)
# Use variable indirection here so that we can have variable
@@ -254,8 +254,11 @@ ARFLAGS:=cr
# Note: The check for -nostdlib has to be before all calls to check_ld
$(eval $(call check-gcc-var,-nostdlib))
-LDFLAG-fuse-ld := $(filter -fuse-ld=%,$(EXTRA_UCLIBC_FLAGS))
# deliberately not named CFLAG-fuse-ld since unchecked and from user
+LDFLAG-fuse-ld := $(filter -fuse-ld=%,$(EXTRA_UCLIBC_FLAGS))
+# failed to merge target specific data of file /dev/null
+# Could use -Wl,--script,$(top_srcdir)extra/scripts/none.lds as well.
+$(eval $(call check-ld-var,--no-warn-mismatch))
# Flags in OPTIMIZATION are used only for non-debug builds