diff --git a/build-devkit.sh b/build-devkit.sh index 279dfb9..ce5f962 100644 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -79,7 +79,7 @@ done case "$VERSION" in "1" ) - GCC_VER=4.3.0 + GCC_VER=4.3.1 BINUTILS_VER=2.18.50 NEWLIB_VER=1.16.0 GDB_VER=6.8 diff --git a/dkarm-eabi/patches/gcc-4.3.1.patch b/dkarm-eabi/patches/gcc-4.3.1.patch new file mode 100644 index 0000000..582a205 --- /dev/null +++ b/dkarm-eabi/patches/gcc-4.3.1.patch @@ -0,0 +1,138 @@ +diff -Nbaur gcc-4.3.0/gcc/config/arm/t-arm-elf gcc-4.3.0-arm/gcc/config/arm/t-arm-elf +--- gcc-4.3.0/gcc/config/arm/t-arm-elf Wed Jan 3 23:48:10 2007 ++++ gcc-4.3.0-arm/gcc/config/arm/t-arm-elf Mon Mar 24 19:58:16 2008 +@@ -25,9 +25,9 @@ + # MULTILIB_DIRNAMES += ep9312 + # MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* + # +-# MULTILIB_OPTIONS += mlittle-endian/mbig-endian +-# MULTILIB_DIRNAMES += le be +-# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle ++MULTILIB_OPTIONS += mlittle-endian/mbig-endian ++MULTILIB_DIRNAMES += le be ++MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle + # + # MULTILIB_OPTIONS += mhard-float/msoft-float + # MULTILIB_DIRNAMES += fpu soft +diff -Nbaur gcc-4.3.0/gcc/config/arm/unknown-elf.h gcc-4.3.0-arm/gcc/config/arm/unknown-elf.h +--- gcc-4.3.0/gcc/config/arm/unknown-elf.h Thu Aug 2 11:49:31 2007 ++++ gcc-4.3.0-arm/gcc/config/arm/unknown-elf.h Mon Mar 24 19:58:16 2008 +@@ -93,4 +93,4 @@ + udivmoddi4, which will depend on the exception unwind routines, + which will depend on abort, which is defined in libc. */ + #undef LINK_GCC_C_SEQUENCE_SPEC +-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group" ++#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group" +diff -Nbaur gcc-4.3.0/gcc/gcc.c gcc-4.3.0-arm/gcc/gcc.c +--- gcc-4.3.0/gcc/gcc.c Sun Mar 2 22:55:19 2008 ++++ gcc-4.3.0-arm/gcc/gcc.c Mon Mar 24 20:04:13 2008 +@@ -635,6 +635,11 @@ + #endif + #endif + ++#ifndef LIBGLOSS_SPEC ++# define LIBGLOSS_SPEC "-lsysbase" ++#endif ++ ++ + /* config.h can define STARTFILE_SPEC to override the default crt0 files. */ + #ifndef STARTFILE_SPEC + #define STARTFILE_SPEC \ +@@ -762,6 +767,7 @@ + static const char *mflib_spec = MFLIB_SPEC; + static const char *link_gomp_spec = ""; + static const char *libgcc_spec = LIBGCC_SPEC; ++static const char *libgloss_spec = LIBGLOSS_SPEC; + static const char *endfile_spec = ENDFILE_SPEC; + static const char *startfile_spec = STARTFILE_SPEC; + static const char *switches_need_spaces = SWITCHES_NEED_SPACES; +@@ -1586,6 +1592,7 @@ + INIT_STATIC_SPEC ("mflib", &mflib_spec), + INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec), + INIT_STATIC_SPEC ("libgcc", &libgcc_spec), ++ INIT_STATIC_SPEC ("libgloss", &libgloss_spec), + INIT_STATIC_SPEC ("startfile", &startfile_spec), + INIT_STATIC_SPEC ("switches_need_spaces", &switches_need_spaces), + INIT_STATIC_SPEC ("cross_compile", &cross_compile), +@@ -3418,8 +3425,6 @@ + gcc_libexec_prefix = make_relative_prefix (argv[0], + standard_bindir_prefix, + standard_libexec_prefix); +- if (gcc_exec_prefix) +- xputenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL)); + } + else + { +@@ -6264,10 +6269,21 @@ + + /* We need to check standard_exec_prefix/just_machine_suffix/specs + for any override of as, ld and libraries. */ ++ 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); ++ ++ } ++ + strcat (specs_file, just_machine_suffix); + strcat (specs_file, "specs"); + if (access (specs_file, R_OK) == 0) +diff -Nbaur gcc-4.3.0/gcc/prefix.c gcc-4.3.0-arm/gcc/prefix.c +--- gcc-4.3.0/gcc/prefix.c Mon Sep 3 18:09:20 2007 ++++ gcc-4.3.0-arm/gcc/prefix.c Mon Mar 24 19:58:16 2008 +@@ -245,13 +245,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) +@@ -353,4 +356,6 @@ + set_std_prefix (const char *prefix, int len) + { + std_prefix = save_string (prefix, len); ++ ++ putenv (concat ("GCC_EXEC_PREFIX=", std_prefix, NULL)); + } +diff -Nbaur gcc-4.3.0/gcc/toplev.c gcc-4.3.0-arm/gcc/toplev.c +--- gcc-4.3.0/gcc/toplev.c Tue Feb 5 16:23:10 2008 ++++ gcc-4.3.0-arm/gcc/toplev.c Mon Mar 24 20:05:51 2008 +@@ -82,6 +82,7 @@ + #include "alloc-pool.h" + #include "tree-mudflap.h" + #include "tree-pass.h" ++#include "prefix.h" + + #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO) + #include "dwarf2out.h" +@@ -1622,6 +1623,10 @@ + progname = p; + + xmalloc_set_program_name (progname); ++ ++ p = getenv("GCC_EXEC_PREFIX"); ++ if (p && strlen(p)) set_std_prefix (p, strlen(p)); ++ + + hex_init (); + diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh index 60b9d57..ac4ee81 100644 --- a/dkarm-eabi/scripts/build-gcc.sh +++ b/dkarm-eabi/scripts/build-gcc.sh @@ -53,7 +53,7 @@ then --target=$target \ --with-newlib \ --prefix=$prefix\ - --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 23a" \ + --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 24" \ || { echo "Error configuring gcc"; exit 1; } touch configured-gcc fi