mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-04-24 06:48:53 -05:00
127 lines
4.5 KiB
Diff
127 lines
4.5 KiB
Diff
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
|
|
@@ -331,13 +331,18 @@
|
|
cpp_dir *p;
|
|
|
|
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
|
- /* Convert all backslashes to slashes. The native CRT stat()
|
|
- function does not recognize a directory that ends in a backslash
|
|
- (unless it is a drive root dir, such "c:\"). Forward slashes,
|
|
- trailing or otherwise, cause no problems for stat(). */
|
|
- char* c;
|
|
- for (c = path; *c; c++)
|
|
- if (*c == '\\') *c = '/';
|
|
+ /* Remove unnecessary trailing slashes. On some versions of MS
|
|
+ Windows, trailing _forward_ slashes cause no problems for stat().
|
|
+ On newer versions, stat() does not recognise a directory that ends
|
|
+ in a '\\' or '/', unless it is a drive root dir, such as "c:/",
|
|
+ where it is obligatory. */
|
|
+ int pathlen = strlen (path);
|
|
+ char* end = path + pathlen - 1;
|
|
+ /* Preserve the lead '/' or lead "c:/". */
|
|
+ char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1);
|
|
+
|
|
+ for (; end > start && IS_DIR_SEPARATOR (*end); end--)
|
|
+ *end = 0;
|
|
#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
|
|
@@ -3250,8 +3250,6 @@
|
|
gcc_libexec_prefix = make_relative_prefix (argv[0],
|
|
standard_bindir_prefix,
|
|
standard_libexec_prefix);
|
|
- if (gcc_exec_prefix)
|
|
- putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
|
|
}
|
|
else
|
|
gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix,
|
|
@@ -6148,10 +6146,10 @@
|
|
|
|
/* 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)
|
|
+ strlen (just_machine_suffix) + sizeof ("specs"));
|
|
|
|
- strcpy (specs_file, standard_exec_prefix);
|
|
+ strcpy (specs_file, gcc_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
|
|
@@ -246,13 +246,16 @@
|
|
The returned string is always malloc-ed, and the caller is
|
|
responsible for freeing it. */
|
|
|
|
+
|
|
+static const char *old_prefix = PREFIX;
|
|
+
|
|
char *
|
|
update_path (const char *path, const char *key)
|
|
{
|
|
char *result, *p;
|
|
- const int len = strlen (std_prefix);
|
|
+ const int len = strlen (old_prefix);
|
|
|
|
- if (! strncmp (path, std_prefix, len)
|
|
+ if (! strncmp (path, old_prefix, len)
|
|
&& (IS_DIR_SEPARATOR(path[len])
|
|
|| path[len] == '\0')
|
|
&& key != 0)
|
|
@@ -354,4 +357,6 @@
|
|
set_std_prefix (const char *prefix, int len)
|
|
{
|
|
std_prefix = save_string (prefix, len);
|
|
+
|
|
+ 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
|
|
@@ -82,6 +82,7 @@
|
|
#include "value-prof.h"
|
|
#include "alloc-pool.h"
|
|
#include "tree-mudflap.h"
|
|
+#include "prefix.h"
|
|
|
|
#if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
|
|
#include "dwarf2out.h"
|
|
@@ -1434,6 +1435,10 @@
|
|
progname = p;
|
|
|
|
xmalloc_set_program_name (progname);
|
|
+
|
|
+ p = getenv("GCC_EXEC_PREFIX");
|
|
+ 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
|
|
@@ -8,7 +8,7 @@
|
|
in parentheses. You may also wish to include a number indicating
|
|
the revision of your modified compiler. */
|
|
|
|
-#define VERSUFFIX ""
|
|
+#define VERSUFFIX " (devkitARM release 19)"
|
|
|
|
/* This is the location of the online document giving instructions for
|
|
reporting bugs. If you distribute a modified version of GCC,
|
|
@@ -17,7 +17,7 @@
|
|
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://devkitpro.sourceforge.net/bugs.shtml>";
|
|
|
|
/* The complete version string, assembled from several pieces.
|
|
BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */
|