[Glibc-bsd-commits] r3738 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches

[Robert Millan]

Author: rmh
Date: 2011-10-16 11:30:35 +0000 (Sun, 16 Oct 2011)
New Revision: 3738

Removed:
   trunk/kfreebsd-10/debian/patches/008_gcc46.diff
   trunk/kfreebsd-9/debian/patches/008_gcc46.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
Now that -frename-registers has been disabled, -fgcse no longer seems to be a problem.  Reenable.  (only on kfreebsd-9 and kfreebsd-10 for now)

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2011-10-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-10/debian/changelog	2011-10-16 11:30:35 UTC (rev 3738)
@@ -6,11 +6,13 @@
   * 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.
+  * Now that -frename-registers has been disabled, -fgcse no longer
+    seems to be a problem.  Reenable.
 
   [ Petr Salinger ]
   * Drop 103_stat_pipe.diff, fixed upstream.
 
- -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 13:22:14 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 13:29:14 +0200
 
 kfreebsd-10 (10.0~svn226224-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-10/debian/patches/008_gcc46.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/008_gcc46.diff	2011-10-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-10/debian/patches/008_gcc46.diff	2011-10-16 11:30:35 UTC (rev 3738)
@@ -1,24 +0,0 @@
---- 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-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-10/debian/patches/series	2011-10-16 11:30:35 UTC (rev 3738)
@@ -5,7 +5,6 @@
 005_linux_cflags.diff
 006_mips_i8259_alloc.diff
 #007_clone_signals.diff
-008_gcc46.diff
 #009_disable_duped_modules.diff
 020_linker.diff 
 #107_mount_update.diff

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-10-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-9/debian/changelog	2011-10-16 11:30:35 UTC (rev 3738)
@@ -3,8 +3,10 @@
   * 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.
+  * Now that -frename-registers has been disabled, -fgcse no longer
+    seems to be a problem.  Reenable.
 
- -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 13:21:57 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 16 Oct 2011 13:29:21 +0200
 
 kfreebsd-9 (9.0~svn226368-1) experimental; urgency=low
 

Deleted: trunk/kfreebsd-9/debian/patches/008_gcc46.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/008_gcc46.diff	2011-10-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-9/debian/patches/008_gcc46.diff	2011-10-16 11:30:35 UTC (rev 3738)
@@ -1,24 +0,0 @@
---- 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-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-10-16 11:27:00 UTC (rev 3737)
+++ trunk/kfreebsd-9/debian/patches/series	2011-10-16 11:30:35 UTC (rev 3738)
@@ -5,7 +5,6 @@
 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