summaryrefslogtreecommitdiff
path: root/gnattools
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-04 21:25:11 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-04 21:25:11 +0000
commit5b173fd9dc929b1f7814f6c642fe073266868024 (patch)
tree49ab457ee191db5beb836b9d26f5836b735f2fa8 /gnattools
parentbdf1e3c7b4afbb2bde45621cdb4513b0d3bbb1f1 (diff)
downloadgcc-5b173fd9dc929b1f7814f6c642fe073266868024.tar.gz
PR ada/59382
gnattools/ * configure.ac (target parameterization): Rewrite. * configure: Regenerate. gcc/ada/ * indepsw-darwin.adb: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205681 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gnattools')
-rw-r--r--gnattools/ChangeLog6
-rwxr-xr-xgnattools/configure69
-rw-r--r--gnattools/configure.ac69
3 files changed, 60 insertions, 84 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index a1e7b9a32b8..98f528a4cd5 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-04 Eric Botcazou <ebotcazou@adacore.com>
+
+ PR ada/59382
+ * configure.ac (target parameterization): Rewrite.
+ * configure: Regenerate.
+
2013-09-01 Eric Botcazou <ebotcazou@adacore.com>
Iain Sandoe <iain@codesourcery.com>
diff --git a/gnattools/configure b/gnattools/configure
index 54a2be6c2db..883b705f6cc 100755
--- a/gnattools/configure
+++ b/gnattools/configure
@@ -2029,66 +2029,59 @@ EXTRA_GNATTOOLS=
# Per-target case statement
# -------------------------
case "${target}" in
- alpha*-dec-vx*) # Unlike all other Vxworks
- ;;
- m68k*-wrs-vx* \
- | powerpc*-wrs-vxworks \
- | sparc*-wrs-vx* \
- | *86-wrs-vxworks \
- | mips*-wrs-vx*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb"
+ *-*-aix*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
+ indepsw.adb<indepsw-aix.adb"
;;
- sparc-sun-solaris*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
+ *-*-darwin*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
+ indepsw.adb<indepsw-darwin.adb"
;;
- *86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
+ *-*-freebsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
;;
- *86-*-linux* \
- | powerpc*-*-linux* \
- | *ia64-*-linux* \
- | alpha*-*-linux* \
- | sparc*-*-linux* \
- | hppa*-*-linux* \
- | *x86_64-*-linux*)
+ *-*-linux*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
indepsw.adb<indepsw-gnu.adb"
;;
- s390*-*-linux*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
+ *-*-lynxos*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-lynxos.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
+ *-*-solaris*)
+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
;;
- *86-*-freebsd*)
+ *-*-vxworks*)
TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
indepsw.adb<indepsw-gnu.adb"
;;
- hppa*-hp-hpux10*) # Unlike hpux11
+ hppa*-hp-hpux10*)
;;
hppa*-hp-hpux11*)
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
;;
- *-ibm-aix*)
- TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
- indepsw.adb<indepsw-aix.adb"
+ ia64-hp-hpux11*)
+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb"
;;
- alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \
- | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*)
+ alpha*-*-vms* | alpha*-*-openvms*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \
symbols.adb<symbols-vms.adb \
symbols-processing.adb<symbols-processing-vms-alpha.adb"
-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
;;
- ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \
- | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*)
+ ia64-*-vms* | ia64-*-openvms*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \
symbols.adb<symbols-vms.adb \
symbols-processing.adb<symbols-processing-vms-ia64.adb"
-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
;;
*-*-cygwin32* | *-*-mingw32* | *-*-pe)
@@ -2097,14 +2090,6 @@ case "${target}" in
indepsw.adb<indepsw-mingw.adb"
EXTRA_GNATTOOLS='../../gnatdll$(exeext)'
;;
- *-*-darwin*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb"
- ;;
- *-*-lynxos)
- TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-lynxos.adb \
- indepsw.adb<indepsw-gnu.adb"
- ;;
esac
# From user or toplevel makefile.
diff --git a/gnattools/configure.ac b/gnattools/configure.ac
index 4305e6bd58b..5edaadfcf58 100644
--- a/gnattools/configure.ac
+++ b/gnattools/configure.ac
@@ -69,66 +69,59 @@ AC_SUBST(EXTRA_GNATTOOLS)
# Per-target case statement
# -------------------------
case "${target}" in
- alpha*-dec-vx*) # Unlike all other Vxworks
- ;;
- m68k*-wrs-vx* \
- | powerpc*-wrs-vxworks \
- | sparc*-wrs-vx* \
- | *86-wrs-vxworks \
- | mips*-wrs-vx*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb"
+ *-*-aix*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
+ indepsw.adb<indepsw-aix.adb"
;;
- sparc-sun-solaris*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
+ *-*-darwin*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
+ indepsw.adb<indepsw-darwin.adb"
;;
- *86-*-solaris2* | x86_64-*-solaris2.1[[0-9]]*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
+ *-*-freebsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
;;
- *86-*-linux* \
- | powerpc*-*-linux* \
- | *ia64-*-linux* \
- | alpha*-*-linux* \
- | sparc*-*-linux* \
- | hppa*-*-linux* \
- | *x86_64-*-linux*)
+ *-*-linux*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
indepsw.adb<indepsw-gnu.adb"
;;
- s390*-*-linux*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
+ *-*-lynxos*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-lynxos.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
+ *-*-solaris*)
+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
;;
- *86-*-freebsd*)
+ *-*-vxworks*)
TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
indepsw.adb<indepsw-gnu.adb"
;;
- hppa*-hp-hpux10*) # Unlike hpux11
+ hppa*-hp-hpux10*)
;;
hppa*-hp-hpux11*)
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
;;
- *-ibm-aix*)
- TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
- indepsw.adb<indepsw-aix.adb"
+ ia64-hp-hpux11*)
+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb"
;;
- alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \
- | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*)
+ alpha*-*-vms* | alpha*-*-openvms*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \
symbols.adb<symbols-vms.adb \
symbols-processing.adb<symbols-processing-vms-alpha.adb"
-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
;;
- ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \
- | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*)
+ ia64-*-vms* | ia64-*-openvms*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \
symbols.adb<symbols-vms.adb \
symbols-processing.adb<symbols-processing-vms-ia64.adb"
-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
;;
*-*-cygwin32* | *-*-mingw32* | *-*-pe)
@@ -137,14 +130,6 @@ case "${target}" in
indepsw.adb<indepsw-mingw.adb"
EXTRA_GNATTOOLS='../../gnatdll$(exeext)'
;;
- *-*-darwin*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb"
- ;;
- *-*-lynxos)
- TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-lynxos.adb \
- indepsw.adb<indepsw-gnu.adb"
- ;;
esac
# From user or toplevel makefile.