diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-05-05 03:30:00 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-05-05 03:30:00 +0000 |
| commit | e9a571843803c4629d8bd385260515adb1ceaa84 (patch) | |
| tree | 42032951702adf9f15d3be4d8ca44f611099839a /scripts | |
| parent | Clarify bootstrap procedure. (diff) | |
| download | rtems-e9a571843803c4629d8bd385260515adb1ceaa84.tar.bz2 | |
2005-05-05 Ralf Corsepius <ralf.corsepius@rtems.org>
* gccnewlib/gccnewlib.add: Further clean up of tools not supported
by individual targets. Add %build_libgcj.
* gccnewlib/target-gcc.add: Remove dep to base-gcc.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | scripts/gccnewlib/gccnewlib.add | 37 | ||||
| -rw-r--r-- | scripts/gccnewlib/target-gcc.add | 2 |
3 files changed, 23 insertions, 22 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 3d1694ed50..2a92bf860e 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2005-05-05 Ralf Corsepius <ralf.corsepius@rtems.org> + + * gccnewlib/gccnewlib.add: Further clean up of tools not supported + by individual targets. Add %build_libgcj. + * gccnewlib/target-gcc.add: Remove dep to base-gcc. + 2005-05-03 Ralf Corsepius <ralf.corsepius@rtems.org> * gccnewlib/gccnewlib.add: Suppress building tools not supported by diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index 8fd8173b47..4eef35da77 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -60,6 +60,11 @@ BuildRequires: %{rpmprefix}%{gcc_target}-binutils %define build_gcj %_gcj %define build_gnat %_gnat +%if "%{gcc_target}" == "arm-rtems@osversion@" +# Gnat lacks arm support +%define build_gnat 0 +%endif + %if "%{gcc_target}" == "avr-rtems@osversion@" %define build_cxx 0 %define build_f95 0 @@ -73,31 +78,21 @@ BuildRequires: %{rpmprefix}%{gcc_target}-binutils %define build_gnat 0 %endif -%if "%{gcc_target}" == "tic4x-rtems@osversion@" -%define build_cxx 0 -%endif - -%if "%{gcc_target}" == "i386-rtems@osversion@" -%define build_gnat %_gnat -%define build_gcj %_gcj -%endif - -%if "%{gcc_target}" == "m68k-rtems@osversion@" -%define build_gcj %_gcj +%if "%{gcc_target}" == "sh-rtems@osversion@" +# Triggers an ICE in GCC-4.0.0 +%define build_gnat 0 %endif %if "%{gcc_target}" == "mips-rtems@osversion@" -%define build_gcj %_gcj +# Libffi is missing in GCC-4.0.0 +%define build_gcj 0 %endif -%if "%{gcc_target}" == "powerpc-rtems@osversion@" -%define build_gnat %_gnat -%define build_gcj %_gcj -%endif - -%if "%{gcc_target}" == "sparc-rtems@osversion@" -%define build_gnat %_gnat -%define build_gcj %_gcj +%if "%{gcc_target}" == "tic4x-rtems@osversion@" +%define build_cxx 0 +%define build_gnat 0 +%define build_gcj 0 +%define build_f95 0 %endif %if %build_gcj @@ -203,7 +198,7 @@ cd .. --with-system-zlib --disable-nls \ --enable-version-specific-runtime-libs \ --enable-threads=rtems \ - --enable-languages=$languages ${libgcj_flag} + --enable-languages=$languages %{?build_libgcj:--enable-libgcj} %if "%_host" != "%_build" # Bug in gcc-3.2.1: diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add index 6fee29f2b6..af1339aff3 100644 --- a/scripts/gccnewlib/target-gcc.add +++ b/scripts/gccnewlib/target-gcc.add @@ -4,7 +4,7 @@ %package -n %{rpmprefix}%{gcc_target}-gcc Summary: rtems gcc and newlib C Library for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems@osversion@-base-gcc +Requires: %{rpmprefix}%{gcc_target}-binutils %description -n %{rpmprefix}%{gcc_target}-gcc RTEMS is an open source operating system for embedded systems. |