2012-03-16 Tristan Gingold <gingold@adacore.com>

	* config/vms/vms.h (TARGET_OS_CPP_BUILTINS): Define
	__CRTL_VER and __VMS_VER.
	* config/vms/vms-protos.h: Declare vms_c_get_crtl_ver
	and vms_c_get_vms_ver.
	* config/vms/vms-c.c (vms_c_get_crtl_ver, vms_c_get_vms_ver): New
	functions.
	* config/alpha/vms.h (VMS_DEFAULT_CRTL_VER)
	(VMS_DEFAULT_VMS_VER): Define.
	* config/ia64/vms.h (VMS_DEFAULT_CRTL_VER)
	(VMS_DEFAULT_VMS_VER): Define.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4fef9b1..5ba4e52 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-16  Tristan Gingold  <gingold@adacore.com>
+
+       * config/vms/vms.h (TARGET_OS_CPP_BUILTINS): Define
+       __CRTL_VER and __VMS_VER.
+       * config/vms/vms-protos.h: Declare vms_c_get_crtl_ver
+       and vms_c_get_vms_ver.
+       * config/vms/vms-c.c (vms_c_get_crtl_ver, vms_c_get_vms_ver): New
+       functions.
+       * config/alpha/vms.h (VMS_DEFAULT_CRTL_VER)
+       (VMS_DEFAULT_VMS_VER): Define.
+       * config/ia64/vms.h (VMS_DEFAULT_CRTL_VER)
+       (VMS_DEFAULT_VMS_VER): Define.
+
 2012-03-16  Richard Guenther  <rguenther@suse.de>
 
        * tree-vect-loop.c (get_initial_def_for_induction): Use

diff --git a/gcc/config/alpha/vms.h b/gcc/config/alpha/vms.h
index d994577..7b4dd30 100644 (file)
--- a/gcc/config/alpha/vms.h
+++ b/gcc/config/alpha/vms.h
@@ -289,3 +289,7 @@ do {                                                \
 
 #undef TARGET_VALID_POINTER_MODE
 #define TARGET_VALID_POINTER_MODE vms_valid_pointer_mode
+
+/* Default values for _CRTL_VER and _VMS_VER.  */
+#define VMS_DEFAULT_CRTL_VER 70320000
+#define VMS_DEFAULT_VMS_VER 70320000

diff --git a/gcc/config/ia64/vms.h b/gcc/config/ia64/vms.h
index 0c02f8a..1908c47 100644 (file)
--- a/gcc/config/ia64/vms.h
+++ b/gcc/config/ia64/vms.h
@@ -157,3 +157,7 @@ STATIC func_ptr __CTOR_LIST__[1]                                             \
 /* IA64 VMS doesn't fully support COMDAT sections.  */
 
 #define SUPPORTS_ONE_ONLY 0
+
+/* Default values for _CRTL_VER and _VMS_VER.  */
+#define VMS_DEFAULT_CRTL_VER 80300000
+#define VMS_DEFAULT_VMS_VER 80300000

diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c
index 229846a..6f8a1cf 100644 (file)
--- a/gcc/config/vms/vms-c.c
+++ b/gcc/config/vms/vms-c.c
@@ -466,3 +466,19 @@ vms_c_common_override_options (void)
       break;
     }
 }
+
+/* The default value for _CRTL_VER macro.  */
+
+int
+vms_c_get_crtl_ver (void)
+{
+  return VMS_DEFAULT_CRTL_VER;
+}
+
+/* The default value for _VMS_VER macro.  */
+
+int
+vms_c_get_vms_ver (void)
+{
+  return VMS_DEFAULT_VMS_VER;
+}

diff --git a/gcc/config/vms/vms-protos.h b/gcc/config/vms/vms-protos.h
index a8b9ada..ff97c31 100644 (file)
--- a/gcc/config/vms/vms-protos.h
+++ b/gcc/config/vms/vms-protos.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 /* vms-c.c  */
 extern void vms_c_register_pragma (void);
 extern void vms_c_common_override_options (void);
+extern int vms_c_get_crtl_ver (void);
+extern int vms_c_get_vms_ver (void);
 
 /* vms.c  */
 void vms_patch_builtins (void);

diff --git a/gcc/config/vms/vms.h b/gcc/config/vms/vms.h
index e11b1bf..f2bc354 100644 (file)
--- a/gcc/config/vms/vms.h
+++ b/gcc/config/vms/vms.h
@@ -21,19 +21,21 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OBJECT_SUFFIX ".obj"
 #define TARGET_EXECUTABLE_SUFFIX ".exe"
 
-#define TARGET_OS_CPP_BUILTINS()                                \
-  do {                                                          \
-    builtin_define_std ("vms");                                 \
-    builtin_define_std ("VMS");                                 \
-    builtin_assert ("system=vms");                              \
-    SUBTARGET_OS_CPP_BUILTINS();                                \
-    builtin_define ("__int64=long long");                       \
-    if (flag_vms_pointer_size == VMS_POINTER_SIZE_32)           \
-      builtin_define ("__INITIAL_POINTER_SIZE=32");             \
-    else if (flag_vms_pointer_size == VMS_POINTER_SIZE_64)      \
-      builtin_define ("__INITIAL_POINTER_SIZE=64");             \
-    if (POINTER_SIZE == 64)                                     \
-      builtin_define ("__LONG_POINTERS=1");                     \
+#define TARGET_OS_CPP_BUILTINS()                                        \
+  do {                                                                  \
+    builtin_define_std ("vms");                                                 \
+    builtin_define_std ("VMS");                                                 \
+    builtin_assert ("system=vms");                                      \
+    SUBTARGET_OS_CPP_BUILTINS();                                        \
+    builtin_define ("__int64=long long");                               \
+    if (flag_vms_pointer_size == VMS_POINTER_SIZE_32)                   \
+      builtin_define ("__INITIAL_POINTER_SIZE=32");                     \
+    else if (flag_vms_pointer_size == VMS_POINTER_SIZE_64)              \
+      builtin_define ("__INITIAL_POINTER_SIZE=64");                     \
+    if (POINTER_SIZE == 64)                                             \
+      builtin_define ("__LONG_POINTERS=1");                             \
+    builtin_define_with_int_value ("__CRTL_VER", vms_c_get_crtl_ver ()); \
+    builtin_define_with_int_value ("__VMS_VER", vms_c_get_vms_ver ());   \
   } while (0)
 
 extern void vms_c_register_includes (const char *, const char *, int);