diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.11/m32r')
-rw-r--r-- | contrib/crossrpms/rtems4.11/m32r/Makefile.am | 8 | ||||
-rw-r--r-- | contrib/crossrpms/rtems4.11/m32r/gcc-sources.add | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/contrib/crossrpms/rtems4.11/m32r/Makefile.am b/contrib/crossrpms/rtems4.11/m32r/Makefile.am index f960128b9d..734ace7078 100644 --- a/contrib/crossrpms/rtems4.11/m32r/Makefile.am +++ b/contrib/crossrpms/rtems4.11/m32r/Makefile.am @@ -11,12 +11,12 @@ BINUTILS_RPMREL = 2 include ../binutils.am BINUTILS_OPTS += -GCC_VERS = 4.6.0 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 4 +GCC_VERS = 4.6.1 +GCC_PKGVERS = $(GCC_VERS)-RC-20110620 +GCC_RPMREL = 1 NEWLIB_VERS = 1.19.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6` +NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 10` include ../gcc.am GCC_OPTS += diff --git a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add index cdb0d72997..b52a34f661 100644 --- a/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add +++ b/contrib/crossrpms/rtems4.11/m32r/gcc-sources.add @@ -1,6 +1,10 @@ +%if "%{gcc_version}" == "4.6.1" +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff +%endif %if "%{gcc_version}" == "4.6.0" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110325.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.0-rtems4.11-20110522.diff %endif %if "%{gcc_version}" == "4.5.3" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -12,6 +16,9 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4 %endif %if %build_cxx +%if "%{gcc_version}" == "4.6.1" +Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +%endif %if "%{gcc_version}" == "4.6.0" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif |