Patchwork [VMS] : override version in t-vmsnative

login
register
mail settings
Submitter Tristan Gingold
Date March 6, 2012, 10:10 a.m.
Message ID <4EAAEBF3-383E-4554-ACA5-B8FB7280EB9E@adacore.com>
Download mbox | patch
Permalink /patch/144899/
State New
Headers show

Comments

Tristan Gingold - March 6, 2012, 10:10 a.m.
Hi,

as a hack, we need to redefined the makefile variable 'version' so that the version subdir is 4_X_Y, because VMS doesn't like dots in directory names.  But we need to do that only if we build for VMS, not for cross compilers.

Also, remove the stamp declarations that prevented some run of fix includes (old unnecessary hacks).
And add a missing CL entry.

Committed on trunk.

Tristan.

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

	* config/vms/t-vmsnative (version): Define.
	* config/vms/t-vms (STMP_FIXPROTO, STMP_FIXINC, version): Remove.

Patch

Index: gcc/config/vms/t-vms
===================================================================
--- gcc/config/vms/t-vms	(revision 184981)
+++ gcc/config/vms/t-vms	(working copy)
@@ -17,13 +17,8 @@ 
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-STMP_FIXPROTO =
-STMP_FIXINC =
 LIMITS_H_TEST = false
 
-# Under VMS, directory names cannot contain dots.
-version:=$(shell echo $(BASEVER_c) | sed -e 's/\./_/g')
-
 vms-crtlmap.h: $(srcdir)/config/vms/vms-crtlmap.map  \
   $(srcdir)/config/vms/make-crtlmap.awk
 	$(AWK) -f $(srcdir)/config/vms/make-crtlmap.awk \
Index: gcc/config/vms/t-vmsnative
===================================================================
--- gcc/config/vms/t-vmsnative	(revision 184981)
+++ gcc/config/vms/t-vmsnative	(working copy)
@@ -17,6 +17,11 @@ 
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
+# Under VMS, directory names cannot contain dots.
+version:=$(shell echo $(BASEVER_c) | sed -e 's/\./_/g')
+
+# Wrappers around native VMS tools for ld and ar.
+
 vms-ld.o: $(srcdir)/config/vms/vms-ld.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)