From 00bd66ef46b59a1623a293491a8b2c65a6d61975 Mon Sep 17 00:00:00 2001 From: Nigel Croxon Date: Mon, 24 Nov 2014 14:33:09 -0500 Subject: [PATCH] FreeBSD's binutils doesn't have "-j " support, so we need to include non-globbed versions of .rel/.rela individually. Signed-off-by: Peter Jones Signed-off-by: Bill Paul Signed-off-by: Nigel Croxon --- gnu-efi-3.0/Make.defaults | 7 +++++++ gnu-efi-3.0/Make.rules | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu-efi-3.0/Make.defaults b/gnu-efi-3.0/Make.defaults index 807205d..169273d 100644 --- a/gnu-efi-3.0/Make.defaults +++ b/gnu-efi-3.0/Make.defaults @@ -133,8 +133,15 @@ endif # Generic compilation flags INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ -I$(TOPDIR)/inc/protocol + +ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) +CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ + -ffreestanding -fno-stack-protector +else CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ -fno-merge-constants -ffreestanding -fno-stack-protector \ -fno-stack-check +endif + ASFLAGS += $(ARCH3264) LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings diff --git a/gnu-efi-3.0/Make.rules b/gnu-efi-3.0/Make.rules index 7113b3e..80edb3a 100644 --- a/gnu-efi-3.0/Make.rules +++ b/gnu-efi-3.0/Make.rules @@ -35,8 +35,9 @@ # %.efi: %.so - $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel* \ - -j .rela* -j .reloc $(FORMAT) $*.so $@ + $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \ + -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \ + -j .reloc $(FORMAT) $*.so $@ %.so: %.o $(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)