kbuild: arch/sparc64 cleanup / O_TARGET removal

arch/sparc64/Makefile

@@ -57,25 +57,10 @@ endif
 
 HEAD := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
 
-SUBDIRS += arch/sparc64/kernel arch/sparc64/lib arch/sparc64/mm \
-	arch/sparc64/prom
-
-ifneq ($(CONFIG_SOLARIS_EMUL),n)
-  SUBDIRS += arch/sparc64/solaris
-endif
-
-SUBDIRS += arch/sparc64/math-emu
-
-CORE_FILES := arch/sparc64/kernel/kernel.o arch/sparc64/mm/mm.o $(CORE_FILES)
-
-ifeq ($(CONFIG_SOLARIS_EMUL),y)
-  CORE_FILES += arch/sparc64/solaris/solaris.o
-endif
-
-CORE_FILES += arch/sparc64/math-emu/math-emu.o
-
-LIBS := $(TOPDIR)/lib/lib.a $(LIBS) $(TOPDIR)/arch/sparc64/prom/lib.a \
-	$(TOPDIR)/arch/sparc64/lib/lib.a
+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/
 
 vmlinux.aout: vmlinux
 	$(ELFTOAOUT) -o $(TOPDIR)/vmlinux.aout $(TOPDIR)/vmlinux

arch/sparc64/kernel/Makefile

@@ -6,7 +6,6 @@ SH = $(CONFIG_SHELL)
 
 EXTRA_AFLAGS := -ansi
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= sparc64_ksyms.o

arch/sparc64/math-emu/Makefile

 #
 # Makefile for the FPU instruction emulation.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := math-emu.o
 obj-y    := math.o
 
 EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w

arch/sparc64/mm/Makefile

@@ -4,7 +4,6 @@
 
 EXTRA_AFLAGS := -ansi
 
-O_TARGET := mm.o
 obj-y    := ultra.o fault.o init.o generic.o extable.o modutil.o
 
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o