[syslinux] [PATCH 4/4] core: Move linker script in arch-agnostic dir

celelibi at gmail.com
2015-10-05T18:15:05Z

As there is no need for an x86_64 linker script, the i386 one can be put
in the core directory directly.

This partially revert commit d8eede3f2a360163235fad222a0190cd7c5bef38
which splitted several linker scripts into i386 and x86_64 versions.

Signed-off-by: Sylvain Gault <sylvain.gault at gmail.com>
---
 core/Makefile               | 2 +-
 core/{i386 => }/syslinux.ld | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename core/{i386 => }/syslinux.ld (100%)

diff --git a/core/Makefile b/core/Makefile
index 26302fd..6fb6377 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -161,7 +161,7 @@ kwdhash.gen: keywords genhash.pl

 AUXLIBS = libisolinux.a libisolinux-debug.a libldlinux.a \
 	libpxelinux.a liblpxelinux.a
-LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
+LDSCRIPT = $(SRC)/syslinux.ld

 %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
 	$(LD) $(LDFLAGS) -Bsymbolic $(LD_PIE) -E --hash-style=gnu -T $(LDSCRIPT) -M -o
$@ $< \
diff --git a/core/i386/syslinux.ld b/core/syslinux.ld
similarity index 100%
rename from core/i386/syslinux.ld
rename to core/syslinux.ld
--
2.5.3