From: Tristan Gingold Date: Wed, 2 Sep 2009 14:14:49 +0000 (+0000) Subject: 2009-09-02 Tristan Gingold X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d34089166b3e7b60151752997db33c3f28016349;p=binutils-gdb.git 2009-09-02 Tristan Gingold * configure.com: Do not copy makefile.vms-in to makefile.vms * makefile.vms-in: Renamed to... * makefile.vms: ... this usual name as it is not processed anymore. Remove WRITE_DEBUG_OBJS (unused) and reorder object files for objdump.exe. --- diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d56c00c6e6f..015519aa48b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2009-09-02 Tristan Gingold + + * configure.com: Do not copy makefile.vms-in to makefile.vms + * makefile.vms-in: Renamed to... + * makefile.vms: ... this usual name as it is not processed anymore. + Remove WRITE_DEBUG_OBJS (unused) and reorder object files for + objdump.exe. + 2009-09-01 Ralf Wildenhues * Makefile.am (arparse.o, arlex.o, sysroff.o, defparse.o) diff --git a/binutils/configure.com b/binutils/configure.com index fefa7836a34..f199163feda 100644 --- a/binutils/configure.com +++ b/binutils/configure.com @@ -54,9 +54,6 @@ $ write tfile "#define TARGET """ + target + """" $ close tfile $ write sys$output "Created `config.h'" $! -$ copy makefile.vms-in makefile.vms -$ write sys$output "Created `makefile.vms'" -$! $ write sys$output "Generate binutils build.com" $! $ create build.com diff --git a/binutils/makefile.vms b/binutils/makefile.vms new file mode 100644 index 00000000000..d6f185704a3 --- /dev/null +++ b/binutils/makefile.vms @@ -0,0 +1,74 @@ +# +# Makefile for binutils under openVMS (Alpha and Vax) +# +# For use with gnu-make for vms +# +# Created by Klaus K"ampf, kkaempf@rmi.de +# +# + +ifeq ($(CC),gcc) +DEFS= +CFLAGS=/include=([],[-.include],[-.bfd])$(DEFS) +LIBS=,gnu_cc_library:libgcc/lib,sys$$library:vaxcrtl.olb/lib,gnu_cc_library:crt0.obj +else +DEFS= +OPT=/noopt/debug +CFLAGS=$(OPT)/include=([],"../include",[-.bfd])$(DEFS)\ + /name=(as_is,shortened)\ + /prefix=(all,except=("getopt","optarg","optopt","optind","opterr")) +endif + +LIBBFD = [-.bfd]libbfd.olb/lib +LIBBFD_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,dwarf.obj + +BULIBS = bucomm.obj,version.obj,filemode.obj + +ADDL_DEPS = $(BULIBS),$(LIBBFD_DEP),$(LIBIBERTY_DEP) +ADDL_LIBS = $(BULIBS),$(LIBBFD),$(LIBIBERTY) + +SIZEOBJS = $(ADDL_DEPS),size.obj + +STRINGSOBJS = $(ADDL_DEPS),strings.obj + +NMOBJS = $(ADDL_DEPS),nm.obj + +ADDR2LINEOBJS = $(ADDL_DEPS),addr2line.obj + +OBJDUMPOBJS = objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_DEPS),$(OPCODES_DEP) + +all: config.h size.exe strings.exe objdump.exe nm.exe addr2line.exe + +size.exe: $(SIZEOBJS) + link/exe=$@ size.obj,$(ADDL_LIBS) + +strings.exe: $(STRINGSOBJS) + link/exe=$@ strings.obj,$(ADDL_LIBS) + +nm.exe: $(NMOBJS) + link/exe=$@ nm.obj,$(ADDL_LIBS) + +addr2line.exe: $(ADDR2LINEOBJS) + link/exe=$@ addr2line.obj,$(ADDL_LIBS) + +objdump.exe: $(OBJDUMPOBJS) + link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_LIBS),$(LIBBFD),$(OPCODES) + +config.h: + $$ @configure + $(MAKE) -f makefile.vms "CC=$(CC)" + +clean: + $$ purge + $(RM) *.obj; + $(RM) *.exe; + +distclean: clean + $(RM) config.h; + $(RM) makefile.vms; diff --git a/binutils/makefile.vms-in b/binutils/makefile.vms-in deleted file mode 100644 index bea886ae2a4..00000000000 --- a/binutils/makefile.vms-in +++ /dev/null @@ -1,76 +0,0 @@ -# -# Makefile for binutils under openVMS (Alpha and Vax) -# -# For use with gnu-make for vms -# -# Created by Klaus K"ampf, kkaempf@rmi.de -# -# - -ifeq ($(CC),gcc) -DEFS= -CFLAGS=/include=([],[-.include],[-.bfd])$(DEFS) -LIBS=,gnu_cc_library:libgcc/lib,sys$$library:vaxcrtl.olb/lib,gnu_cc_library:crt0.obj -else -DEFS= -OPT=/noopt/debug -CFLAGS=$(OPT)/include=([],"../include",[-.bfd])$(DEFS)\ - /name=(as_is,shortened)\ - /prefix=(all,except=("getopt","optarg","optopt","optind","opterr")) -endif - -LIBBFD = [-.bfd]libbfd.olb/lib -LIBBFD_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,dwarf.obj - -WRITE_DEBUG_OBJS = $(DEBUG_OBJS),wrstabs.obj - -BULIBS = bucomm.obj,version.obj,filemode.obj - -ADDL_DEPS = $(BULIBS),$(LIBBFD_DEP),$(LIBIBERTY_DEP) -ADDL_LIBS = $(BULIBS),$(LIBBFD),$(LIBIBERTY) - -SIZEOBJS = $(ADDL_DEPS),size.obj - -STRINGSOBJS = $(ADDL_DEPS),strings.obj - -NMOBJS = $(ADDL_DEPS),nm.obj - -ADDR2LINEOBJS = $(ADDL_DEPS),addr2line.obj - -OBJDUMPOBJS = $(ADDL_DEPS),objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(OPCODES_DEP) - -all: config.h size.exe strings.exe objdump.exe nm.exe addr2line.exe - -size.exe: $(SIZEOBJS) - link/exe=$@ size.obj,$(ADDL_LIBS) - -strings.exe: $(STRINGSOBJS) - link/exe=$@ strings.obj,$(ADDL_LIBS) - -nm.exe: $(NMOBJS) - link/exe=$@ nm.obj,$(ADDL_LIBS) - -addr2line.exe: $(ADDR2LINEOBJS) - link/exe=$@ addr2line.obj,$(ADDL_LIBS) - -objdump.exe: $(OBJDUMPOBJS) - link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(LIBBFD),$(OPCODES),$(ADDL_LIBS) - -config.h: - $$ @configure - $(MAKE) -f makefile.vms "CC=$(CC)" - -clean: - $$ purge - $(RM) *.obj; - $(RM) *.exe; - -distclean: clean - $(RM) config.h; - $(RM) makefile.vms;