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: sol2-10.h
--- gcc/config/i386/sol2-10.h.orig	2004-11-24 15:43:26.000000000 +0100
+++ gcc/config/i386/sol2-10.h	2005-09-26 20:26:59.419760000 +0200
@@ -80,7 +80,7 @@
 #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
 
 #ifdef TARGET_GNU_LD
-#define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{!m64:-m elf_i386} "
+#define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{!m64:} "
 #else
 #define TARGET_LD_EMULATION ""
 #endif
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: gcc/tree-object-size.c
--- gcc/tree-object-size.c.orig	2005-07-03 18:11:42 +0200
+++ gcc/tree-object-size.c	2006-05-28 13:12:44 +0200
@@ -595,7 +595,7 @@
 	{
 	  unsigned HOST_WIDE_INT off = tree_low_cst (op1, 1);
 
-	  bytes = compute_builtin_object_size (value, object_size_type);
+	  bytes = compute_builtin_object_size (op0, object_size_type);
 	  if (off > offset_limit)
 	    bytes = unknown[object_size_type];
 	  else if (off > bytes)