--- gcc/version.c.orig	2003-08-04 14:50:23.000000000 +0200
+++ gcc/version.c	2003-09-27 15:01:39.000000000 +0200
@@ -6,7 +6,7 @@
    please modify this string to indicate that, e.g. by putting your
    organization's name in parentheses at the end of the string.  */
 
-const char version_string[] = "3.5.0 20040516 (experimental)";
+const char version_string[] = "3.5.0 20040516 (experimental) (@l_openpkg_release@)";
 
 /* This is the location of the online document giving instructions for
    reporting bugs.  If you distribute a modified version of GCC,
@@ -15,4 +15,4 @@
    forward us bugs reported to you, if you determine that they are
    not bugs in your modifications.)  */
 
-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
+const char bug_report_url[] = "<URL:http://www.openpkg.org/>";
--- config.guess.orig	Thu Jan 30 23:32:36 2003
+++ config.guess	Wed Feb  5 09:54:43 2003
@@ -188,7 +188,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:
--- gcc/config/i386/sol2.h.dist Thu Feb 27 15:00:54 2003
+++ gcc/config/i386/sol2.h      Thu Feb 27 14:20:50 2003
@@ -160,3 +160,5 @@
 
 /* The Solaris assembler does not support .quad.  Do not use it.  */
 #undef ASM_QUAD
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1

--- gcc/system.h.orig	2003-08-23 20:03:05.000000000 +0200
+++ gcc/system.h	2003-09-03 20:02:11.000000000 +0200
@@ -314,10 +314,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: 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
@@ -79,7 +79,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*}"