|
 |
f7dd65 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f7dd65 |
From: Merlin Mathesius <mmathesi@redhat.com>
|
|
|
f7dd65 |
Date: Wed, 13 May 2020 08:02:27 -0500
|
|
|
f7dd65 |
Subject: [PATCH] Workaround multiple definition of symbol errors
|
|
|
f7dd65 |
|
|
|
f7dd65 |
---
|
|
|
f7dd65 |
com32/cmenu/Makefile | 2 +-
|
|
|
f7dd65 |
com32/elflink/ldlinux/Makefile | 2 +-
|
|
|
f7dd65 |
com32/gpllib/Makefile | 2 +-
|
|
|
f7dd65 |
com32/hdt/Makefile | 2 +-
|
|
|
f7dd65 |
core/Makefile | 2 +-
|
|
|
f7dd65 |
dos/Makefile | 2 +-
|
|
|
f7dd65 |
efi/Makefile | 2 +-
|
|
|
f7dd65 |
7 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
f7dd65 |
|
|
|
f7dd65 |
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
|
|
|
f7dd65 |
index b81b68ed..2ae989c4 100644
|
|
|
f7dd65 |
--- a/com32/cmenu/Makefile
|
|
|
f7dd65 |
+++ b/com32/cmenu/Makefile
|
|
|
f7dd65 |
@@ -49,7 +49,7 @@ makeoutputdirs:
|
|
|
f7dd65 |
@mkdir -p $(OBJ)/libmenu
|
|
|
f7dd65 |
|
|
|
f7dd65 |
libmenu/libmenu.elf: $(LIBMENU)
|
|
|
f7dd65 |
- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) \
|
|
|
f7dd65 |
+ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) \
|
|
|
f7dd65 |
-o $@ $^
|
|
|
f7dd65 |
|
|
|
f7dd65 |
tidy dist:
|
|
|
f7dd65 |
diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile
|
|
|
f7dd65 |
index 87c0d362..2be2a01a 100644
|
|
|
f7dd65 |
--- a/com32/elflink/ldlinux/Makefile
|
|
|
f7dd65 |
+++ b/com32/elflink/ldlinux/Makefile
|
|
|
f7dd65 |
@@ -33,7 +33,7 @@ endif
|
|
|
f7dd65 |
all: $(BTARGET) ldlinux_lnx.a
|
|
|
f7dd65 |
|
|
|
f7dd65 |
ldlinux.elf : $(OBJS)
|
|
|
f7dd65 |
- $(LD) $(LDFLAGS) -soname $(SONAME) -o $@ $^ $(LIBS)
|
|
|
f7dd65 |
+ $(LD) $(LDFLAGS) -z muldefs -soname $(SONAME) -o $@ $^ $(LIBS)
|
|
|
f7dd65 |
|
|
|
f7dd65 |
LNXCFLAGS += -D__export='__attribute__((visibility("default")))'
|
|
|
f7dd65 |
LNXLIBOBJS = get_key.lo
|
|
|
f7dd65 |
diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile
|
|
|
f7dd65 |
index 1fec9145..2d764d0b 100644
|
|
|
f7dd65 |
--- a/com32/gpllib/Makefile
|
|
|
f7dd65 |
+++ b/com32/gpllib/Makefile
|
|
|
f7dd65 |
@@ -24,7 +24,7 @@ makeoutputdirs:
|
|
|
f7dd65 |
$(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b))
|
|
|
f7dd65 |
|
|
|
f7dd65 |
libgpl.elf : $(LIBOBJS)
|
|
|
f7dd65 |
- $(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
|
|
|
f7dd65 |
+ $(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
|
|
|
f7dd65 |
|
|
|
f7dd65 |
tidy dist clean:
|
|
|
f7dd65 |
find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \
|
|
|
f7dd65 |
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
|
|
|
f7dd65 |
index 61736d05..1d947857 100644
|
|
|
f7dd65 |
--- a/com32/hdt/Makefile
|
|
|
f7dd65 |
+++ b/com32/hdt/Makefile
|
|
|
f7dd65 |
@@ -52,7 +52,7 @@ QEMU ?= qemu-kvm
|
|
|
f7dd65 |
all: $(MODULES) $(TESTFILES)
|
|
|
f7dd65 |
|
|
|
f7dd65 |
hdt.elf : $(OBJS) $(LIBS) $(C_LIBS)
|
|
|
f7dd65 |
- $(LD) $(LDFLAGS) -o $@ $^
|
|
|
f7dd65 |
+ $(LD) $(LDFLAGS) -z muldefs -o $@ $^
|
|
|
f7dd65 |
|
|
|
f7dd65 |
memtest:
|
|
|
f7dd65 |
-[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST)
|
|
|
f7dd65 |
diff --git a/core/Makefile b/core/Makefile
|
|
|
f7dd65 |
index 46cb037c..f0cfcbe9 100644
|
|
|
f7dd65 |
--- a/core/Makefile
|
|
|
f7dd65 |
+++ b/core/Makefile
|
|
|
f7dd65 |
@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
|
|
|
f7dd65 |
NASM_ELF = elf
|
|
|
f7dd65 |
|
|
|
f7dd65 |
%.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
|
|
|
f7dd65 |
- $(LD) $(LDFLAGS) -pie -Bsymbolic \
|
|
|
f7dd65 |
+ $(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \
|
|
|
f7dd65 |
-T $(LDSCRIPT) \
|
|
|
f7dd65 |
--unresolved-symbols=report-all \
|
|
|
f7dd65 |
-E --hash-style=gnu -M -o $@ $< \
|
|
|
f7dd65 |
diff --git a/dos/Makefile b/dos/Makefile
|
|
|
f7dd65 |
index 4c930d19..5d1c72ca 100644
|
|
|
f7dd65 |
--- a/dos/Makefile
|
|
|
f7dd65 |
+++ b/dos/Makefile
|
|
|
f7dd65 |
@@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk
|
|
|
f7dd65 |
CFLAGS += -D__MSDOS__ -mregparm=3 -DREGPARM=3
|
|
|
f7dd65 |
# CFLAGS += -DDEBUG
|
|
|
f7dd65 |
|
|
|
f7dd65 |
-LDFLAGS = -T $(SRC)/dosexe.ld
|
|
|
f7dd65 |
+LDFLAGS = -T $(SRC)/dosexe.ld -z muldefs
|
|
|
f7dd65 |
OPTFLAGS = -g
|
|
|
f7dd65 |
INCLUDES = -include code16.h -nostdinc -iwithprefix include \
|
|
|
f7dd65 |
-I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \
|
|
|
f7dd65 |
diff --git a/efi/Makefile b/efi/Makefile
|
|
|
f7dd65 |
index bbf23f24..3dd922d5 100644
|
|
|
f7dd65 |
--- a/efi/Makefile
|
|
|
f7dd65 |
+++ b/efi/Makefile
|
|
|
f7dd65 |
@@ -69,7 +69,7 @@ $(OBJS): | $(OBJ)/$(ARCH)
|
|
|
f7dd65 |
BTARGET = syslinux.efi
|
|
|
f7dd65 |
|
|
|
f7dd65 |
syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
|
|
|
f7dd65 |
- $(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi
|
|
|
f7dd65 |
+ $(LD) $(LDFLAGS) -z muldefs --strip-debug -o $@ $^ -lgnuefi -lefi
|
|
|
f7dd65 |
|
|
|
f7dd65 |
# We need to rename the .hash section because the EFI firmware
|
|
|
f7dd65 |
# linker really doesn't like it.
|