1 files changed, 17 insertions, 40 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index bece1f7535f2..a47fbd260ba4 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -70,9 +70,6 @@ cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -ml
 cflags-y        += $(call cc-option,-mno-fdpic)
 cflags-y        += $(isaflags-y) -ffreestanding
 
-cflags-$(CONFIG_MORE_COMPILE_OPTIONS)   += \
-        $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
-
 OBJCOPYFLAGS    := -O binary -R .note -R .note.gnu.build-id -R .comment \
                    -R .stab -R .stabstr -S
 
@@ -94,25 +91,35 @@ KBUILD_IMAGE		:= $(defaultimage-y)
 #
 ifdef CONFIG_SUPERH32
 UTS_MACHINE     := sh
+BITS            := 32
 LDFLAGS_vmlinux += -e _stext
 else
 UTS_MACHINE     := sh64
+BITS            := 64
 LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \
                    --defsym phys_stext_shmedia=phys_stext+1 \
                    -e phys_stext_shmedia
 endif
 
+ifneq ($(SUBARCH),$(ARCH))
+  ifeq ($(CROSS_COMPILE),)
+    CROSS_COMPILE := $(call cc-cross-prefix, $(UTS_MACHINE)-linux-  $(UTS_MACHINE)-linux-gnu-  $(UTS_MACHINE)-unknown-linux-gnu-)
+  endif
+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
 
-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
+export ld-bfd BITS
+
+head-y  := arch/sh/kernel/init_task.o arch/sh/kernel/head_$(BITS).o
 
 core-y                          += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
 core-$(CONFIG_SH_FPU_EMU)       += arch/sh/math-emu/
@@ -193,7 +200,7 @@ zImage uImage uImage.srec vmlinux.srec: vmlinux
 
 compressed: zImage
 
-archprepare: maketools arch/sh/lib64/syscalltab.h
+archprepare: maketools
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
@@ -205,34 +212,4 @@ define archhelp
         @echo '  uImage.srec               - Create an S-record for U-Boot'
 endef
 
-define filechk_gen-syscalltab
-       (set -e; \
-        echo "/*"; \
-        echo " * DO NOT MODIFY."; \
-        echo " *"; \
-        echo " * This file was generated by arch/sh/Makefile"; \
-        echo " * Any changes will be reverted at build time."; \
-        echo " */"; \
-        echo ""; \
-        echo "#ifndef __SYSCALLTAB_H"; \
-        echo "#define __SYSCALLTAB_H"; \
-        echo ""; \
-        echo "#include <linux/kernel.h>"; \
-        echo ""; \
-        echo "struct syscall_info {"; \
-        echo "  const char *name;"; \
-        echo "} syscall_info_table[] = {"; \
-        sed -e '/^.*\.long /!d;s//      { "/;s/\(\([^/]*\)\/\)\{1\}.*/\2/; \
-                s/[ \t]*$$//g;s/$$/" },/;s/\("\)sys_/\1/g'; \
-        echo "};"; \
-        echo ""; \
-        echo "#define NUM_SYSCALL_INFO_ENTRIES ARRAY_SIZE(syscall_info_table)";\
-        echo ""; \
-        echo "#endif /* __SYSCALLTAB_H */" )
-endef
-
-arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S
-        $(call filechk,gen-syscalltab)
-
-CLEAN_FILES += arch/sh/lib64/syscalltab.h \
-               include/asm-sh/machtypes.h
+CLEAN_FILES += include/asm-sh/machtypes.h