Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[sfrench/cifs-2.6.git] / arch / sparc64 / Makefile

diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index cad10c5b83d341b1f36d3ebe2f31ab59a33f6824..f0c22f82698299c0143b263848828d7fd0834016 100644 (file)
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -12,44 +12,16 @@ CHECKFLAGS  += -D__sparc__ -D__sparc_v9__ -m64
 
 CPPFLAGS_vmlinux.lds += -Usparc
 
-CC             := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo $(CC); else echo sparc64-linux-gcc; fi )
-
-NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow)
-NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
-UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; )
-
-export NEW_GCC
-
-ifneq ($(NEW_GAS),y)
-AS             = sparc64-linux-as
-LD             = sparc64-linux-ld
-NM             = sparc64-linux-nm
-AR             = sparc64-linux-ar
-RANLIB         = sparc64-linux-ranlib
-else
-AS             := $(AS) -64
 LDFLAGS                := -m elf64_sparc
-endif
 
-ifneq ($(UNDECLARED_REGS),y)
-CC_UNDECL      =
-else
-CC_UNDECL      = -Wa,--undeclared-regs
-AS             := $(AS) --undeclared-regs
-endif
-
-ifneq ($(NEW_GCC),y)
-  CFLAGS := $(CFLAGS) -pipe -mno-fpu -mtune=ultrasparc -mmedlow \
-           -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare
-else
-  CFLAGS := $(CFLAGS) -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow \
-           -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare \
-           $(CC_UNDECL)
-  AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL)
-endif
+KBUILD_CFLAGS += -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow \
+       -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare \
+       -Wa,--undeclared-regs
+KBUILD_CFLAGS += $(call cc-option,-mtune=ultrasparc3)
+KBUILD_AFLAGS += -m64 -mcpu=ultrasparc -Wa,--undeclared-regs
 
 ifeq ($(CONFIG_MCOUNT),y)
-  CFLAGS := $(CFLAGS) -pg
+  KBUILD_CFLAGS += -pg
 endif
 
 head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
@@ -58,8 +30,6 @@ core-y                                += arch/sparc64/kernel/ arch/sparc64/mm/
 core-$(CONFIG_SOLARIS_EMUL)    += arch/sparc64/solaris/
 core-y                         += arch/sparc64/math-emu/
 libs-y                         += arch/sparc64/prom/ arch/sparc64/lib/
-
-# FIXME: is drivers- right?
 drivers-$(CONFIG_OPROFILE)     += arch/sparc64/oprofile/
 
 boot := arch/sparc64/boot