[Glibc-bsd-commits] r3728 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-10-10 19:38:55 +0000 (Mon, 10 Oct 2011)
New Revision: 3728

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

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-10-09 16:00:12 UTC (rev 3727)
+++ trunk/kfreebsd-8/debian/changelog	2011-10-10 19:38:55 UTC (rev 3728)
@@ -4,8 +4,9 @@
   * extend ld_target detection
 
   [ Robert Millan ]
-  * 005_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
+    - 005_gcc46.diff: Add -fno-gcse to COPTFLAGS to fix GCC >= 4.4 builds.
 
  -- Robert Millan <rmh at debian.org>  Sat, 08 Oct 2011 01:01:34 +0200
 

Modified: trunk/kfreebsd-8/debian/patches/005_gcc46.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/005_gcc46.diff	2011-10-09 16:00:12 UTC (rev 3727)
+++ trunk/kfreebsd-8/debian/patches/005_gcc46.diff	2011-10-10 19:38:55 UTC (rev 3728)
@@ -1,14 +1,24 @@
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -127,3 +127,11 @@
- 	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
- CFLAGS+=	-fstack-protector
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -37,6 +37,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
  .endif
-+
-+#
-+# GCC 4.4 onwards automatically enables -fgcse with -O2, which is not
-+# currently supported. Avoid.
-+#
-+.if ${CC} != "icc"
+ .if !defined(NO_CPU_COPTFLAGS)
+ . if ${CC} == "icc"
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -79,6 +79,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
++. endif
+ WERROR?=	-Werror
+ .endif
+ CFLAGS+=	${WERROR}

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-10-09 16:00:12 UTC (rev 3727)
+++ trunk/kfreebsd-8/debian/rules	2011-10-10 19:38:55 UTC (rev 3728)
@@ -18,7 +18,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 1
 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