Fix building with gcc-4.3 (again)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc3-00414-gb09c3e3 sparc64

3 files changed, 110 insertions, 6 deletions

diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog
index edbd29c03c96..29a779fb9e7b 100644
--- a/sys-boot/silo/ChangeLog
+++ b/sys-boot/silo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/silo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.40 2008/08/06 19:13:53 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.41 2008/08/18 22:44:47 bluebird Exp $
+
+  18 Aug 2008; <bluebird@gentoo.org> files/gcc-4.3-compile.patch:
+  Fix building with gcc-4.3 (again)
 
 *silo-1.4.14 (06 Aug 2008)
 
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 0a0e9621e1df..bd2ecd05fe4c 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,4 +1,4 @@
-AUX gcc-4.3-compile.patch 983 RMD160 541e35c1cf9e556040f9d5848ede32a5d1050cfe SHA1 e501fa58d9e854d9fe8d163782f9099a644b4178 SHA256 621e893703d714eb56168c05cbc170d8915f2500729bd25f571a6c3b3cd0dd84
+AUX gcc-4.3-compile.patch 3384 RMD160 01ff2be06946b07ccc9b844740d471fccba8380b SHA1 04b7947eebe9e722b6617b0690d5b066b4716ae2 SHA256 3de0d67c0baabeecba80cdb8422a94d2b03d792f7008cc2da5e99a8224a987aa
 AUX qa-no-strip.patch 164 RMD160 f84a426b416692871750165464c73a1c9fc41ece SHA1 d43fc3463b5b54eef0c60a4bb4f2ad30cb7ab672 SHA256 1e33d17cea41f04b02426fb6b1b98a37694eeffc1efaedb2c7d4eade4120d796
 AUX sanitized-linuxheaders.patch 389 RMD160 20b04c20112674143c030a00e22be5d52f8a631c SHA1 434d18f9931fce362724e624607c02252923dbda SHA256 a58f7eeb5f4017b1f8d3d6f984dfe616d197e71d84f218de48cf5c7a4eac91b2
 AUX silo-1.4.x-noglibc_time.patch 407 RMD160 db46932d4ad90965b4cfb43e095e7bbfefc5c030 SHA1 3172e91e0741f64cc511a1d0a47c4b724eed1ac0 SHA256 de656cc0b9bb6a1a852aebd702ee9e90fa7a9f050603b32eed2e5a2100988c5a
@@ -11,5 +11,5 @@ EBUILD silo-1.4.13-r1.ebuild 1461 RMD160 c492661d3c970c6a07ede762d8db96179e4c087
 EBUILD silo-1.4.13.ebuild 1490 RMD160 ad47ae0ec4ca05f2aa0a940c40003f064ae5b9f6 SHA1 23299041be11c61702cb0d7c827f4d87247616bb SHA256 1f06907d8ec92d66004054f33a9a3910965518b29cf42c42680a01f18244c1a7
 EBUILD silo-1.4.13a_pre20070930_p2.ebuild 1849 RMD160 941b50996808bc4e4786cb8b9bb4eb8da0cb59a5 SHA1 d788c88af0a1db96e35da3f09c59972273416dc6 SHA256 8129825db6f542674f6384338ab485a6c589107ee5f791037627e8fd21e38432
 EBUILD silo-1.4.14.ebuild 1764 RMD160 42a5824797c3e1c694c2d76bbee586fb9267b75f SHA1 93316429d7d10a21f534547728bae246f8620906 SHA256 de46feeb0bce018bab40bc2ea713a288a48a91cb84a195309ab4eb7a6e47fd52
-MISC ChangeLog 8239 RMD160 cf86ee5a5c729e6630b825cf6bda30b03ca5778d SHA1 b8aeb110312077c188f7861b451975a260392006 SHA256 d2ce54ee62770bb06e2dbc79621d8a9c6387d7c138aacf713fa11c3cfbf4f66b
+MISC ChangeLog 8342 RMD160 19a8eea35a57ebe61479a6943df3302203da3fd5 SHA1 efde8b945c5f7aa70a185320e0d6a740d6441cd2 SHA256 1d2bb25a350e1303c17abc5cd8b358e52e11ba831873f369f7dde43607c9cf1f
 MISC metadata.xml 282 RMD160 8eda0577518bd9d63fffd12838529c4a90635e03 SHA1 a85093a86ad24fe08b02cf3d33f6a98193924004 SHA256 cb00fd9fed9bb03fc750aa7fdf8232e1f5b8d46e65a14e4f6629a91c2120423f
diff --git a/sys-boot/silo/files/gcc-4.3-compile.patch b/sys-boot/silo/files/gcc-4.3-compile.patch
index 74c37558553e..d7fa3ea07bfc 100644
--- a/sys-boot/silo/files/gcc-4.3-compile.patch
+++ b/sys-boot/silo/files/gcc-4.3-compile.patch
@@ -1,6 +1,107 @@
---- silo.orig/second/Makefile
-+++ silo/second/Makefile
-@@ -58,13 +58,13 @@
+diff --git a/common/printf.c b/common/printf.c
+--- a/common/printf.c
++++ b/common/printf.c
+@@ -21,6 +21,7 @@
+    USA.  */
+ 
+ #include "promlib.h"
++#include <stringops.h>
+ 
+ /*
+  * This part is rewritten by Igor Timkin <ivt@msu.su>. Than I
+@@ -147,3 +148,88 @@ void prom_printf (char *fmt,...)
+     vprintf (fmt, x1);
+     va_end (x1);
+ }
++
++static int sprintn (char *str, long long n, int b)
++{
++    static char prbuf[33];
++    register char *cp;
++    int count = 0;
++
++    if (b == 10 && n < 0) {
++	memset (str + count, '-', 1);
++	count++;
++	n = -n;
++    }
++    cp = prbuf;
++    do
++	*cp++ = "0123456789ABCDEF"[(unsigned int) (((unsigned long)n) % b)];
++    while ((n = ((unsigned long long)n) / b & 0x0FFFFFFFFFFFFFFFULL));
++    do {
++	memset (str + count, *--cp, 1);
++	count++;
++    } while (cp > prbuf);
++
++    return count;
++}
++
++int vsprintf (char *str, char *fmt, va_list adx)
++{
++    register int c;
++    char *s;
++    int count = 0;
++
++    for (;;) {
++	while ((c = *fmt++) != '%') {
++	    memset (str + count, c, 1);
++	    if (c == '\0') {
++		return count;
++	    }
++	}
++	c = *fmt++;
++	if (c == 'd' || c == 'o' || c == 'x' || c == 'X') {
++	    count += sprintn (str + count, (long long) va_arg (adx, unsigned),
++			     c == 'o' ? 8 : (c == 'd' ? 10 : 16));
++	} else if (c == 'c') {
++	    memset (str + count, va_arg (adx, unsigned), 1);
++	    count++;
++	} else if (c == 's') {
++	    if ((s = va_arg (adx, char *)) == NULL)
++		s = (char *)"(null)";
++	    while ((c = *s++)) {
++		memset (str + count, c, 1);
++		count++;
++	    }
++	} else if (c == 'l' || c == 'O') {
++	    count += sprintn (str + count, (long long) va_arg (adx, long), c == 'l' ? 10 : 8);
++	} else if (c == 'L') {
++	    int hex = 0;
++	    if (*fmt == 'x') {
++		fmt++;
++		hex = 1;
++	    }
++	    count += sprintn (str + count, (long long) va_arg (adx, long long), hex ? 16 : 10);
++	} else {
++	    /* This is basically what libc's printf does */
++	    memset (str + count, '%', 1);
++	    count++;
++	    memset (str + count, c, 1);
++	    count++;
++	}
++    }
++
++    return count;
++}
++
++/* Write formatted output into S, according to the format string FORMAT.  */
++/* VARARGS2 */
++int sprintf (char *s, const char *format, ...)
++{
++    va_list arg;
++    int done;
++
++    va_start (arg, format);
++    done = vsprintf (s, format, arg);
++    va_end (arg);
++
++    return done;
++}
+diff --git a/second/Makefile b/second/Makefile
+--- a/second/Makefile
++++ b/second/Makefile
+@@ -58,13 +58,13 @@ fs/libfs.a: $(FS_OBJS)
  	$(AR) rc $@ $(FS_OBJS)
  
  second: $(OBJS) mark.o