JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* configure.ac: Separate libgloss_dir settings from general case 

over targets.
	* configure: Regenerate.
This commit is contained in:
Joseph Myers 2011-05-04 09:51:31 +00:00
parent f737a4edba
commit 3c34866881
3 changed files with 72 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2011-04-28 Joseph Myers <joseph@codesourcery.com>
* configure.ac (*-*-dragonfly*, *-*-freebsd*, *-*-netbsd*, * configure.ac (*-*-dragonfly*, *-*-freebsd*, *-*-netbsd*,

51
configure vendored
View File

@ -3264,6 +3264,39 @@ esac
# Default libgloss CPU subdirectory. # Default libgloss CPU subdirectory.
libgloss_dir="$target_cpu" 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 case "${target}" in
*-*-chorusos) *-*-chorusos)
noconfigdirs="$noconfigdirs target-newlib target-libgloss" noconfigdirs="$noconfigdirs target-newlib target-libgloss"
@ -3344,25 +3377,20 @@ case "${target}" in
sh*-*-pe|mips*-*-pe|*arm-wince-pe) sh*-*-pe|mips*-*-pe|*arm-wince-pe)
noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
noconfigdirs="$noconfigdirs target-newlib" noconfigdirs="$noconfigdirs target-newlib"
libgloss_dir=wince
;; ;;
arc-*-*) arc-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
arm-*-coff) arm-*-coff)
libgloss_dir=arm
;; ;;
arm-*-elf* | arm*-*-eabi* ) arm-*-elf* | arm*-*-eabi* )
libgloss_dir=arm
;; ;;
arm*-*-linux-gnueabi) arm*-*-linux-gnueabi)
case ${with_newlib} in case ${with_newlib} in
no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
esac esac
libgloss_dir=arm
;; ;;
arm*-*-symbianelf*) arm*-*-symbianelf*)
libgloss_dir=arm
;; ;;
arm-*-pe*) arm-*-pe*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
@ -3388,7 +3416,6 @@ case "${target}" in
*-*-linux*) *-*-linux*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss";; noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
esac esac
libgloss_dir=cris
;; ;;
d10v-*-*) d10v-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
@ -3425,7 +3452,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld" noconfigdirs="$noconfigdirs ld"
;; ;;
hppa*-*-pro*) hppa*-*-pro*)
libgloss_dir=pa
;; ;;
hppa*-*-*) hppa*-*-*)
noconfigdirs="$noconfigdirs ld" noconfigdirs="$noconfigdirs ld"
@ -3446,7 +3472,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
;; ;;
i[3456789]86-*-coff | i[3456789]86-*-elf) i[3456789]86-*-coff | i[3456789]86-*-elf)
libgloss_dir=i386
;; ;;
i[3456789]86-*-linux*) i[3456789]86-*-linux*)
# This section makes it possible to build newlib natively on linux. # This section makes it possible to build newlib natively on linux.
@ -3508,12 +3533,10 @@ case "${target}" in
m32r-*-*) m32r-*-*)
;; ;;
m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
libgloss_dir=m68hc11
;; ;;
m68k-*-elf*) m68k-*-elf*)
;; ;;
m68*-*-* | fido-*-*) m68*-*-* | fido-*-*)
libgloss_dir=m68k
;; ;;
mmix-*-*) mmix-*-*)
noconfigdirs="$noconfigdirs gdb" noconfigdirs="$noconfigdirs gdb"
@ -3534,16 +3557,13 @@ case "${target}" in
# This is temporary until we can link against shared libraries # This is temporary until we can link against shared libraries
powerpcle-*-solaris*) powerpcle-*-solaris*)
noconfigdirs="$noconfigdirs gdb sim tcl tk itcl" noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
libgloss_dir=rs6000
;; ;;
powerpc-*-beos*) powerpc-*-beos*)
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
;; ;;
powerpc-*-eabi) powerpc-*-eabi)
libgloss_dir=rs6000
;; ;;
powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
libgloss_dir=rs6000
;; ;;
rs6000-*-lynxos*) rs6000-*-lynxos*)
noconfigdirs="$noconfigdirs target-newlib gprof" noconfigdirs="$noconfigdirs target-newlib gprof"
@ -3564,7 +3584,6 @@ case "${target}" in
if test x$with_newlib = xyes; then if test x$with_newlib = xyes; then
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
fi fi
libgloss_dir=mips
;; ;;
mips*-*-irix5*) mips*-*-irix5*)
noconfigdirs="$noconfigdirs gprof target-libgloss" noconfigdirs="$noconfigdirs gprof target-libgloss"
@ -3580,7 +3599,6 @@ case "${target}" in
;; ;;
mips*-*-*) mips*-*-*)
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
libgloss_dir=mips
;; ;;
sh-*-* | sh64-*-*) sh-*-* | sh64-*-*)
case "${target}" in case "${target}" in
@ -3591,15 +3609,12 @@ case "${target}" in
esac esac
;; ;;
sparclet-*-aout* | sparc86x-*-*) sparclet-*-aout* | sparc86x-*-*)
libgloss_dir=sparc
;; ;;
sparc-*-elf*) sparc-*-elf*)
;; ;;
sparc64-*-elf*) sparc64-*-elf*)
libgloss_dir=sparc
;; ;;
sparclite-*-*) sparclite-*-*)
libgloss_dir=sparc
;; ;;
sparc-*-sunos4*) sparc-*-sunos4*)
if test x${is_cross_compiler} != xno ; then if test x${is_cross_compiler} != xno ; then

51
configure.ac
View File

@ -711,6 +711,39 @@ esac
# Default libgloss CPU subdirectory. # Default libgloss CPU subdirectory.
libgloss_dir="$target_cpu" 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 case "${target}" in
*-*-chorusos) *-*-chorusos)
noconfigdirs="$noconfigdirs target-newlib target-libgloss" noconfigdirs="$noconfigdirs target-newlib target-libgloss"
@ -791,25 +824,20 @@ case "${target}" in
sh*-*-pe|mips*-*-pe|*arm-wince-pe) sh*-*-pe|mips*-*-pe|*arm-wince-pe)
noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
noconfigdirs="$noconfigdirs target-newlib" noconfigdirs="$noconfigdirs target-newlib"
libgloss_dir=wince
;; ;;
arc-*-*) arc-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
arm-*-coff) arm-*-coff)
libgloss_dir=arm
;; ;;
arm-*-elf* | arm*-*-eabi* ) arm-*-elf* | arm*-*-eabi* )
libgloss_dir=arm
;; ;;
arm*-*-linux-gnueabi) arm*-*-linux-gnueabi)
case ${with_newlib} in case ${with_newlib} in
no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
esac esac
libgloss_dir=arm
;; ;;
arm*-*-symbianelf*) arm*-*-symbianelf*)
libgloss_dir=arm
;; ;;
arm-*-pe*) arm-*-pe*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
@ -835,7 +863,6 @@ case "${target}" in
*-*-linux*) *-*-linux*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss";; noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
esac esac
libgloss_dir=cris
;; ;;
d10v-*-*) d10v-*-*)
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
@ -872,7 +899,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld" noconfigdirs="$noconfigdirs ld"
;; ;;
hppa*-*-pro*) hppa*-*-pro*)
libgloss_dir=pa
;; ;;
hppa*-*-*) hppa*-*-*)
noconfigdirs="$noconfigdirs ld" noconfigdirs="$noconfigdirs ld"
@ -893,7 +919,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
;; ;;
i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
libgloss_dir=i386
;; ;;
i[[3456789]]86-*-linux*) i[[3456789]]86-*-linux*)
# This section makes it possible to build newlib natively on linux. # This section makes it possible to build newlib natively on linux.
@ -955,12 +980,10 @@ case "${target}" in
m32r-*-*) m32r-*-*)
;; ;;
m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
libgloss_dir=m68hc11
;; ;;
m68k-*-elf*) m68k-*-elf*)
;; ;;
m68*-*-* | fido-*-*) m68*-*-* | fido-*-*)
libgloss_dir=m68k
;; ;;
mmix-*-*) mmix-*-*)
noconfigdirs="$noconfigdirs gdb" noconfigdirs="$noconfigdirs gdb"
@ -981,16 +1004,13 @@ case "${target}" in
# This is temporary until we can link against shared libraries # This is temporary until we can link against shared libraries
powerpcle-*-solaris*) powerpcle-*-solaris*)
noconfigdirs="$noconfigdirs gdb sim tcl tk itcl" noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
libgloss_dir=rs6000
;; ;;
powerpc-*-beos*) powerpc-*-beos*)
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
;; ;;
powerpc-*-eabi) powerpc-*-eabi)
libgloss_dir=rs6000
;; ;;
powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
libgloss_dir=rs6000
;; ;;
rs6000-*-lynxos*) rs6000-*-lynxos*)
noconfigdirs="$noconfigdirs target-newlib gprof" noconfigdirs="$noconfigdirs target-newlib gprof"
@ -1011,7 +1031,6 @@ case "${target}" in
if test x$with_newlib = xyes; then if test x$with_newlib = xyes; then
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
fi fi
libgloss_dir=mips
;; ;;
mips*-*-irix5*) mips*-*-irix5*)
noconfigdirs="$noconfigdirs gprof target-libgloss" noconfigdirs="$noconfigdirs gprof target-libgloss"
@ -1027,7 +1046,6 @@ case "${target}" in
;; ;;
mips*-*-*) mips*-*-*)
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
libgloss_dir=mips
;; ;;
sh-*-* | sh64-*-*) sh-*-* | sh64-*-*)
case "${target}" in case "${target}" in
@ -1038,15 +1056,12 @@ case "${target}" in
esac esac
;; ;;
sparclet-*-aout* | sparc86x-*-*) sparclet-*-aout* | sparc86x-*-*)
libgloss_dir=sparc
;; ;;
sparc-*-elf*) sparc-*-elf*)
;; ;;
sparc64-*-elf*) sparc64-*-elf*)
libgloss_dir=sparc
;; ;;
sparclite-*-*) sparclite-*-*)
libgloss_dir=sparc
;; ;;
sparc-*-sunos4*) sparc-*-sunos4*)
if test x${is_cross_compiler} != xno ; then if test x${is_cross_compiler} != xno ; then