r968 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7: debian patches

[Jens Schmalzing]

Author: jensen
Date: 2004-08-03 02:35:02 -0600 (Tue, 03 Aug 2004)
New Revision: 968

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/patches/binutils.diff
Log:
Replaced the binutils patch by a version that works.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog	2004-08-03 07:22:52 UTC (rev 967)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog	2004-08-03 08:35:02 UTC (rev 968)
@@ -1,16 +1,17 @@
 kernel-patch-powerpc-2.6.7 (2.6.7-5) UNRELEASED; urgency=low
 
-  * Enabled psaux compatiblity driver, since not having it will break 2.4/2.6
-    dual kernel installs, as well as current X configuration defaults
-    (Sven Luther).
+  * Enabled psaux compatiblity driver, since not having it will break
+    2.4/2.6 dual kernel installs, as well as current X configuration
+    defaults (Sven Luther).
 
   * Enabled forced IDE detection on early Xserve G4 (closes: Bug#263058)
     (Jens Schmalzing).
 
-  * Added binutils patch from Tom Rini to fix binutils 2.15-1 incompatibility
-    (Closes: #263057) (Sven Luther).
+  * Added a binutils patch based on a mailing list post by Tom Rini, in
+    order to take care of the stricter opcode checking introduced by the
+    new GNU assembler 2.15 (closes: Bug#263057) (Jens Schmalzing).
 
- -- Sven Luther <luther@debian.org>  Tue,  3 Aug 2004 09:12:37 +0200
+ -- Jens Schmalzing <jensen@debian.org>  Tue,  3 Aug 2004 10:19:48 +0200
 
 kernel-patch-powerpc-2.6.7 (2.6.7-4) unstable; urgency=low
 

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/patches/binutils.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/patches/binutils.diff	2004-08-03 07:22:52 UTC (rev 967)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/patches/binutils.diff	2004-08-03 08:35:02 UTC (rev 968)
@@ -1,28 +1,25 @@
---- 1.57/arch/ppc/Makefile 2004-07-28 21:58:36 -07:00
-+++ edited/arch/ppc/Makefile 2004-07-31 12:16:29 -07:00
-@@ -22,7 +22,7 @@
-
-LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
-CPPFLAGS += -Iarch/$(ARCH)
--AFLAGS += -Iarch/$(ARCH)
-+aflags-y += -Iarch/$(ARCH)
-cflags-y += -Iarch/$(ARCH) -msoft-float -pipe \
--ffixed-r2 -Wno-uninitialized -mmultiple
-CPP = $(CC) -E $(CFLAGS)
-@@ -33,10 +33,16 @@
-cflags-y += -mstring
-endif
-
-+aflags-$(CONFIG_4xx) += -m405
-cflags-$(CONFIG_4xx) += -Wa,-m405
-+aflags-$(CONFIG_6xx) += -maltivec
-+cflags-$(CONFIG_6xx) += -Wa,-maltivec
-+aflags-$(CONFIG_E500) += -me500
-cflags-$(CONFIG_E500) += -Wa,-me500
-+aflags-$(CONFIG_PPC64BRIDGE) += -mppc64bridge
-cflags-$(CONFIG_PPC64BRIDGE) += -Wa,-mppc64bridge
-
+--- kernel-source-2.6.7/arch/ppc/Makefile.orig	2004-06-16 07:18:57.000000000 +0200
++++ kernel-source-2.6.7/arch/ppc/Makefile	2004-08-03 10:18:43.635271781 +0200
+@@ -15,14 +15,21 @@
+ 
+ LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic
+ CPPFLAGS	+= -Iarch/$(ARCH)
+-AFLAGS		+= -Iarch/$(ARCH)
++aflags-y	+= -Iarch/$(ARCH)
+ cflags-y	+= -Iarch/$(ARCH) -msoft-float -pipe \
+ 		-ffixed-r2 -Wno-uninitialized -mmultiple -mstring
+ CPP		= $(CC) -E $(CFLAGS)
+ 
++aflags-$(CONFIG_4xx)		+= -m405
+ cflags-$(CONFIG_4xx)		+= -Wa,-m405
++aflags-$(CONFIG_6xx)		+= -maltivec
++cflags-$(CONFIG_6xx)		+= -Wa,-maltivec
++aflags-$(CONFIG_E500)		+= -me500
++cflags-$(CONFIG_E500)		+= -Wa,-me500
++aflags-$(CONFIG_PPC64BRIDGE)	+= -mppc64bridge
+ cflags-$(CONFIG_PPC64BRIDGE)	+= -Wa,-mppc64bridge
+ 
 +AFLAGS += $(aflags-y)
-CFLAGS += $(cflags-y)
-
-head-y := arch/ppc/kernel/head.o
+ CFLAGS += $(cflags-y)
+ 
+