FreeBSD's binutils doesn't have "-j <glob>" support, so we need to

include non-globbed versions of .rel/.rela individually.

Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Bill Paul <wpaul@windriver.com>
Signed-off-by: Nigel Croxon <nigel.croxon@hp.com>
This commit is contained in:
Nigel Croxon 2014-11-24 14:33:09 -05:00
parent 56eb64d3c0
commit 00bd66ef46
2 changed files with 10 additions and 2 deletions

View File

@ -133,8 +133,15 @@ endif
# Generic compilation flags # Generic compilation flags
INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
-I$(TOPDIR)/inc/protocol -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 \ CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
-fno-merge-constants -ffreestanding -fno-stack-protector \ -fno-merge-constants -ffreestanding -fno-stack-protector \
-fno-stack-check -fno-stack-check
endif
ASFLAGS += $(ARCH3264) ASFLAGS += $(ARCH3264)
LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings

View File

@ -35,8 +35,9 @@
# #
%.efi: %.so %.efi: %.so
$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel* \ $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
-j .rela* -j .reloc $(FORMAT) $*.so $@ -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
-j .reloc $(FORMAT) $*.so $@
%.so: %.o %.so: %.o
$(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES) $(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)