debian/patches/pfinet-gcc-4.3-fix.patch: Cherry-pick upstream patch to fix

build with gcc-4.3
debian/rules: Set CC to gcc-4.3 instead of gcc-4.2.
debian/control: Build-Depend on gcc-4.3 instead of gcc-4.2.

5 files changed, 41 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index e6533c88..5d69fe67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ hurd (20090404-2) unreleased; urgency=low
   * debian/patches/procfs.patch: Fix a couple of memory leaks, fix swap size
     report.
   * debian/control: Add missing comma in Build-Depends.
+  * debian/patches/pfinet-gcc-4.3-fix.patch: Cherry-pick upstream patch to fix
+    build with gcc-4.3
+  * debian/rules: Set CC to gcc-4.3 instead of gcc-4.2.
+  * debian/control: Build-Depend on gcc-4.3 instead of gcc-4.2.
 
  -- Samuel Thibault <sthibault@debian.org>  Sun, 23 Aug 2009 19:35:58 +0200
 
diff --git a/debian/control b/debian/control
index 1dc0d04d..bfa8a398 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
 Standards-Version: 3.8.2
 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526-1),
  libc0.3-dev (>= 2.9), texinfo, texi2html, libncursesw5-dev, cdbs, quilt,
- debhelper (>= 4.2.0), gcc-4.2
+ debhelper (>= 4.2.0), gcc-4.3
 Uploaders: Jeff Bailey <jbailey@raspberryginger.com>,
  Marcus Brinkmann <brinkmd@debian.org>, Neal H. Walfield <neal@debian.org>,
  Michael Banck <mbanck@debian.org>, Samuel Thibault <sthibault@debian.org>
diff --git a/debian/patches/pfinet-gcc-4.3-fix.patch b/debian/patches/pfinet-gcc-4.3-fix.patch
new file mode 100644
index 00000000..c58878ae
--- /dev/null
+++ b/debian/patches/pfinet-gcc-4.3-fix.patch
@@ -0,0 +1,34 @@
+commit acb9f2e4bc53e0483e53549379c9c5631e452334
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sat Sep 26 21:29:00 2009 +0200
+
+    Add memory clobbers to assembly snippets
+    
+    	* pfinet/linux-src/include/asm-i386/checksum.h (ip_fast_csum):
+    	Add memory clobber to assembly snippet.
+    	(csum_ipv6_magic): Likewise.
+
+diff --git a/pfinet/linux-src/include/asm-i386/checksum.h b/pfinet/linux-src/include/asm-i386/checksum.h
+index ed02317..add8959 100644
+--- a/pfinet/linux-src/include/asm-i386/checksum.h
++++ b/pfinet/linux-src/include/asm-i386/checksum.h
+@@ -109,7 +109,8 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
+ 	   are modified, we must also specify them as outputs, or gcc
+ 	   will assume they contain their original values. */
+ 	: "=r" (sum), "=r" (iph), "=r" (ihl)
+-	: "1" (iph), "2" (ihl));
++	: "1" (iph), "2" (ihl)
++	: "memory");
+ 	return(sum);
+ }
+ 
+@@ -185,7 +186,8 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
+ 		"adcl $0, %0\n"
+ 		: "=&r" (sum)
+ 		: "r" (saddr), "r" (daddr), 
+-		  "r"(htonl((__u32) (len))), "r"(htonl(proto)), "0"(sum));
++		  "r"(htonl((__u32) (len))), "r"(htonl(proto)), "0"(sum)
++		: "memory");
+ 
+ 	return csum_fold(sum);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7a11067a..a83c5727 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ libpthread_setcancel.patch -p0
 extern_inline_fix.patch -p1
 exec_fix.patch -p0
 libpthread_recursive_mutex_initializer.patch -p0
+pfinet-gcc-4.3-fix.patch -p1
diff --git a/debian/rules b/debian/rules
index 93cd7a5b..4fb516ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@
 
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
 
-CC=gcc-4.2
+CC=gcc-4.3
 
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk