Index: config.guess
--- config.guess.orig	2004-11-16 01:57:00 +0100
+++ config.guess	2005-09-20 15:29:05 +0200
@@ -189,7 +189,7 @@
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
Index: gcc/config/alpha/osf.h
--- gcc/config/alpha/osf.h.orig	2003-12-12 02:19:23.000000000 +0100
+++ gcc/config/alpha/osf.h	2004-04-26 21:25:14.000000000 +0200
@@ -78,7 +78,7 @@
    constructor and call-frame data structures are not accidentally
    overridden.  */
 #define LINK_SPEC  \
-  "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
+  "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
    %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
    %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
 
Index: gcc/config/i386/sol2.h
--- gcc/config/i386/sol2.h.orig	2004-06-14 19:31:27 +0200
+++ gcc/config/i386/sol2.h	2004-06-21 09:53:21 +0200
@@ -78,6 +78,9 @@
 #undef ASM_QUAD
 #endif
 
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
+
 /* The Solaris assembler wants a .local for non-exported aliases.  */
 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET)	\
   do {							\
Index: gcc/config/sol2.h
--- gcc/config/sol2.h.orig	2004-07-17 23:18:56 +0200
+++ gcc/config/sol2.h	2005-09-19 22:01:15 +0200
@@ -144,8 +144,8 @@
   "%{h*} %{v:-V} \
    %{b} %{Wl,*:%*} \
    %{static:-dn -Bstatic} \
-   %{shared:-G -dy %{!mimpure-text:-z text}} \
-   %{symbolic:-Bsymbolic -G -dy -z text} \
+   %{shared:-G -dy} \
+   %{symbolic:-Bsymbolic -G -dy} \
    %(link_arch) \
    %{Qy:} %{!Qn:-Qy}"
 
Index: gcc/system.h
--- gcc/system.h.orig	2003-08-23 20:03:05.000000000 +0200
+++ gcc/system.h	2003-09-03 20:02:11.000000000 +0200
@@ -319,10 +319,6 @@
 extern char *strstr (const char *, const char *);
 #endif
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
 extern void *malloc (size_t);
 #endif
Index: libcpp/internal.h
--- libcpp/internal.h.orig	2004-09-09 21:16:55 +0200
+++ libcpp/internal.h	2004-09-27 20:04:43 +0200
@@ -33,6 +33,7 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #else
+#undef  HAVE_ICONV
 #define HAVE_ICONV 0
 typedef int iconv_t;  /* dummy */
 #endif
Index: libcpp/charset.c
--- libcpp/charset.c.orig	2005-11-04 00:08:18 +0100
+++ libcpp/charset.c	2006-02-01 19:59:53 +0100
@@ -75,6 +75,7 @@
 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
 #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
 #define iconv_close(x)   (void)0
+#undef ICONV_CONST
 #define ICONV_CONST
 #endif