config.gcc (alpha*-dec-vms*): Change to alpha*-dec-*vms*

	* config.gcc (alpha*-dec-vms*): Change to alpha*-dec-*vms*
	(exeext, target_alias, prefix, local_prefix): Define.
	* config/alpha/x-vms (USE_COLLECT2): Make empty.
	* config/alpha/xm-vms.h (INCLUDE_DEFAULTS): Use Unix style
	file specifications. Remove ".".
	(GCC_INCLUDE_DIR): Remove redefinition (redundant).
	* fixinc/mkfixinc.sh (alpha*-dec-vms*):  Change to alpha*-dec-*vms*

From-SVN: r47840

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a6315b1af09002c55be67a4ab3087c9fac05f90..d3543177a0c4503aa382b4b8225d8d0e0542d455 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec 10 06:09:57 2001  Douglas B. Rupp  <rupp@gnat.com>
+
+       * config.gcc (alpha*-dec-vms*): Change to alpha*-dec-*vms*
+       (exeext, target_alias, prefix, local_prefix): Define.
+       * config/alpha/x-vms (USE_COLLECT2): Make empty.
+       * config/alpha/xm-vms.h (INCLUDE_DEFAULTS): Use Unix style
+       file specifications. Remove ".".
+       (GCC_INCLUDE_DIR): Remove redefinition (redundant).
+       * fixinc/mkfixinc.sh (alpha*-dec-vms*):  Change to alpha*-dec-*vms*
+
 2001-12-09  Nathan Sidwell  <nathan@codesourcery.com>
 
        * Makefile.in (.po.gmo): Use POSIXLY_CORRECT argument ordering.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6a689c9c5d2636ccd79d7a547f989f6c67c5d97c..10999d7c73cfa36b80368265cbf962c1ea826f6f 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -519,12 +519,22 @@ alpha*-*-vxworks*)
        use_collect2=yes
        thread_file='vxworks'
        ;;
-alpha*-dec-vms*)
+alpha*-dec-*vms*)
        xm_defines=POSIX
        tm_file=alpha/vms.h
        xm_file=alpha/xm-vms.h
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
        xmake_file=alpha/x-vms
+       exeext=.exe
+       # This removes the cpu type and manufacturer components and
+       #  replaces "." with "_" in the operating system version.
+       case $host in *-*-*vms*)
+               target_alias=`echo $host \
+                 | sed 's/.*-.*-\(.*\)$/\1/' | sed 's/\./_/g'`
+               ;;
+       esac
+       prefix=/gnu
+       local_prefix=/gnu
        ;;
 arc-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"

diff --git a/gcc/config/alpha/x-vms b/gcc/config/alpha/x-vms
index 79238a1fa6388a5d51369a3fa3f6d276f19cd545..39f0ab998582e188ce872bde42784a2bae6bbb8a 100644 (file)
--- a/gcc/config/alpha/x-vms
+++ b/gcc/config/alpha/x-vms
@@ -9,6 +9,7 @@ decc.exe : vms-cc.o
        $(CC) -o $@ vms-cc.o ../libiberty/libiberty.a
 
 EXTRA_PROGRAMS=ld.exe decc.exe
+USE_COLLECT2=
 
 # These extra parts can only be compiled on a VMS host and are only needed
 # on a VMS target.

diff --git a/gcc/config/alpha/xm-vms.h b/gcc/config/alpha/xm-vms.h
index 0b918d1f0dfd8c94f71846985a261586cf35868c..5723658e9bb49f2a9bee81ec94827d3a8ccae396 100644 (file)
--- a/gcc/config/alpha/xm-vms.h
+++ b/gcc/config/alpha/xm-vms.h
@@ -27,13 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #define VMS
 #endif
 
-#define GCC_INCLUDE_DIR ""
 /* Specify the list of include file directories.  */
 #define INCLUDE_DEFAULTS               \
 {                                      \
-  { "GNU_GXX_INCLUDE:", "G++", 1, 1 }, \
-  { "GNU_CC_INCLUDE:", "GCC", 0, 0 },  \
-  { ".", 0, 0, 1 },                    \
+  { "/gnu_gxx_include", "G++", 1, 1 }, \
+  { "/gnu_cc_include", "GCC", 0, 0 },  \
   { 0, 0, 0, 0 }                       \
 }
 

diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 29567bd35fc61657c4c73b58ad2dc5c1d772c199..6cf269bc1783559f7a0218dfe8e2c07fe5b7ffd0 100755 (executable)
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -57,7 +57,7 @@ case $machine in
                fixincludes=fixinc.ptx
                ;;
 
-       alpha*-dec-vms* | \
+       alpha*-dec-*vms* | \
        arm-semi-aout | armel-semi-aout | \
        arm-semi-aof | armel-semi-aof | \
        c*-convex-* | \