From c78df94f041548ad08640137edf65128673c5c70 Mon Sep 17 00:00:00 2001
From: Dave Murphy <wntrmute@users.sourceforge.net>
Date: Wed, 31 May 2006 02:57:42 +0000
Subject: [PATCH] *** empty log message ***

---
 dkarm-eabi/patches/gcc-4.1.1.patch | 51 ++++++++++++++++++------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/dkarm-eabi/patches/gcc-4.1.1.patch b/dkarm-eabi/patches/gcc-4.1.1.patch
index 91a62d7..b5a6848 100644
--- a/dkarm-eabi/patches/gcc-4.1.1.patch
+++ b/dkarm-eabi/patches/gcc-4.1.1.patch
@@ -1,6 +1,6 @@
-diff -Naurb gcc-4.1.0/gcc/c-incpath.c gcc-4.1.0-arm/gcc/c-incpath.c
---- gcc-4.1.0/gcc/c-incpath.c	Sat Jun 25 03:02:01 2005
-+++ gcc-4.1.0-arm/gcc/c-incpath.c	Wed Apr 12 16:00:30 2006
+diff -Nbaur gcc-4.1.1/gcc/c-incpath.c gcc-4.1.1-arm/gcc/c-incpath.c
+--- gcc-4.1.1/gcc/c-incpath.c	Sat Jun 25 03:02:01 2005
++++ gcc-4.1.1-arm/gcc/c-incpath.c	Wed May 31 03:47:57 2006
 @@ -331,13 +331,18 @@
    cpp_dir *p;
  
@@ -27,9 +27,9 @@ diff -Naurb gcc-4.1.0/gcc/c-incpath.c gcc-4.1.0-arm/gcc/c-incpath.c
  #endif
  
    p = xmalloc (sizeof (cpp_dir));
-diff -Naurb gcc-4.1.0/gcc/gcc.c gcc-4.1.0-arm/gcc/gcc.c
---- gcc-4.1.0/gcc/gcc.c	Sat Jan 21 18:29:08 2006
-+++ gcc-4.1.0-arm/gcc/gcc.c	Fri May  5 10:18:31 2006
+diff -Nbaur gcc-4.1.1/gcc/gcc.c gcc-4.1.1-arm/gcc/gcc.c
+--- gcc-4.1.1/gcc/gcc.c	Wed May 17 19:38:58 2006
++++ gcc-4.1.1-arm/gcc/gcc.c	Wed May 31 03:48:59 2006
 @@ -3250,8 +3250,6 @@
        gcc_libexec_prefix = make_relative_prefix (argv[0],
  						 standard_bindir_prefix,
@@ -39,22 +39,31 @@ diff -Naurb gcc-4.1.0/gcc/gcc.c gcc-4.1.0-arm/gcc/gcc.c
      }
    else
      gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix,
-@@ -6148,10 +6146,10 @@
+@@ -6148,10 +6146,21 @@
  
    /* We need to check standard_exec_prefix/just_machine_suffix/specs
       for any override of as, ld and libraries.  */
--  specs_file = alloca (strlen (standard_exec_prefix)
-+  specs_file = alloca (strlen (gcc_exec_prefix)
++  if ( gcc_exec_prefix )
++  { 
++    specs_file = alloca (strlen (gcc_exec_prefix)
++		         + strlen (just_machine_suffix) + sizeof ("specs"));
++
++    strcpy (specs_file, gcc_exec_prefix);
++  } else {
++  	
+   specs_file = alloca (strlen (standard_exec_prefix)
  		       + strlen (just_machine_suffix) + sizeof ("specs"));
  
--  strcpy (specs_file, standard_exec_prefix);
-+  strcpy (specs_file, gcc_exec_prefix);
+   strcpy (specs_file, standard_exec_prefix);
++
++  }
++
    strcat (specs_file, just_machine_suffix);
    strcat (specs_file, "specs");
    if (access (specs_file, R_OK) == 0)
-diff -Naurb gcc-4.1.0/gcc/prefix.c gcc-4.1.0-arm/gcc/prefix.c
---- gcc-4.1.0/gcc/prefix.c	Sat Jun 25 03:02:01 2005
-+++ gcc-4.1.0-arm/gcc/prefix.c	Fri May  5 10:18:51 2006
+diff -Nbaur gcc-4.1.1/gcc/prefix.c gcc-4.1.1-arm/gcc/prefix.c
+--- gcc-4.1.1/gcc/prefix.c	Sat Jun 25 03:02:01 2005
++++ gcc-4.1.1-arm/gcc/prefix.c	Wed May 31 03:47:57 2006
 @@ -246,13 +246,16 @@
     The returned string is always malloc-ed, and the caller is
     responsible for freeing it.  */
@@ -81,9 +90,9 @@ diff -Naurb gcc-4.1.0/gcc/prefix.c gcc-4.1.0-arm/gcc/prefix.c
 +
 +	putenv (concat ("GCC_EXEC_PREFIX=", std_prefix, NULL));
  }
-diff -Naurb gcc-4.1.0/gcc/toplev.c gcc-4.1.0-arm/gcc/toplev.c
---- gcc-4.1.0/gcc/toplev.c	Sat Feb  4 22:13:20 2006
-+++ gcc-4.1.0-arm/gcc/toplev.c	Wed Apr 26 16:49:36 2006
+diff -Nbaur gcc-4.1.1/gcc/toplev.c gcc-4.1.1-arm/gcc/toplev.c
+--- gcc-4.1.1/gcc/toplev.c	Sat Feb  4 22:13:20 2006
++++ gcc-4.1.1-arm/gcc/toplev.c	Wed May 31 03:48:37 2006
 @@ -82,6 +82,7 @@
  #include "value-prof.h"
  #include "alloc-pool.h"
@@ -98,14 +107,14 @@ diff -Naurb gcc-4.1.0/gcc/toplev.c gcc-4.1.0-arm/gcc/toplev.c
    xmalloc_set_program_name (progname);
 +  
 +  p = getenv("GCC_EXEC_PREFIX");  
-+  set_std_prefix (p, strlen(p));
++  if (p && strlen(p)) set_std_prefix (p, strlen(p));
 +
  
    hex_init ();
  
-diff -Naurb gcc-4.1.0/gcc/version.c gcc-4.1.0-arm/gcc/version.c
---- gcc-4.1.0/gcc/version.c	Wed Mar 16 06:04:10 2005
-+++ gcc-4.1.0-arm/gcc/version.c	Wed Apr 12 16:00:30 2006
+diff -Nbaur gcc-4.1.1/gcc/version.c gcc-4.1.1-arm/gcc/version.c
+--- gcc-4.1.1/gcc/version.c	Wed Mar 16 06:04:10 2005
++++ gcc-4.1.1-arm/gcc/version.c	Wed May 31 03:47:57 2006
 @@ -8,7 +8,7 @@
     in parentheses.  You may also wish to include a number indicating
     the revision of your modified compiler.  */