[parisc-linux-cvs] Move parisc64 to parisc

Matthew Wilcox willy@ldl.fc.hp.com
Thu, 01 Mar 2001 17:50:10 -0700


There's no point in posting the parts of the diff that just move files.
These are the only other changes.

Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile	2001/02/26 18:07:59	1.22
+++ Makefile	2001/03/02 00:33:38
@@ -24,7 +24,11 @@ FINAL_LD=$(CROSS_COMPILE)ld --warn-commo
 CPP=$(CC) -E
 OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
 LDFLAGS =
+ifdef CONFIG_PARISC64
+LINKFLAGS =-T $(TOPDIR)/arch/parisc/vmlinux64.lds $(LDFLAGS)
+else
 LINKFLAGS =-T $(TOPDIR)/arch/parisc/vmlinux.lds $(LDFLAGS)
+endif
 
 CFLAGS_PIPE := -pipe
 CFLAGS_NSR  := -fno-strength-reduce
@@ -52,20 +56,24 @@ endif
 
 ifdef CONFIG_PA8X00
 CFLAGS += -march=2.0 -mschedule=8000
-  ifdef CONFIG_PARISC64
-  CROSS_COMPILE := hppa64-linux-
-  endif
 endif
 
 ASFLAGS := -D__ASSEMBLY__ -traditional
 
-HEAD = arch/parisc/kernel/head.o 
+HEAD := arch/parisc/kernel/head.o 
 
 SUBDIRS := $(SUBDIRS) $(addprefix arch/parisc/, tools kernel mm lib hpux)
 CORE_FILES :=  $(addprefix arch/parisc/, kernel/pdc_cons.o kernel/process.o \
 	lib/lib.a mm/mm.o kernel/kernel.o hpux/hpux.o) \
 	$(CORE_FILES) arch/parisc/kernel/init_task.o
 CLEAN_FILES := $(CLEAN_FILES) arch/parisc/tools/offset.[hs] include/asm-parisc/offset.h*
+
+ifdef CONFIG_PARISC64
+CROSS_COMPILE := hppa64-linux-
+#CFLAGS += -b hppa64-linux
+HEAD := arch/parisc/kernel/head64.o
+endif
+
 LIBS := `$(CC) -print-libgcc-file-name` $(TOPDIR)/arch/parisc/lib/lib.a $(LIBS) 
 
 ifdef CONFIG_MATH_EMULATION
Index: kernel/Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile	2001/01/28 04:16:39	1.30
+++ Makefile	2001/03/02 00:33:38
@@ -7,7 +7,11 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
+ifdef CONFIG_PARISC64
+all: kernel.o init_task.o pdc_cons.o process.o head64.o
+else
 all: kernel.o init_task.o pdc_cons.o process.o head.o
+endif
 
 O_TARGET = kernel.o
 
@@ -37,5 +41,7 @@ obj-$(CONFIG_IOMMU_SBA) += sba_iommu.o
 obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o
 obj-$(CONFIG_CHASSIS_LCD_LED) += led.o 
 obj-$(CONFIG_SUPERIO) += superio.o
+obj-$(CONFIG_PARISC64) += pdcpat.o binfmt_elf32.o sys_parisc32.o \
+		ioctl32.o signal32.o
 
 include $(TOPDIR)/Rules.make