2009-09-01 Tristan Gingold <gingold@adacore.com>

	* makefile.vms: Ported to Itanium VMS.  Remove useless variable and
	dependencies.  Reindent.
	* configure.com: Ported to Itanium VMS.  Now generates a build.com
	to build without make.  Add messages but make edit silent.
	* hosts/alphavms.h: Add a prototype for stpcpy.
	* vms.c: Add a missing include for Alpha VMS.
	* elfxx-ia64.c (ELF_OSABI): Define for OpenVMS.

1 files changed, 21 insertions, 42 deletions

diff --git a/bfd/makefile.vms b/bfd/makefile.vms
index bebb8e9da08..83690985874 100644
--- a/bfd/makefile.vms
+++ b/bfd/makefile.vms
@@ -1,5 +1,5 @@
 #
-# Makefile for bfd library under openVMS (Alpha and Vax)
+# Makefile for bfd library under openVMS 
 #
 # For use with gnu-make for vms
 #
@@ -7,60 +7,43 @@
 #
 #
 
-CC=cc
-
+ifeq ($(ARCH),IA64)
+HOSTFILE=alphavms.h
+OBJS:=cpu-ia64.obj,elf64-ia64.obj,elf-strtab.obj,corefile.obj,stabs.obj,\
+  merge.obj,elf-eh-frame.obj,elflink.obj,elf-attrs.obj,dwarf1.obj,elf64.obj
+DEFS=SELECT_VECS="&bfd_elf64_ia64_vms_vec",SELECT_ARCHITECTURES="&bfd_ia64_arch"
+endif
 ifeq ($(ARCH),ALPHA)
 HOSTFILE=alphavms.h
-TARGETOBJS = cpu-alpha.obj
-else
+OBJS:=vms.obj,vms-hdr.obj,vms-gsd.obj,vms-tir.obj,vms-misc.obj,cpu-alpha.obj
+DEFS=SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch"
+endif
+ifeq ($(ARCH),VAX)
 HOSTFILE=vaxvms.h
-TARGETOBJS = cpu-vax.obj
+OBJS:=vms.obj,vms-hdr.obj,vms-gsd.obj,vms-tir.obj,vms-misc.obj,cpu-vax.obj
+DEFS=SELECT_VECS="&vms_vax_vec",SELECT_ARCHITECTURES="&bfd_vax_arch"
 endif
 
-
-OBJS=archive.obj,archive64.obj,archures.obj,bfd.obj,bfdio.obj,binary.obj,\
-  cache.obj,coffgen.obj,compress.obj,corefile.obj,dwarf2.obj,elf.obj,\
-  format.obj,hash.obj,ihex.obj,init.obj,libbfd.obj,linker.obj,opncls.obj,\
-  reloc.obj,section.obj,simple.obj,srec.obj,stab-syms.obj,syms.obj,\
-  targets.obj,tekhex.obj,verilog.obj,\
-  vms.obj,vms-hdr.obj,vms-gsd.obj,vms-tir.obj,vms-misc.obj,$(TARGETOBJS)
+OBJS:=$(OBJS),archive.obj,archive64.obj,archures.obj,bfd.obj,bfdio.obj,\
+  binary.obj,cache.obj,coffgen.obj,compress.obj,corefile.obj,dwarf2.obj,\
+  elf.obj,format.obj,hash.obj,ihex.obj,init.obj,libbfd.obj,linker.obj,\
+  opncls.obj,reloc.obj,section.obj,simple.obj,srec.obj,stab-syms.obj,\
+  syms.obj,targets.obj,tekhex.obj,verilog.obj
 
 ifeq ($(CC),gcc)
-ifeq ($(ARCH),ALPHA)
-DEFS=/define=(SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch",\
-"HAVE_vms_alpha_vec=1")
-else
-DEFS=/define=(SELECT_VECS="&vms_vax_vec",SELECT_ARCHITECTURES="&bfd_vax_arch",\
-"HAVE_vms_vax_vec=1")
-endif
 CFLAGS=/include=([],[-.include])$(DEFS)
 else
-ifeq ($(ARCH),ALPHA)
-DEFS=/define=(SELECT_VECS="&vms_alpha_vec",\
-  SELECT_ARCHITECTURES="&bfd_alpha_arch",\
-  "HAVE_vms_alpha_vec=1","unlink=remove","DEBUGDIR=NULL")
-else
-DEFS=/define=(SELECT_VECS="&vms_vax_vec",SELECT_ARCHITECTURES="&bfd_vax_arch",\
-  "HAVE_vms_vax_vec=1","unlink=remove")
-endif
 OPT=/noopt/debug
-CFLAGS=/name=(as_is,shortened)/include=([],[-.include])$(DEFS)$(OPT)
+CFLAGS=/name=(as_is,shortened)/include=([],"../include")\
+ /define=("unlink=remove",DEBUGDIR="""GNU$$DEBUGDIR:""",$(DEFS))$(OPT)
 endif
 
-
-libbfd.olb: sysdep.h bfd.h $(OBJS)
+libbfd.olb: $(OBJS)
 	purge
 	lib/create libbfd $(OBJS)
 
-sysdep.h: [.hosts]$(HOSTFILE) config.h
-	$(CP) $< $@
-
-bfd.h: bfd-in2.h
-	$$ @configure
-
 targmatch.h: bfd.h
 config.h: bfd.h
-
 vms.c: vms.h
 vms-mhd.c: vms.h
 vms-gsd.c: vms.h
@@ -71,8 +54,4 @@ targets.c: targmatch.h
 clean:
 	$$ purge
 	$(RM) libbfd.olb;
-	$(RM) sysdep.h;
-	$(RM) bfd.h;
-	$(RM) targmatch.h;
-	$(RM) config.h;
 	$(RM) *.obj;