Commit 7b022d07 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy up the ldscript output format specifier. 



Tie this in to the Makefile directly, where we already know what we are
running on. This tidies up the linker script a bit, and is prep work for
unifying the arch/sh/boot/compressed linker scripts.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent dce97c8c

arch/sh/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -100,13 +100,17 @@ LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \ 
endif



ifdef CONFIG_CPU_LITTLE_ENDIAN

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64'

ld-bfd			:= elf32-$(UTS_MACHINE)-linux

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64' --oformat $(ld-bfd)

LDFLAGS			+= -EL

else

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64+4'

ld-bfd			:= elf32-$(UTS_MACHINE)big-linux

LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64+4' --oformat $(ld-bfd)

LDFLAGS			+= -EB

endif



export ld-bfd



head-y			:= arch/sh/kernel/init_task.o

head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o

head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o

arch/sh/boot/compressed/Makefile_32

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) 
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds

LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \

		   -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE

	$(call if_changed,ld)

arch/sh/boot/compressed/Makefile_64

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ OBJECTS := $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \ 
ZIMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]')



LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \

LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(ZIMAGE_OFFSET) -e startup \

		   -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE

arch/sh/kernel/vmlinux.lds.S

+1 −5
Original line number Diff line number Diff line
@@ -6,12 +6,8 @@ 
#define LOAD_OFFSET	CONFIG_PAGE_OFFSET

OUTPUT_ARCH(sh:sh5)

#else

#define LOAD_OFFSET	0

OUTPUT_ARCH(sh)

#ifdef CONFIG_CPU_LITTLE_ENDIAN

OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")

#else

OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")

#endif

#endif



#include <asm/thread_info.h>