diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /arch/sparc64/kernel/Makefile | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'arch/sparc64/kernel/Makefile')
| -rw-r--r-- | arch/sparc64/kernel/Makefile | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile index 9e9013735..aecb9fd47 100644 --- a/arch/sparc64/kernel/Makefile +++ b/arch/sparc64/kernel/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.28 1997/07/05 09:52:20 davem Exp $ +# $Id: Makefile,v 1.30 1997/07/24 14:48:04 davem Exp $ # Makefile for the linux kernel. # # Note! Dependencies are done automagically by 'make dep', which also @@ -7,12 +7,24 @@ # # Note 2! The CFLAGS definitions are now in the main makefile... +ifdef SMP + +.S.s: + $(CPP) -D__ASSEMBLY__ $(AFLAGS) -ansi $< -o $*.s + +.S.o: + $(CC) -D__ASSEMBLY__ $(AFLAGS) -ansi -c $< -o $*.o + +else + .S.s: $(CPP) -D__ASSEMBLY__ -ansi $< -o $*.s .S.o: $(CC) -D__ASSEMBLY__ -ansi -c $< -o $*.o +endif + all: kernel.o head.o init_task.o O_TARGET := kernel.o @@ -22,6 +34,10 @@ O_OBJS := process.o setup.o cpu.o idprom.o \ unaligned.o sys_sunos32.o sunos_ioctl32.o OX_OBJS := sparc64_ksyms.o +ifdef SMP +O_OBJS += smp.o trampoline.o +endif + ifdef CONFIG_SPARC32_COMPAT O_OBJS += sys32.o sys_sparc32.o signal32.o ioctl32.o endif @@ -36,7 +52,7 @@ endif head.o: head.S ttable.S itlb_miss.S dtlb_miss.S dtlb_prot.S etrap.S rtrap.S \ winfixup.S entry.S - $(CC) -D__ASSEMBLY__ -ansi -c $*.S -o $*.o + $(CC) -D__ASSEMBLY__ $(AFLAGS) -ansi -c $*.S -o $*.o # # This is just to get the dependencies... |