diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 51 | ||||
| -rw-r--r-- | configure.ac | 51 |
3 files changed, 72 insertions, 36 deletions
@@ -1,3 +1,9 @@ +2011-05-04 Joseph Myers <joseph@codesourcery.com> + + * configure.ac: Separate libgloss_dir settings from general case + over targets. + * configure: Regenerate. + 2011-04-28 Joseph Myers <joseph@codesourcery.com> * configure.ac (*-*-dragonfly*, *-*-freebsd*, *-*-netbsd*, @@ -3265,6 +3265,39 @@ esac libgloss_dir="$target_cpu" case "${target}" in + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + libgloss_dir=wince + ;; + arm*-*-*) + libgloss_dir=arm + ;; + cris-*-* | crisv32-*-*) + libgloss_dir=cris + ;; + hppa*-*-*) + libgloss_dir=pa + ;; + i[3456789]86-*-*) + libgloss_dir=i386 + ;; + m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) + libgloss_dir=m68hc11 + ;; + m68*-*-* | fido-*-*) + libgloss_dir=m68k + ;; + mips*-*-*) + libgloss_dir=mips + ;; + powerpc*-*-*) + libgloss_dir=rs6000 + ;; + sparc*-*-*) + libgloss_dir=sparc + ;; +esac + +case "${target}" in *-*-chorusos) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; @@ -3344,25 +3377,20 @@ case "${target}" in sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs target-newlib" - libgloss_dir=wince ;; arc-*-*) noconfigdirs="$noconfigdirs target-libgloss" ;; arm-*-coff) - libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - libgloss_dir=arm ;; arm*-*-linux-gnueabi) case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac - libgloss_dir=arm ;; arm*-*-symbianelf*) - libgloss_dir=arm ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss" @@ -3388,7 +3416,6 @@ case "${target}" in *-*-linux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss";; esac - libgloss_dir=cris ;; d10v-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -3425,7 +3452,6 @@ case "${target}" in noconfigdirs="$noconfigdirs ld" ;; hppa*-*-pro*) - libgloss_dir=pa ;; hppa*-*-*) noconfigdirs="$noconfigdirs ld" @@ -3446,7 +3472,6 @@ case "${target}" in noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" ;; i[3456789]86-*-coff | i[3456789]86-*-elf) - libgloss_dir=i386 ;; i[3456789]86-*-linux*) # This section makes it possible to build newlib natively on linux. @@ -3508,12 +3533,10 @@ case "${target}" in m32r-*-*) ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) - libgloss_dir=m68hc11 ;; m68k-*-elf*) ;; m68*-*-* | fido-*-*) - libgloss_dir=m68k ;; mmix-*-*) noconfigdirs="$noconfigdirs gdb" @@ -3534,16 +3557,13 @@ case "${target}" in # This is temporary until we can link against shared libraries powerpcle-*-solaris*) noconfigdirs="$noconfigdirs gdb sim tcl tk itcl" - libgloss_dir=rs6000 ;; powerpc-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; powerpc-*-eabi) - libgloss_dir=rs6000 ;; powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) - libgloss_dir=rs6000 ;; rs6000-*-lynxos*) noconfigdirs="$noconfigdirs target-newlib gprof" @@ -3564,7 +3584,6 @@ case "${target}" in if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" fi - libgloss_dir=mips ;; mips*-*-irix5*) noconfigdirs="$noconfigdirs gprof target-libgloss" @@ -3580,7 +3599,6 @@ case "${target}" in ;; mips*-*-*) noconfigdirs="$noconfigdirs gprof" - libgloss_dir=mips ;; sh-*-* | sh64-*-*) case "${target}" in @@ -3591,15 +3609,12 @@ case "${target}" in esac ;; sparclet-*-aout* | sparc86x-*-*) - libgloss_dir=sparc ;; sparc-*-elf*) ;; sparc64-*-elf*) - libgloss_dir=sparc ;; sparclite-*-*) - libgloss_dir=sparc ;; sparc-*-sunos4*) if test x${is_cross_compiler} != xno ; then diff --git a/configure.ac b/configure.ac index a536c5e..c41abf3 100644 --- a/configure.ac +++ b/configure.ac @@ -712,6 +712,39 @@ esac libgloss_dir="$target_cpu" case "${target}" in + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + libgloss_dir=wince + ;; + arm*-*-*) + libgloss_dir=arm + ;; + cris-*-* | crisv32-*-*) + libgloss_dir=cris + ;; + hppa*-*-*) + libgloss_dir=pa + ;; + i[[3456789]]86-*-*) + libgloss_dir=i386 + ;; + m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) + libgloss_dir=m68hc11 + ;; + m68*-*-* | fido-*-*) + libgloss_dir=m68k + ;; + mips*-*-*) + libgloss_dir=mips + ;; + powerpc*-*-*) + libgloss_dir=rs6000 + ;; + sparc*-*-*) + libgloss_dir=sparc + ;; +esac + +case "${target}" in *-*-chorusos) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; @@ -791,25 +824,20 @@ case "${target}" in sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs target-newlib" - libgloss_dir=wince ;; arc-*-*) noconfigdirs="$noconfigdirs target-libgloss" ;; arm-*-coff) - libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - libgloss_dir=arm ;; arm*-*-linux-gnueabi) case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac - libgloss_dir=arm ;; arm*-*-symbianelf*) - libgloss_dir=arm ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss" @@ -835,7 +863,6 @@ case "${target}" in *-*-linux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss";; esac - libgloss_dir=cris ;; d10v-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -872,7 +899,6 @@ case "${target}" in noconfigdirs="$noconfigdirs ld" ;; hppa*-*-pro*) - libgloss_dir=pa ;; hppa*-*-*) noconfigdirs="$noconfigdirs ld" @@ -893,7 +919,6 @@ case "${target}" in noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" ;; i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) - libgloss_dir=i386 ;; i[[3456789]]86-*-linux*) # This section makes it possible to build newlib natively on linux. @@ -955,12 +980,10 @@ case "${target}" in m32r-*-*) ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) - libgloss_dir=m68hc11 ;; m68k-*-elf*) ;; m68*-*-* | fido-*-*) - libgloss_dir=m68k ;; mmix-*-*) noconfigdirs="$noconfigdirs gdb" @@ -981,16 +1004,13 @@ case "${target}" in # This is temporary until we can link against shared libraries powerpcle-*-solaris*) noconfigdirs="$noconfigdirs gdb sim tcl tk itcl" - libgloss_dir=rs6000 ;; powerpc-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; powerpc-*-eabi) - libgloss_dir=rs6000 ;; powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) - libgloss_dir=rs6000 ;; rs6000-*-lynxos*) noconfigdirs="$noconfigdirs target-newlib gprof" @@ -1011,7 +1031,6 @@ case "${target}" in if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" fi - libgloss_dir=mips ;; mips*-*-irix5*) noconfigdirs="$noconfigdirs gprof target-libgloss" @@ -1027,7 +1046,6 @@ case "${target}" in ;; mips*-*-*) noconfigdirs="$noconfigdirs gprof" - libgloss_dir=mips ;; sh-*-* | sh64-*-*) case "${target}" in @@ -1038,15 +1056,12 @@ case "${target}" in esac ;; sparclet-*-aout* | sparc86x-*-*) - libgloss_dir=sparc ;; sparc-*-elf*) ;; sparc64-*-elf*) - libgloss_dir=sparc ;; sparclite-*-*) - libgloss_dir=sparc ;; sparc-*-sunos4*) if test x${is_cross_compiler} != xno ; then |