From: Lukas Schwaighofer Date: Mon, 6 May 2019 00:43:10 +0200 Subject: Strip memtest and memcpy from libefi Repack libefi.a to not contain the memset and memcpy symbols to make sure the implementation from syslinux is used and no multiple symbol definitions are present. --- efi/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/efi/Makefile b/efi/Makefile index f4501e7..adae73f 100644 --- a/efi/Makefile +++ b/efi/Makefile @@ -43,8 +43,10 @@ CORE_OBJS += $(addprefix $(OBJ)/../core/, \ fs/pxe/pxe.o fs/pxe/tftp.o fs/pxe/urlparse.o fs/pxe/dhcp_option.o \ fs/pxe/ftp.o fs/pxe/ftp_readdir.o fs/pxe/http.o fs/pxe/http_readdir.o) +LIBEFI_STRIPPED = $(objdir)/libefi_stripped.a + LIB_OBJS = $(addprefix $(objdir)/com32/lib/,$(CORELIBOBJS)) \ - $(LIBEFI) + $(LIBEFI_STRIPPED) CSRC = $(sort $(wildcard $(SRC)/*.c)) OBJS = $(subst $(SRC)/,,$(filter-out %wrapper.o, $(patsubst %.c,%.o,$(CSRC)))) @@ -73,6 +75,13 @@ BTARGET = syslinux.efi syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS) $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi +$(LIBEFI_STRIPPED): $(LIBEFI) + cp $(LIBEFI) $(LIBEFI_STRIPPED) + ar x $(LIBEFI_STRIPPED) init.o + strip -N memset -N memcpy init.o + ar r $(LIBEFI_STRIPPED) init.o + rm init.o + # We need to rename the .hash section because the EFI firmware # linker really doesn't like it. # $(OBJCOPY) --rename-section .gnu.hash=.sdata,load,data,alloc $^ $@