[Glibc-bsd-commits] r3730 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-10-10 20:26:16 +0000 (Mon, 10 Oct 2011)
New Revision: 3730

Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/008_gcc46.diff
   trunk/kfreebsd-9/debian/rules
Log:
Switch back to GCC 4.4 (-fno-gcse is not enough to fix GCC 4.6 builds)

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-10-10 20:05:37 UTC (rev 3729)
+++ trunk/kfreebsd-9/debian/changelog	2011-10-10 20:26:16 UTC (rev 3730)
@@ -1,9 +1,10 @@
-kfreebsd-9 (9.0~svn225873-2) experimental; urgency=low
+kfreebsd-9 (9.0~svn225873-2) UNRELEASED; urgency=low
 
-  * 008_gcc46.diff: Add -fno-gcse to CFLAGS to fix GCC 4.6 builds.
-    (Closes: #644417)
+  * 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>  Sat, 08 Oct 2011 01:05:51 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 10 Oct 2011 22:25:40 +0200
 
 kfreebsd-9 (9.0~svn225873-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/patches/008_gcc46.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/008_gcc46.diff	2011-10-10 20:05:37 UTC (rev 3729)
+++ trunk/kfreebsd-9/debian/patches/008_gcc46.diff	2011-10-10 20:26:16 UTC (rev 3730)
@@ -1,14 +1,24 @@
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -144,3 +144,11 @@
- .if defined(WITH_CTF)
- .undef NO_CTF
+--- 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
-+
-+#
-+# GCC 4.4 onwards automatically enables -fgcse with -O2, which is not
-+# currently supported. Avoid.
-+#
-+.if ${CC} != "icc"
++.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-9/debian/rules
===================================================================
--- trunk/kfreebsd-9/debian/rules	2011-10-10 20:05:37 UTC (rev 3729)
+++ trunk/kfreebsd-9/debian/rules	2011-10-10 20:26:16 UTC (rev 3730)
@@ -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