Thu Jul 2 14:01:34 1998 Klaus Kaempf <kkaempf@rmi.de>

	* configure.com: Add vax/vms support.
	* makefile.vms-in: Renamed from makefile.vms.  Add substitutions
	now done by configure.com.

diff --git a/binutils/.Sanitize b/binutils/.Sanitize
index 44eda8785eafe6c7a7b43054c289afdf3ee04086..904390c1ddc24971768e3f6414162d2eaa9f4864 100644 (file)
--- a/binutils/.Sanitize
+++ b/binutils/.Sanitize
@@ -65,7 +65,7 @@ ieee.c
 is-ranlib.c
 is-strip.c
 mac-binutils.r
-makefile.vms
+makefile.vms-in
 maybe-ranlib.c
 maybe-strip.c
 mpw-config.in

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 83f5672e698c1e87331d1bf1dbda9b1faa3203f9..104c438b1659c094d76b00db7946ea217810b28b 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul  2 14:01:34 1998  Klaus Kaempf  <kkaempf@rmi.de>
+
+       * configure.com: Add vax/vms support. 
+       * makefile.vms-in: Renamed from makefile.vms.  Add substitutions
+       now done by configure.com.
+
 Wed Jul  1 20:43:52 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * stabs.c (parse_stab_range_type): Handle 4 and 8 byte signed

diff --git a/binutils/makefile.vms b/binutils/makefile.vms
deleted file mode 100644 (file)
index 817855e..0000000
--- a/binutils/makefile.vms
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Makefile for binutils under openVMS/Alpha
-#
-# For use with gnu-make for vms
-#
-# Created by Klaus K"ampf, kkaempf@progis.de
-#
-#
-
-# Distribution version, filled in by configure.com
-VERSION=
-
-TARGET=""evax-alpha""
-
-ifeq ($(CC),gcc)
-CFLAGS=/include=([],[-.include],[-.bfd])$(DEFS)
-DEFS=/define=("TARGET=$(TARGET)")
-LIBS=,gnu_cc_library:libgcc/lib,sys$$library:vaxcrtl.olb/lib,gnu_cc_library:crt0.obj
-else
-CFLAGS=/noopt/nodebug/include=([],[-.include],[-.bfd])$(DEFS)/warnings=disable=(missingreturn,implicitfunc)
-DEFS=/define=("TARGET=$(TARGET)",\
-"const=","unlink=remove",\
-"_bfd_generic_get_section_contents_in_window"="_bfd_generic_get_win_section_cont",\
-"_bfd_elf_section_from_bfd_section"="_bfd_elf_sec_from_bfd_sec")
-LIBS=,sys$$library:vaxcrtl.olb/lib
-endif
-
-BFDLIB = [-.bfd]libbfd.olb/lib
-BFDLIB_DEP = [-.bfd]libbfd.olb
-LIBIBERTY_DEP = [-.libiberty]libiberty.olb
-LIBIBERTY = [-.libiberty]libiberty.olb/lib
-OPCODES_DEP = [-.opcodes]libopcodes.olb
-OPCODES = [-.opcodes]libopcodes.olb/lib
-
-DEBUG_OBJS = rddbg.obj,debug.obj,stabs.obj,ieee.obj,rdcoff.obj
-
-WRITE_DEBUG_OBJS = $(DEBUG_OBJS),wrstabs.obj
-
-BULIBS = []bucomm.obj,version.obj,filemode.obj
-
-ADDL_DEPS = $(BULIBS),$(BFDLIB_DEP),$(LIBIBERTY_DEP)
-ADDL_LIBS = $(BULIBS),$(BFDLIB),$(LIBIBERTY)
-
-SIZEOBJS = $(ADDL_DEPS),size.obj
-
-STRINGSOBJS = $(ADDL_DEPS),strings.obj
-
-NMOBJS = $(ADDL_DEPS),nm.obj
-
-OBJDUMPOBJS = $(ADDL_DEPS),objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(OPCODES_DEP)
-
-all: config.h size.exe strings.exe objdump.exe nm.exe
-
-size.exe: $(SIZEOBJS)
-       link/exe=$@ size.obj,$(ADDL_LIBS)$(LIBS)
-
-strings.exe: $(STRINGSOBJS)
-       link/exe=$@ strings.obj,$(ADDL_LIBS)$(LIBS)
-
-nm.exe: $(NMOBJS)
-       link/exe=$@ nm.obj,$(ADDL_LIBS)$(LIBS)
-
-objdump.exe: $(OBJDUMPOBJS)
-       link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(BFDLIB),$(OPCODES),$(ADDL_LIBS)$(LIBS)
-
-
-version.obj: version.c
-       $(CC) $(CFLAGS)/define=(VERSION="""$(VERSION)""") $<
-
-config.h:
-       $$ @configure
-       $(MAKE) -f makefile.vms "CC=$(CC)"
-
-[-.bfd]libbfd.olb:
-       $(CD) [-.bfd]
-       $(MAKE) -f makefile.vms "CC=$(CC)"
-       $(CD) [-.binutils]
-
-[-.libiberty]libiberty.olb:
-       $(CD) [-.libiberty]
-       $(MAKE) -f makefile.vms "CC=$(CC)"
-       $(CD) [-.binutils]
-
-[-.opcodes]libopcodes.olb:
-       $(CD) [-.opcodes]
-       $(MAKE) -f makefile.vms "CC=$(CC)"
-       $(CD) [-.binutils]
-
-clean:
-       $$ purge
-       $(RM) *.obj;
-       $(RM) *.exe;
-       $(RM) config.h;

diff --git a/binutils/makefile.vms-in b/binutils/makefile.vms-in
new file mode 100644 (file)
index 0000000..a809d1b
--- /dev/null
+++ b/binutils/makefile.vms-in
@@ -0,0 +1,98 @@
+#
+# Makefile for binutils under openVMS (Alpha and Vax)
+#
+# For use with gnu-make for vms
+#
+# Created by Klaus K"ampf, kkaempf@rmi.de
+#
+#
+
+# Distribution version, filled in by configure.com
+VERSION=@VERSION@
+
+ifeq ($(ARCH),ALPHA)
+TARGET=""vms-alpha""
+else
+TARGET=""vms-vax""
+endif
+
+ifeq ($(CC),gcc)
+CFLAGS=/include=([],[-.include],[-.bfd])$(DEFS)
+DEFS=/define=("TARGET=$(TARGET)")
+LIBS=,gnu_cc_library:libgcc/lib,sys$$library:vaxcrtl.olb/lib,gnu_cc_library:crt0.obj
+else
+CFLAGS=/noopt/debug/include=([],[-.include],[-.bfd])$(DEFS)\
+/warnings=disable=(missingreturn,implicitfunc,longextern)
+DEFS=/define=("TARGET=$(TARGET)","const=","unlink=remove")
+LIBS=,sys$$library:vaxcrtl.olb/lib
+endif
+
+BFDLIB = [-.bfd]libbfd.olb/lib
+BFDLIB_DEP = [-.bfd]libbfd.olb
+LIBIBERTY_DEP = [-.libiberty]libiberty.olb
+LIBIBERTY = [-.libiberty]libiberty.olb/lib
+OPCODES_DEP = [-.opcodes]libopcodes.olb
+OPCODES = [-.opcodes]libopcodes.olb/lib
+
+DEBUG_OBJS = rddbg.obj,debug.obj,stabs.obj,ieee.obj,rdcoff.obj
+
+WRITE_DEBUG_OBJS = $(DEBUG_OBJS),wrstabs.obj
+
+BULIBS = []bucomm.obj,version.obj,filemode.obj
+
+ADDL_DEPS = $(BULIBS),$(BFDLIB_DEP),$(LIBIBERTY_DEP)
+ADDL_LIBS = $(BULIBS),$(BFDLIB),$(LIBIBERTY)
+
+SIZEOBJS = $(ADDL_DEPS),size.obj
+
+STRINGSOBJS = $(ADDL_DEPS),strings.obj
+
+NMOBJS = $(ADDL_DEPS),nm.obj
+
+OBJDUMPOBJS = $(ADDL_DEPS),objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(OPCODES_DEP)
+
+all: config.h size.exe strings.exe objdump.exe nm.exe
+
+size.exe: $(SIZEOBJS)
+       link/exe=$@ size.obj,$(ADDL_LIBS)$(LIBS)
+
+strings.exe: $(STRINGSOBJS)
+       link/exe=$@ strings.obj,$(ADDL_LIBS)$(LIBS)
+
+nm.exe: $(NMOBJS)
+       link/exe=$@ nm.obj,$(ADDL_LIBS)$(LIBS)
+
+objdump.exe: $(OBJDUMPOBJS)
+       link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(BFDLIB),$(OPCODES),$(ADDL_LIBS)$(LIBS)
+
+
+version.obj: version.c
+       $(CC) $(CFLAGS)/define=(VERSION="""$(VERSION)""") $<
+
+config.h:
+       $$ @configure
+       $(MAKE) -f makefile.vms "CC=$(CC)"
+
+[-.bfd]libbfd.olb:
+       $(CD) [-.bfd]
+       $(MAKE) -f makefile.vms "CC=$(CC)"
+       $(CD) [-.binutils]
+
+[-.libiberty]libiberty.olb:
+       $(CD) [-.libiberty]
+       $(MAKE) -f makefile.vms "CC=$(CC)"
+       $(CD) [-.binutils]
+
+[-.opcodes]libopcodes.olb:
+       $(CD) [-.opcodes]
+       $(MAKE) -f makefile.vms "CC=$(CC)"
+       $(CD) [-.binutils]
+
+clean:
+       $$ purge
+       $(RM) *.obj;
+       $(RM) *.exe;
+
+distclean: clean
+       $(RM) config.h;
+       $(RM) makefile.vms;