[patch] gcc31-compile-optimizations-ppc kernel patch

gcc31-compile-optimizations-ppc (text/plain), 9.21 KB, created by Chris PeBenito (RETIRED) on 2003-02-13 23:36:46 UTC

diff -urN linux-2.4.20.orig/Makefile linux-2.4.20/Makefile
--- linux-2.4.20.orig/Makefile	2002-11-28 17:53:16.000000000 -0600
+++ linux-2.4.20/Makefile	2003-02-13 11:29:02.000000000 -0600
@@ -17,7 +17,7 @@
 FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
 
 HOSTCC  	= gcc
-HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O3 -fomit-frame-pointer -pipe
 
 CROSS_COMPILE 	=
 
diff -urN linux-2.4.20.orig/arch/ppc/Makefile linux-2.4.20/arch/ppc/Makefile
--- linux-2.4.20.orig/arch/ppc/Makefile	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/Makefile	2003-02-13 11:07:45.000000000 -0600
@@ -34,6 +34,22 @@
 CFLAGS := $(CFLAGS) -Wa,-m405
 endif
 
+ifdef CONFIG_6xx31
+CFLAGS := $(CFLAGS) -O3
+endif
+
+ifdef CONFIG_7xx31
+CFLAGS := $(CFLAGS) -mcpu=750 -O3
+endif
+
+ifdef CONFIG_74xx31
+CFLAGS := $(CFLAGS) -mcpu=7400 -O3
+endif
+
+ifdef CONFIG_745031
+CFLAGS := $(CFLAGS) -mcpu=7450 -O3
+endif
+
 ifdef CONFIG_8xx
 CFLAGS := $(CFLAGS) -mcpu=860
 endif
@@ -57,6 +73,18 @@
     ifdef CONFIG_6xx
 	HEAD += arch/ppc/kernel/idle_6xx.o
     endif
+    ifdef CONFIG_6xx31
+	HEAD += arch/ppc/kernel/idle_6xx.o
+    endif
+    ifdef CONFIG_7xx31
+	HEAD += arch/ppc/kernel/idle_6xx.o
+    endif
+    ifdef CONFIG_74xx31
+	HEAD += arch/ppc/kernel/idle_6xx.o
+    endif
+    ifdef CONFIG_745031
+	HEAD += arch/ppc/kernel/idle_6xx.o
+    endif
   endif
 endif
 
diff -urN linux-2.4.20.orig/arch/ppc/boot/simple/head.S linux-2.4.20/arch/ppc/boot/simple/head.S
--- linux-2.4.20.orig/arch/ppc/boot/simple/head.S	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/boot/simple/head.S	2003-02-13 11:08:26.000000000 -0600
@@ -70,7 +70,7 @@
 
 	/* The following functions we call must not modify r3 or r4.....
 	*/
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 	bl	disable_6xx_mmu
 	bl	disable_6xx_l1cache
 #if defined(CONFIG_FORCE) || defined(CONFIG_K2) || defined(CONFIG_EV64260)
diff -urN linux-2.4.20.orig/arch/ppc/config.in linux-2.4.20/arch/ppc/config.in
--- linux-2.4.20.orig/arch/ppc/config.in	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/config.in	2003-02-13 11:13:12.000000000 -0600
@@ -30,12 +30,18 @@
 define_bool CONFIG_PPC32 y
 choice 'Processor Type'	\
 	"6xx/7xx/74xx/8260	CONFIG_6xx	\
+	 6xx(GCC>3.1)		CONFIG_6xx31	\
+	 7xx(GCC>3.1)		CONFIG_7xx31	\
+	 74xx(GCC>3.1)		CONFIG_74xx31	\
+	 7450(GCC>3.1)		CONFIG_745031	\
 	 4xx			CONFIG_4xx	\
 	 POWER3               	CONFIG_POWER3	\
 	 POWER4        	        CONFIG_POWER4	\
 	 8xx			CONFIG_8xx"	6xx
 
-if [ "$CONFIG_6xx" = "y" ]; then
+if [ "$CONFIG_6xx" = "y" -o "$CONFIG_6xx31" = "y" -o \
+     "$CONFIG_7xx31" = "y" -o "$CONFIG_74xx31" = "y" -o \
+     "$CONFIG_745031" = "y"]; then
   bool 'MPC8260 CPM Support' CONFIG_8260
 fi
 
@@ -45,7 +51,9 @@
   define_bool CONFIG_PPC_ISATIMER y
 fi
 
-if [ "$CONFIG_6xx" = "y" -o "$CONFIG_POWER3" = "y" -o \
+if [ "$CONFIG_6xx" = "y" -o "$CONFIG_6xx31" = "y" -o \
+     "$CONFIG_7xx31" = "y" -o "$CONFIG_74xx31" = "y" -o \
+     "$CONFIG_745031" = "y" -o "$CONFIG_POWER3" = "y" -o \
      "$CONFIG_POWER4" = "y" ]; then
   define_bool CONFIG_PPC_STD_MMU y
 else
@@ -94,7 +102,9 @@
   fi
 fi
 
-if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ]; then
+if [ "$CONFIG_8260" = "n" -a "$CONFIG_6xx" = "y" -o \
+     "$CONFIG_6xx31" = "y" -o "$CONFIG_7xx31" = "y" -o \
+     "$CONFIG_74xx31" = "y" -o "$CONFIG_745031" = "y" ]; then
   choice 'Machine Type'		\
 	"CHRP/PowerMac/PReP	CONFIG_ALL_PPC		\
   	 Amiga-APUS		CONFIG_APUS		\
@@ -112,7 +122,9 @@
   bool '  Distribute interrupts on all CPUs by default' CONFIG_IRQ_ALL_CPUS
 fi
 
-if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "n" ];then
+if [ "$CONFIG_8260" = "n" -a "$CONFIG_6xx" = "y" -o \
+     "$CONFIG_6xx31" = "y" -o "$CONFIG_7xx31" = "y" -o \
+     "$CONFIG_74xx31" = "y" -o "$CONFIG_745031" = "y" ]; then
   bool 'AltiVec Support' CONFIG_ALTIVEC
   bool 'Thermal Management Support' CONFIG_TAU
   if [ "$CONFIG_TAU" = "y" ]; then
diff -urN linux-2.4.20.orig/arch/ppc/kernel/Makefile linux-2.4.20/arch/ppc/kernel/Makefile
--- linux-2.4.20.orig/arch/ppc/kernel/Makefile	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/kernel/Makefile	2003-02-13 11:14:04.000000000 -0600
@@ -25,6 +25,10 @@
 # Start off with 'head.o', change as needed.
 HEAD-y				:= head.o
 HEAD-$(CONFIG_6xx)		+= idle_6xx.o
+HEAD-$(CONFIG_6xx31)		+= idle_6xx.o
+HEAD-$(CONFIG_7xx31)		+= idle_6xx.o
+HEAD-$(CONFIG_74xx31)		+= idle_6xx.o
+HEAD-$(CONFIG_745031)		+= idle_6xx.o
 HEAD-$(CONFIG_4xx)		:= head_4xx.o
 HEAD-$(CONFIG_8xx)		:= head_8xx.o
 
@@ -39,6 +43,10 @@
 					semaphore.o syscalls.o setup.o \
 					cputable.o ppc_htab.o
 obj-$(CONFIG_6xx)		+= l2cr.o
+obj-$(CONFIG_6xx31)		+= l2cr.o
+obj-$(CONFIG_7xx31)		+= l2cr.o
+obj-$(CONFIG_74xx31)		+= l2cr.o
+obj-$(CONFIG_745031)		+= l2cr.o
 obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
 obj-$(CONFIG_PCI)		+= pci.o 
 obj-$(CONFIG_PCI)		+= pci-dma.o
diff -urN linux-2.4.20.orig/arch/ppc/kernel/head.S linux-2.4.20/arch/ppc/kernel/head.S
--- linux-2.4.20.orig/arch/ppc/kernel/head.S	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/kernel/head.S	2003-02-13 11:15:41.000000000 -0600
@@ -192,7 +192,7 @@
 	bl	reloc_offset
 	li	r24,0			/* cpu# */
 	bl	call_setup_cpu		/* Call setup_cpu for this CPU */
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 	bl	reloc_offset
 	bl	init_idle_6xx
 #endif /* CONFIG_6xx */
@@ -820,8 +820,7 @@
 	/* Out of line case when returning to kernel,
 	 * check return from power_save_6xx
 	 */
-#ifdef CONFIG_6xx
-	
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 	mfspr	r24,SPRN_HID0
 	mtcr	r24
 BEGIN_FTR_SECTION
@@ -1273,7 +1272,7 @@
 	mr	r4,r24
 	bl	identify_cpu
 	bl	call_setup_cpu		/* Call setup_cpu for this CPU */
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 	lis	r3,-KERNELBASE@h
 	bl	init_idle_6xx
 #endif /* CONFIG_6xx */
diff -urN linux-2.4.20.orig/arch/ppc/kernel/idle.c linux-2.4.20/arch/ppc/kernel/idle.c
--- linux-2.4.20.orig/arch/ppc/kernel/idle.c	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/kernel/idle.c	2003-02-13 11:16:21.000000000 -0600
@@ -37,7 +37,7 @@
 unsigned long powersave_nap;
 unsigned long powersave_lowspeed;
 
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 extern void power_save_6xx(void);
 #endif
 
@@ -69,7 +69,7 @@
 			}
 		}
 #endif
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 		if (do_power_save && !current->need_resched)
 			power_save_6xx();
 #endif /* CONFIG_6xx */			
diff -urN linux-2.4.20.orig/arch/ppc/mm/fault.c linux-2.4.20/arch/ppc/mm/fault.c
--- linux-2.4.20.orig/arch/ppc/mm/fault.c	2002-11-28 17:53:11.000000000 -0600
+++ linux-2.4.20/arch/ppc/mm/fault.c	2003-02-13 11:17:04.000000000 -0600
@@ -116,7 +116,7 @@
 
 good_area:
 	code = SEGV_ACCERR;
-#if defined(CONFIG_6xx)
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 	if (error_code & 0x95700000)
 		/* an error such as lwarx to I/O controller space,
 		   address matching DABR, eciwx, etc. */
diff -urN linux-2.4.20.orig/arch/ppc/mm/pgtable.c linux-2.4.20/arch/ppc/mm/pgtable.c
--- linux-2.4.20.orig/arch/ppc/mm/pgtable.c	2002-08-02 19:39:43.000000000 -0500
+++ linux-2.4.20/arch/ppc/mm/pgtable.c	2003-02-13 11:17:30.000000000 -0600
@@ -50,7 +50,7 @@
 struct pgtable_cache_struct quicklists;
 #endif
 
-#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031) || defined(CONFIG_POWER3)
 #define HAVE_BATS	1
 #endif
 
diff -urN linux-2.4.20.orig/include/asm-ppc/system.h linux-2.4.20/include/asm-ppc/system.h
--- linux-2.4.20.orig/include/asm-ppc/system.h	2002-08-02 19:39:45.000000000 -0500
+++ linux-2.4.20/include/asm-ppc/system.h	2003-02-13 11:18:57.000000000 -0600
@@ -55,7 +55,7 @@
 extern void flush_instruction_cache(void);
 extern void hard_reset_now(void);
 extern void poweroff_now(void);
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 extern long _get_L2CR(void);
 extern void _set_L2CR(unsigned long);
 extern long _get_L3CR(void);
diff -urN linux-2.4.20.orig/include/asm-ppc/time.h linux-2.4.20/include/asm-ppc/time.h
--- linux-2.4.20.orig/include/asm-ppc/time.h	2001-11-02 19:43:54.000000000 -0600
+++ linux-2.4.20/include/asm-ppc/time.h	2003-02-13 11:19:18.000000000 -0600
@@ -59,7 +59,7 @@
 
 /* Accessor functions for the timebase (RTC on 601) registers. */
 /* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_6xx31) || defined(CONFIG_7xx31) || defined(CONFIG_74xx31) || defined(CONFIG_745031)
 extern __inline__ int const __USE_RTC(void) {
 	return (mfspr(SPRN_PVR)>>16) == 1;
 }