reversed wpadded patch

4 files changed, 68 insertions, 4 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 40bec523ae19..4b6f4572dd61 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.52 2003/07/16 12:14:53 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.53 2003/07/18 00:24:48 sindian Exp $
+
+  17 Jul 2003; <sindian@gentoo.org> mm-sources-2.6.0_beta1-r1.ebuild,
+  files/wpadded.patch:
+  Reversed the wpadded patch. This patch spits out tons of warnings about
+  compiler-generated padding that we don't care about. Reversing this patch
+  doesn't hurt anything. It just makes the gcc output much less terrifying.
 
 *mm-sources-2.6.0_beta1-r1 (16 Jul 2003)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index c5594c65909d..66648d45427a 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,11 +1,12 @@
 MD5 8c8e886fd53d80e668deedfa5e48147f mm-sources-2.5.74-r1.ebuild 2701
 MD5 ece2eca96d8d1148ca5271b8d1812e59 mm-sources-2.5.74-r3.ebuild 2701
-MD5 ded670325f24cb5a799f012c450ecf35 mm-sources-2.6.0_beta1-r1.ebuild 1099
+MD5 a2fa04ef5dff12be2c541a8e407758a1 mm-sources-2.6.0_beta1-r1.ebuild 1253
 MD5 2c81d4ac92ff6eaa1ac7e3b0f926d869 mm-sources-2.5.74-r2.ebuild 2703
-MD5 8df46b5d523c7e2f9438574a17be29fd ChangeLog 8447
+MD5 92c165838a6abf509246d0e5bd182509 ChangeLog 8767
 MD5 f5051bf46b0cb3f14a41e4d668dd041d mm-sources-2.5.75-r1.ebuild 2703
 MD5 3d94ace6d82ed6e8d61c475ddcc474e7 files/digest-mm-sources-2.5.74-r1 126
 MD5 71dc5f7dc36f9310defc13b205ea8def files/digest-mm-sources-2.5.74-r2 126
 MD5 b5b2d46c43379111c30fb09828379395 files/digest-mm-sources-2.5.74-r3 126
 MD5 80e85d6efa72a547174fb64b8ad08a49 files/digest-mm-sources-2.5.75-r1 126
+MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 6e09c7cb2c57f6a048b89ea2cafc059b files/digest-mm-sources-2.6.0_beta1-r1 136
diff --git a/sys-kernel/mm-sources/files/wpadded.patch b/sys-kernel/mm-sources/files/wpadded.patch
new file mode 100644
index 000000000000..b39bd64c9ce1
--- /dev/null
+++ b/sys-kernel/mm-sources/files/wpadded.patch
@@ -0,0 +1,52 @@
+
+From: Albert Cahalan <albert@users.sourceforge.net>
+
+Explicit padding is better than compiler-generated padding, because
+awareness of the issue reduces waste.  There's also a security issue, with
+info leaking whenever padded structs get copied to the user.
+
+This patch adds -Wpadded for i386, mips, and s390.
+
+
+
+ arch/i386/Makefile |    2 ++
+ arch/mips/Makefile |    1 +
+ arch/s390/Makefile |    1 +
+ 3 files changed, 4 insertions(+)
+
+diff -puN arch/i386/Makefile~wpadded arch/i386/Makefile
+--- 25/arch/i386/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
++++ 25-akpm/arch/i386/Makefile	2003-07-13 21:54:54.000000000 -0700
+@@ -27,6 +27,8 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
+ # prevent gcc from keeping the stack 16 byte aligned
+ CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,)
+ 
++CFLAGS += $(call check_gcc,-Wpadded,)
++
+ align := $(subst -functions=0,,$(call check_gcc,-falign-functions=0,-malign-functions=0))
+ 
+ cflags-$(CONFIG_M386)		+= -march=i386
+diff -puN arch/mips/Makefile~wpadded arch/mips/Makefile
+--- 25/arch/mips/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
++++ 25-akpm/arch/mips/Makefile	2003-07-13 21:54:54.000000000 -0700
+@@ -78,6 +78,7 @@ endif
+ 
+ AFLAGS		+= $(cflags-y)
+ CFLAGS		+= $(cflags-y)
++CFLAGS		+= $(call check_gcc,-Wpadded,)
+ 
+ 
+ #
+diff -puN arch/s390/Makefile~wpadded arch/s390/Makefile
+--- 25/arch/s390/Makefile~wpadded	2003-07-13 21:54:54.000000000 -0700
++++ 25-akpm/arch/s390/Makefile	2003-07-13 21:54:54.000000000 -0700
+@@ -38,6 +38,7 @@ cflags-$(CONFIG_MARCH_Z990) += $(call ch
+ 
+ CFLAGS		+= $(cflags-y)
+ CFLAGS		+= $(call check_gcc,-finline-limit=10000,)
++CFLAGS		+= $(call check_gcc,-Wpadded,)
+ CFLAGS 		+= -pipe -fno-strength-reduce -Wno-sign-compare 
+ 
+ OBJCOPYFLAGS	:= -O binary
+
+_
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild
index bcd22a0019ae..e2e362d2ccd0 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild,v 1.2 2003/07/16 17:40:44 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta1-r1.ebuild,v 1.3 2003/07/18 00:24:48 sindian Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -33,6 +33,11 @@ src_unpack() {
 	cd ${S}
 	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
 
+	#Take out the wpadded patch.
+	#It spits out tons of warnings about compiler-generated padding
+	#We don't care.
+	patch -p1 -R < ${FILESDIR}/wpadded.patch
+	
 	unset ARCH
 	kernel_universal_unpack