[Glibc-bsd-commits] r3777 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/arch/amd64 kfreebsd-10/debian/arch/i386 kfreebsd-10/debian/arch/mipsel kfreebsd-10/debian/patches kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/arch/amd64 kfreebsd-9/debian/arch/i386 kfreebsd-9/debian/arch/mipsel kfreebsd-9/debian/patches

Thu Oct 27 19:42:55 UTC 2011

Author: rmh
Date: 2011-10-27 19:42:55 +0000 (Thu, 27 Oct 2011)
New Revision: 3777

Added:
   trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
   trunk/kfreebsd-8/debian/patches/901_disable_optimization_2.diff
   trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff
Removed:
   trunk/kfreebsd-8/debian/patches/005_gcc46.diff
Modified:
   trunk/kfreebsd-10/debian/arch/amd64/amd64.config
   trunk/kfreebsd-10/debian/arch/i386/486.config
   trunk/kfreebsd-10/debian/arch/i386/686-smp.config
   trunk/kfreebsd-10/debian/arch/i386/686.config
   trunk/kfreebsd-10/debian/arch/i386/xen.config
   trunk/kfreebsd-10/debian/arch/mipsel/malta.config
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-9/debian/arch/amd64/amd64.config
   trunk/kfreebsd-9/debian/arch/i386/486.config
   trunk/kfreebsd-9/debian/arch/i386/686-smp.config
   trunk/kfreebsd-9/debian/arch/i386/686.config
   trunk/kfreebsd-9/debian/arch/i386/xen.config
   trunk/kfreebsd-9/debian/arch/mipsel/malta.config
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
  * Fix panic on early boot.  (Closes: #644417)
    - Switch back to GCC 4.4.
    - Turn optimization down to -O1 (901_disable_optimization_2.diff).

Modified: trunk/kfreebsd-10/debian/arch/amd64/amd64.config
===================================================================

--- trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,6 @@
 # Kernel for Debian GNU/kFreeBSD on all x86-64 machines
 
 cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -fno-gcse -frename-registers -pipe"
 ident		Debian-amd64
 
 options		SMP		# Symmetric MultiProcessor Kernel

Modified: trunk/kfreebsd-10/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/486.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/i386/486.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -3,7 +3,7 @@
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-Os -fno-gcse -pipe -march=i486 -mtune=i486"
+makeoptions	COPTFLAGS="-Os -pipe -march=i486 -mtune=i486"
 ident		Debian-i486
 
 options		COMPAT_LINUX

Modified: trunk/kfreebsd-10/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686-smp.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/i386/686-smp.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,7 @@
 # Kernel for Debian GNU/kFreeBSD on an i686 SMP machine
 
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 ident		Debian-i686-SMP
 
 options		SMP		# Symmetric MultiProcessor Kernel

Modified: trunk/kfreebsd-10/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/i386/686.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,7 @@
 # Kernel for Debian GNU/kFreeBSD on an i686 machine
 
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 ident		Debian-i686
 
 options		COMPAT_LINUX

Modified: trunk/kfreebsd-10/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/xen.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/i386/xen.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -3,7 +3,7 @@
 include XEN
 
 ident		Debian-xen
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 
 # disable extra checks enabled in upstream XEN config
 nooption 	INVARIANTS		# Enable calls of extra sanity checking

Modified: trunk/kfreebsd-10/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/mipsel/malta.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/arch/mipsel/malta.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,6 @@
 # Kernel for Debian GNU/kFreeBSD on mipsel/malta machines
 
 include		MALTA
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe"
 
 makeoptions	ARCH_FLAGS="-march=mips32 -mabi=32 -D__mips_o32"
 

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/changelog	2011-10-27 19:42:55 UTC (rev 3777)
@@ -3,9 +3,9 @@
   [ Robert Millan ]
   * Remove /boot symlink kludge.  See:
     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633561#88
-  * Disable -frename-registers on i386.  I enabled it in 2006 only because I
-    mistakenly thought upstream had done the same.  In fact, upstream only
-    enabled this flag on amd64.  See SVN revision 1302.
+  * Fix panic on early boot.  (Closes: #644417)
+    - Switch back to GCC 4.4.
+    - Turn optimization down to -O1 (901_disable_optimization_2.diff).
 
   [ Petr Salinger ]
   * Drop 103_stat_pipe.diff, fixed upstream.

Added: trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/901_disable_optimization_2.diff	2011-10-27 19:42:55 UTC (rev 3777)
@@ -0,0 +1,29 @@
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage.
+
+--- 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])
++COPTFLAGS+= -O1
++.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])
++CFLAGS+=	-O1
++.endif
+ WERROR?=	-Werror
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-10/debian/patches/series	2011-10-27 19:42:55 UTC (rev 3777)
@@ -11,6 +11,7 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
+901_disable_optimization_2.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-8/debian/changelog	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,11 +1,16 @@
 kfreebsd-8 (8.2-11) UNRELEASED; urgency=low
 
-  [ Aurelien Jarno ]
+  [ Aurelien Jarno ]
   * Update 000_unix_socket_overflow.diff from the second security advisory,
     fixing the same issue on the Linux compatibility layer. Closes: #645377.
 
- -- Robert Millan <rmh at debian.org>  Thu, 20 Oct 2011 11:43:34 +0200
+  [ Robert Millan ]
+  * Fix panic on early boot.  (Closes: #644417)
+    - Switch back to GCC 4.4.
+    - Turn optimization down to -O1 (901_disable_optimization_2.diff).
 
+ -- Robert Millan <rmh at debian.org>  Thu, 27 Oct 2011 21:41:37 +0200
+
 kfreebsd-8 (8.2-10) unstable; urgency=low
 
   [ Robert Millan ]

Deleted: trunk/kfreebsd-8/debian/patches/005_gcc46.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/005_gcc46.diff	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-8/debian/patches/005_gcc46.diff	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,24 +0,0 @@
---- 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
- .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
- WERROR?=	-Werror
- .endif
- CFLAGS+=	${WERROR}

Added: trunk/kfreebsd-8/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/901_disable_optimization_2.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/901_disable_optimization_2.diff	2011-10-27 19:42:55 UTC (rev 3777)
@@ -0,0 +1,29 @@
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage.
+
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -38,6 +38,9 @@
+ COPTFLAGS+= -fno-strict-aliasing
+ . endif
+ .endif
++.if !empty(COPTFLAGS:M-O[23s])
++COPTFLAGS+= -O1
++.endif
+ .if !defined(NO_CPU_COPTFLAGS)
+ . if ${CC} == "icc"
+ COPTFLAGS+= ${_ICC_CPUCFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
+--- 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])
++CFLAGS+=       -O1
++. endif
+ WERROR?=	-Werror
+ .endif
+ CFLAGS+=	${WERROR}

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-8/debian/patches/series	2011-10-27 19:42:55 UTC (rev 3777)
@@ -9,7 +9,6 @@
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff
-005_gcc46.diff
 007_clone_signals.diff
 008_config.diff
 #009_disable_duped_modules.diff
@@ -25,6 +24,7 @@
 110_disable_trampoline_flavour.diff
 111_linprocfs_kthread.diff
 200_xen.diff
+901_disable_optimization_2.diff 
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff

Modified: trunk/kfreebsd-9/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/amd64/amd64.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,6 @@
 # Kernel for Debian GNU/kFreeBSD on all x86-64 machines
 
 cpu		HAMMER
-makeoptions	COPTFLAGS="-O2 -fno-gcse -frename-registers -pipe"
 ident		Debian-amd64
 
 options		SMP		# Symmetric MultiProcessor Kernel

Modified: trunk/kfreebsd-9/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/486.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/i386/486.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -3,7 +3,7 @@
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-Os -fno-gcse -pipe -march=i486 -mtune=i486"
+makeoptions	COPTFLAGS="-Os -pipe -march=i486 -mtune=i486"
 ident		Debian-i486
 
 options		COMPAT_LINUX

Modified: trunk/kfreebsd-9/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/686-smp.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/i386/686-smp.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,7 @@
 # Kernel for Debian GNU/kFreeBSD on an i686 SMP machine
 
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 ident		Debian-i686-SMP
 
 options		SMP		# Symmetric MultiProcessor Kernel

Modified: trunk/kfreebsd-9/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/686.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/i386/686.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,7 @@
 # Kernel for Debian GNU/kFreeBSD on an i686 machine
 
 cpu		I686_CPU
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 ident		Debian-i686
 
 options		COMPAT_LINUX

Modified: trunk/kfreebsd-9/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/xen.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/i386/xen.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -3,7 +3,7 @@
 include XEN
 
 ident		Debian-xen
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe -march=i686 -mtune=generic"
+makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 
 # disable extra checks enabled in upstream XEN config
 nooption 	INVARIANTS		# Enable calls of extra sanity checking

Modified: trunk/kfreebsd-9/debian/arch/mipsel/malta.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/mipsel/malta.config	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/arch/mipsel/malta.config	2011-10-27 19:42:55 UTC (rev 3777)
@@ -1,7 +1,6 @@
 # Kernel for Debian GNU/kFreeBSD on mipsel/malta machines
 
 include		MALTA
-makeoptions	COPTFLAGS="-O2 -fno-gcse -pipe"
 
 makeoptions	ARCH_FLAGS="-march=mips32 -mabi=32 -D__mips_o32"
 

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/changelog	2011-10-27 19:42:55 UTC (rev 3777)
@@ -5,17 +5,14 @@
   [ Robert Millan ]
   * Fix panic on early boot.  (Closes: #644417)
     - Switch back to GCC 4.4.
-    - Add -fno-gcse to COPTFLAGS to fix GCC >= 4.4 builds.
-  * Disable -frename-registers on i386.  I enabled it in 2006 only because I
-    mistakenly thought upstream had done the same.  In fact, upstream only
-    enabled this flag on amd64.  See SVN revision 1302.
+    - Turn optimization down to -O1 (901_disable_optimization_2.diff).
 
   [ Petr Salinger ]
   * Drop 103_stat_pipe.diff, fixed upstream.
   * Add 918_unix_socket_overflow.diff, to fix up breakage in our userland
     after 000_unix_socket_overflow.diff. Closes: #645527.
 
- -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 13:29:21 +0200
+ -- Robert Millan <rmh at debian.org>  Thu, 27 Oct 2011 20:51:09 +0200
 
 kfreebsd-9 (9.0~svn225873-1) experimental; urgency=low
 

Added: trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/901_disable_optimization_2.diff	2011-10-27 19:42:55 UTC (rev 3777)
@@ -0,0 +1,29 @@
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage.
+
+--- 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])
++COPTFLAGS+= -O1
++.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])
++CFLAGS+=	-O1
++.endif
+ WERROR?=	-Werror
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-10-27 19:30:15 UTC (rev 3776)
+++ trunk/kfreebsd-9/debian/patches/series	2011-10-27 19:42:55 UTC (rev 3777)
@@ -11,6 +11,7 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
+901_disable_optimization_2.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff


