michael@320: Index: config.guess
michael@320: --- config.guess.orig	2010-03-23 15:26:40.000000000 +0100
michael@320: +++ config.guess	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -194,7 +194,7 @@
michael@320:  		release='-gnu'
michael@320:  		;;
michael@320:  	    *)
michael@320: -		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
michael@320: +		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
michael@320:  		;;
michael@320:  	esac
michael@320:  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
michael@320: Index: gcc/config/alpha/osf.h
michael@320: --- gcc/config/alpha/osf.h.orig	2010-04-28 18:26:24.000000000 +0200
michael@320: +++ gcc/config/alpha/osf.h	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -77,7 +77,7 @@
michael@320:     constructor and call-frame data structures are not accidentally
michael@320:     overridden.  */
michael@320:  #define LINK_SPEC  \
michael@320: -  "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
michael@320: +  "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
michael@320:     %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
michael@320:     %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
michael@320:  
michael@320: Index: gcc/config/i386/sol2-10.h
michael@320: --- gcc/config/i386/sol2-10.h.orig	2010-07-14 10:47:54.000000000 +0200
michael@320: +++ gcc/config/i386/sol2-10.h	2010-08-01 23:37:46.000000000 +0200
michael@320: @@ -114,7 +114,7 @@
michael@320:               -R /usr/ucblib/64} \
michael@320:     %{!compat-bsd: \
michael@320:       %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \
michael@320: -             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}"
michael@320: +             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}} -rpath-link /lib/64:/usr/lib/64}"
michael@320:  
michael@320:  #undef LINK_ARCH64_SPEC
michael@320:  #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
michael@320: @@ -131,7 +131,7 @@
michael@320:  #endif
michael@320:  
michael@320:  #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \
michael@320: -			    "%{!m64:-m " I386_EMULATION "} "
michael@320: +			    "%{!m64:} "
michael@320:  #else
michael@320:  #define TARGET_LD_EMULATION ""
michael@320:  #endif
michael@320: Index: gcc/config/i386/sol2.h
michael@320: --- gcc/config/i386/sol2.h.orig	2010-07-14 10:47:54.000000000 +0200
michael@320: +++ gcc/config/i386/sol2.h	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -76,6 +76,9 @@
michael@320:  #undef ASM_QUAD
michael@320:  #endif
michael@320:  
michael@320: +#undef DEFAULT_PCC_STRUCT_RETURN
michael@320: +#define DEFAULT_PCC_STRUCT_RETURN 1
michael@320: +
michael@320:  /* The Solaris assembler wants a .local for non-exported aliases.  */
michael@320:  #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET)	\
michael@320:    do {							\
michael@320: Index: gcc/config/sol2.h
michael@320: --- gcc/config/sol2.h.orig	2010-04-16 15:33:58.000000000 +0200
michael@320: +++ gcc/config/sol2.h	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -176,8 +176,8 @@
michael@320:     %{b} \
michael@320:     %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
michael@320:     %{static:-dn -Bstatic} \
michael@320: -   %{shared:-G -dy %{!mimpure-text:-z text}} \
michael@320: -   %{symbolic:-Bsymbolic -G -dy -z text} \
michael@320: +   %{shared:-G -dy} \
michael@320: +   %{symbolic:-Bsymbolic -G -dy} \
michael@320:     %(link_arch) \
michael@320:     %{Qy:} %{!Qn:-Qy}"
michael@320:  
michael@320: Index: gcc/system.h
michael@320: --- gcc/system.h.orig	2009-12-14 00:00:53.000000000 +0100
michael@320: +++ gcc/system.h	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -398,10 +398,6 @@
michael@320:  extern char *strstr (const char *, const char *);
michael@320:  #endif
michael@320:  
michael@320: -#ifdef HAVE_MALLOC_H
michael@320: -#include <malloc.h>
michael@320: -#endif
michael@320: -
michael@320:  #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
michael@320:  extern void *malloc (size_t);
michael@320:  #endif
michael@320: Index: libcpp/charset.c
michael@320: --- libcpp/charset.c.orig	2010-03-29 22:07:29.000000000 +0200
michael@320: +++ libcpp/charset.c	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -75,6 +75,7 @@
michael@320:  #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
michael@320:  #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
michael@320:  #define iconv_close(x)   (void)0
michael@320: +#undef ICONV_CONST
michael@320:  #define ICONV_CONST
michael@320:  #endif
michael@320:  
michael@320: Index: libcpp/internal.h
michael@320: --- libcpp/internal.h.orig	2010-03-29 22:07:29.000000000 +0200
michael@320: +++ libcpp/internal.h	2010-08-01 23:35:02.000000000 +0200
michael@320: @@ -29,6 +29,7 @@
michael@320:  #if HAVE_ICONV
michael@320:  #include <iconv.h>
michael@320:  #else
michael@320: +#undef  HAVE_ICONV
michael@320:  #define HAVE_ICONV 0
michael@320:  typedef int iconv_t;  /* dummy */
michael@320:  #endif