2012-01-04 Tristan Gingold <gingold@adacore.com>

	* config/vms/xm-vms.h (HOST_LONG_FORMAT, HOST_PTR_PRINTF): Define
	when long pointers are used.
	* config.build (*-*-*vms*): Handle all OpenVMS targets.
	(alpha64-dec-*vms*, alpha*-dec-*vms*)
	(ia64-hp-*vms*): Remove.
	* config/vms/xm-vms64.h: Delete.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182879 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 23 insertions, 44 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 961f895fe82..d5cc90358c0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-04  Tristan Gingold  <gingold@adacore.com>
+
+	* config/vms/xm-vms.h (HOST_LONG_FORMAT, HOST_PTR_PRINTF): Define
+	when long pointers are used.
+	* config.build (*-*-*vms*): Handle all OpenVMS targets.
+	(alpha64-dec-*vms*, alpha*-dec-*vms*)
+	(ia64-hp-*vms*): Remove.
+	* config/vms/xm-vms64.h: Delete.
+
 2012-01-04  Aldy Hernandez  <aldyh@redhat.com>
 
 	* opts.c (finish_options): Remove duplicate sorry.
diff --git a/gcc/config.build b/gcc/config.build
index abb27d7f6c1..26809b61225 100644
--- a/gcc/config.build
+++ b/gcc/config.build
@@ -52,20 +52,6 @@ build_file_translate=
 
 # System-specific settings.
 case $build in
-  alpha64-dec-*vms*)
-    build_xm_file="vms/xm-vms.h vms/xm-vms64.h"
-    build_exeext=.exe
-    build_install_headers_dir=install-headers-cp
-    prefix=/gnu
-    local_prefix=/gnu/local
-    ;;
-  alpha*-dec-*vms*)
-    build_xm_file="vms/xm-vms.h"
-    build_exeext=.exe
-    build_install_headers_dir=install-headers-cp
-    prefix=/gnu
-    local_prefix=/gnu/local
-    ;;
   hppa1.0-*-hpux1[01]* | \
   hppa*64*-*-hpux11* | \
   hppa1.1-*-hpux11* | \
@@ -114,13 +100,6 @@ case $build in
   i386-*-vsta) 
     # Intel 80386's running VSTa kernel
     ;;
-  ia64-hp-*vms*)
-    build_xm_file="vms/xm-vms.h vms/xm-vms64.h"
-    build_exeext=.exe
-    build_install_headers_dir=install-headers-cp
-    prefix=/gnu
-    local_prefix=/gnu/local
-    ;;
   m68000-hp-hpux* | m68k-hp-hpux*) 
     # HP 9000 series 300
     build_install_headers_dir=install-headers-cpio
@@ -129,5 +108,11 @@ case $build in
     # All other System V variants.
     build_install_headers_dir=install-headers-cpio
     ;;
+  *-*-*vms*)
+    # All OpenVMS targets.
+    build_xm_file="vms/xm-vms.h"
+    build_exeext=.exe
+    build_install_headers_dir=install-headers-cp
+    ;;
 esac
 
diff --git a/gcc/config/vms/xm-vms.h b/gcc/config/vms/xm-vms.h
index 9685da7c114..631724e92ee 100644
--- a/gcc/config/vms/xm-vms.h
+++ b/gcc/config/vms/xm-vms.h
@@ -53,4 +53,12 @@ do                                                         \
 	}                                                  \
   } while (0)
 
+/* If 64 bit pointers are used, use 64 bit specifier.  */
+
+#if (defined (__INITIAL_POINTER_SIZE) && __INITIAL_POINTER_SIZE == 64) \
+  || defined (__LONG_POINTERS)
+#define HOST_LONG_FORMAT "ll"
+#define HOST_PTR_PRINTF "%llp"
+#endif
+
 #define STANDARD_STARTFILE_PREFIX "/gnu/lib/"
diff --git a/gcc/config/vms/xm-vms64.h b/gcc/config/vms/xm-vms64.h
deleted file mode 100644
index 9e77f890aaa..00000000000
--- a/gcc/config/vms/xm-vms64.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Configuration for GCC for hosting on 64bit VMS
-   using a Unix style C library.
-   Copyright (C) 2009
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#define HOST_LONG_FORMAT "ll"
-#define HOST_PTR_PRINTF "%llp"