[Glibc-bsd-commits] r3731 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-10-12 09:57:04 +0000 (Wed, 12 Oct 2011)
New Revision: 3731

Added:
   trunk/kfreebsd-10/debian/patches/008_gcc46.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/debian/rules
Log:
Upload(ed) to experimental

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2011-10-10 20:26:16 UTC (rev 3730)
+++ trunk/kfreebsd-10/debian/changelog	2011-10-12 09:57:04 UTC (rev 3731)
@@ -1,9 +1,14 @@
-kfreebsd-10 (10.0~svn226224-1) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn226224-1) experimental; urgency=low
 
   * New upstream snapshot.
 
- -- Robert Millan <rmh at debian.org>  Mon, 10 Oct 2011 21:43:50 +0200
+  [ Robert Millan ]
+  * Fix panic on early boot.  (Closes: #644417)
+    - Switch back to GCC 4.4
+    - 008_gcc46.diff: Add -fno-gcse to COPTFLAGS to fix GCC >= 4.4 builds.
 
+ -- Robert Millan <rmh at debian.org>  Mon, 10 Oct 2011 22:11:40 +0200
+
 kfreebsd-10 (10.0~svn225709-1) experimental; urgency=low
 
   * New upstream snapshot.  Begin tracking 10-CURRENT.

Added: trunk/kfreebsd-10/debian/patches/008_gcc46.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/008_gcc46.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/008_gcc46.diff	2011-10-12 09:57:04 UTC (rev 3731)
@@ -0,0 +1,24 @@
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -41,6 +41,9 @@
+ .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
+ .endif
++.if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-gcse)
++COPTFLAGS+= -fno-gcse
++.endif
+ .if !defined(NO_CPU_COPTFLAGS)
+ COPTFLAGS+= ${_CPUCFLAGS}
+ .endif
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -91,6 +91,9 @@
+ .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+=	-fno-strict-aliasing
+ .endif
++.if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-gcse)
++CFLAGS+=	-fno-gcse
++.endif
+ WERROR?=	-Werror
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2011-10-10 20:26:16 UTC (rev 3730)
+++ trunk/kfreebsd-10/debian/patches/series	2011-10-12 09:57:04 UTC (rev 3731)
@@ -5,6 +5,7 @@
 005_linux_cflags.diff
 006_mips_i8259_alloc.diff
 #007_clone_signals.diff
+008_gcc46.diff
 #009_disable_duped_modules.diff
 020_linker.diff 
 103_stat_pipe.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2011-10-10 20:26:16 UTC (rev 3730)
+++ trunk/kfreebsd-10/debian/rules	2011-10-12 09:57:04 UTC (rev 3731)
@@ -19,7 +19,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
-gcc_version	:= 4.6
+gcc_version	:= 4.4
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips