Index: config.guess
--- config.guess.orig	2014-05-01 22:51:11.000000000 +0200
+++ config.guess	2014-07-05 11:31:01.632257939 +0200
@@ -207,7 +207,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/i386/sol2.h
--- gcc/config/i386/sol2.h.orig	2014-04-30 16:10:44.000000000 +0200
+++ gcc/config/i386/sol2.h	2014-07-05 11:31:01.632257939 +0200
@@ -132,6 +132,9 @@
   } while (0)
 #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	2014-07-05 11:31:01.642538000 +0200
+++ gcc/config/sol2.h	2014-07-05 14:30:06.372298723 +0200
@@ -281,9 +281,9 @@
   "%{h*} %{v:-V} \
    %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
    %{static:-dn -Bstatic} \
-   %{shared:-G -dy %{!mimpure-text:-z text}} " \
+   %{shared:-G -dy} " \
    LINK_LIBGCC_MAPFILE_SPEC LINK_CLEARCAP_SPEC " \
-   %{symbolic:-Bsymbolic -G -dy -z text} \
+   %{symbolic:-Bsymbolic -G -dy} \
    %(link_arch) \
    %{Qy:} %{!Qn:-Qy}"
 
Index: gcc/system.h
--- gcc/system.h.orig	2014-06-11 18:59:01.000000000 +0200
+++ gcc/system.h	2014-07-05 11:31:01.642538246 +0200
@@ -468,10 +468,6 @@
 }
 #endif
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
Index: libcpp/charset.c
--- libcpp/charset.c.orig	2014-01-02 23:24:45.000000000 +0100
+++ libcpp/charset.c	2014-07-05 11:31:01.642538246 +0200
@@ -74,6 +74,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
 
Index: libcpp/internal.h
--- libcpp/internal.h.orig	2014-01-02 23:24:45.000000000 +0100
+++ libcpp/internal.h	2014-07-05 11:31:01.642538246 +0200
@@ -28,6 +28,7 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #else
+#undef  HAVE_ICONV
 #define HAVE_ICONV 0
 typedef int iconv_t;  /* dummy */
 #endif
