summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2009-01-05 21:54:40 +0100
committerMichael Brown2009-01-05 21:54:40 +0100
commit21cfab4fb86d6313413097a54528dfd841b3e8e1 (patch)
tree7b3d2e279fe861c60c0f640fb14d0296e388d115
parent[infiniband] Call ib_open() only when opening the IPoIB net device (diff)
downloadipxe-21cfab4fb86d6313413097a54528dfd841b3e8e1.tar.gz
ipxe-21cfab4fb86d6313413097a54528dfd841b3e8e1.tar.xz
ipxe-21cfab4fb86d6313413097a54528dfd841b3e8e1.zip
[efi] Inhibit harmless ld warning on unresolved symbol check
The check for unresolved symbols does not explicitly specify an output architecture format, and so causes a warning when building an i386 EFI binary on an x86_64 platform. This warning is harmless, and specifying the output architecture in multiple places is cumbersome, so just inhibit the warning.
-rw-r--r--src/arch/i386/Makefile.efi3
-rw-r--r--src/arch/x86_64/Makefile.efi3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/i386/Makefile.efi b/src/arch/i386/Makefile.efi
index f1eb6fdf..fec7a407 100644
--- a/src/arch/i386/Makefile.efi
+++ b/src/arch/i386/Makefile.efi
@@ -16,7 +16,8 @@ NON_AUTO_MEDIA += efi
#
$(BIN)/%.efi.tmp-reloc : $(BIN)/%.efi.tmp $(EFILINK)
$(QM)$(ECHO) " [EFILINK] $@"
- $(Q)$(LD) -e 0 -o /dev/null $< # Check for unresolved symbols
+ $(Q)# Check for unresolved symbols
+ $(Q)$(LD) -e 0 --no-warn-mismatch -o /dev/null $<
$(Q)$(EFILINK) $< $@
$(BIN)/%.efi : $(BIN)/%.efi.tmp-reloc
diff --git a/src/arch/x86_64/Makefile.efi b/src/arch/x86_64/Makefile.efi
index 7e07088d..9b9b373f 100644
--- a/src/arch/x86_64/Makefile.efi
+++ b/src/arch/x86_64/Makefile.efi
@@ -20,7 +20,8 @@ NON_AUTO_MEDIA += efi
#
$(BIN)/%.efi.tmp-reloc : $(BIN)/%.efi.tmp $(EFILINK)
$(QM)$(ECHO) " [EFILINK] $@"
- $(Q)$(LD) -e 0 -o /dev/null $< # Check for unresolved symbols
+ $(Q)# Check for unresolved symbols
+ $(Q)$(LD) -e 0 --no-warn-mismatch -o /dev/null $<
$(Q)$(EFILINK) $< $@
$(BIN)/%.efi : $(BIN)/%.efi.tmp-reloc