vax ELF bits for binutils 2.17.

8 files changed, 17 insertions, 3 deletions

diff --git a/gnu/usr.bin/binutils-2.17/bfd/config.bfd b/gnu/usr.bin/binutils-2.17/bfd/config.bfd
index 278e1c340f6..53d0f23fea1 100644
--- a/gnu/usr.bin/binutils-2.17/bfd/config.bfd
+++ b/gnu/usr.bin/binutils-2.17/bfd/config.bfd
@@ -1374,8 +1374,8 @@ case "${targ}" in
     ;;
 
   vax-*-openbsd*)
-    targ_defvec=vaxnetbsd_vec
-    targ_underscore=yes
+    targ_defvec=elf32_vax_vec
+    targ_selvecs=vaxnetbsd_vec
     ;;
 
   vax-*-linux-*)
diff --git a/gnu/usr.bin/binutils-2.17/configure b/gnu/usr.bin/binutils-2.17/configure
index 86317e10e92..ba999a3d80a 100755
--- a/gnu/usr.bin/binutils-2.17/configure
+++ b/gnu/usr.bin/binutils-2.17/configure
@@ -7211,6 +7211,7 @@ MAINT=$MAINTAINER_MODE_TRUE
 # Stage specific cflags for build.
 stage1_cflags="-g"
 case $build in
+  vax-*-openbsd*) ;;
   vax-*-*)
     case ${GCC} in
       yes) stage1_cflags="-g -Wa,-J" ;;
diff --git a/gnu/usr.bin/binutils-2.17/configure.in b/gnu/usr.bin/binutils-2.17/configure.in
index 86518331ad6..3cf10f0aa54 100644
--- a/gnu/usr.bin/binutils-2.17/configure.in
+++ b/gnu/usr.bin/binutils-2.17/configure.in
@@ -2364,6 +2364,7 @@ AC_SUBST(MAINT)dnl
 # Stage specific cflags for build.
 stage1_cflags="-g"
 case $build in
+  vax-*-openbsd*) ;;
   vax-*-*)
     case ${GCC} in
       yes) stage1_cflags="-g -Wa,-J" ;;
diff --git a/gnu/usr.bin/binutils-2.17/gas/configure.tgt b/gnu/usr.bin/binutils-2.17/gas/configure.tgt
index 411a511cdbd..80f3dbd5b6d 100644
--- a/gnu/usr.bin/binutils-2.17/gas/configure.tgt
+++ b/gnu/usr.bin/binutils-2.17/gas/configure.tgt
@@ -374,7 +374,7 @@ case ${generic_target} in
   v850e-*-*)				fmt=elf ;;
   v850ea-*-*)				fmt=elf ;;
 
-  vax-*-netbsdelf*)			fmt=elf em=nbsd ;;
+  vax-*-netbsdelf* | vax-*-openbsd*)	fmt=elf em=nbsd ;;
   vax-*-linux-*)			fmt=elf em=linux ;;
 
   xscale-*-coff)			fmt=coff ;;
diff --git a/gnu/usr.bin/binutils-2.17/ld/Makefile.am b/gnu/usr.bin/binutils-2.17/ld/Makefile.am
index 5ab2d1d4290..453f4cbf348 100644
--- a/gnu/usr.bin/binutils-2.17/ld/Makefile.am
+++ b/gnu/usr.bin/binutils-2.17/ld/Makefile.am
@@ -191,6 +191,7 @@ ALL_EMULATIONS = \
 	eelf32ppcwindiss.o \
 	eelf32ppcvxworks.o \
 	eelf32vax.o \
+	eelf32vax_obsd.o \
         eelf32xc16x.o \
         eelf32xc16xl.o \
         eelf32xc16xs.o \
@@ -684,6 +685,9 @@ eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
 eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
+eelf32vax_obsd.c: $(srcdir)/emulparams/elf32vax_obsd.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32vax_obsd "$(tdir_elf32vax_obsd)"
 eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh \
   $(srcdir)/emulparams/xtensa-config.sh $(srcdir)/emultempl/elf32.em \
   $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
diff --git a/gnu/usr.bin/binutils-2.17/ld/Makefile.in b/gnu/usr.bin/binutils-2.17/ld/Makefile.in
index fda85033a68..27a16e8f4f5 100644
--- a/gnu/usr.bin/binutils-2.17/ld/Makefile.in
+++ b/gnu/usr.bin/binutils-2.17/ld/Makefile.in
@@ -415,6 +415,7 @@ ALL_EMULATIONS = \
 	eelf32ppcwindiss.o \
 	eelf32ppcvxworks.o \
 	eelf32vax.o \
+	eelf32vax_obsd.o \
         eelf32xc16x.o \
         eelf32xc16xl.o \
         eelf32xc16xs.o \
@@ -1478,6 +1479,9 @@ eelf32am33lin.c: $(srcdir)/emulparams/elf32am33lin.sh \
 eelf32vax.c: $(srcdir)/emulparams/elf32vax.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32vax "$(tdir_elf32vax)"
+eelf32vax_obsd.c: $(srcdir)/emulparams/elf32vax_obsd.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32vax_obsd "$(tdir_elf32vax_obsd)"
 eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh \
   $(srcdir)/emulparams/xtensa-config.sh $(srcdir)/emultempl/elf32.em \
   $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \
diff --git a/gnu/usr.bin/binutils-2.17/ld/configure.tgt b/gnu/usr.bin/binutils-2.17/ld/configure.tgt
index bf1795f9da7..e25032179c4 100644
--- a/gnu/usr.bin/binutils-2.17/ld/configure.tgt
+++ b/gnu/usr.bin/binutils-2.17/ld/configure.tgt
@@ -582,6 +582,8 @@ vax-*-netbsdelf*)	targ_emul=elf32vax
 vax-*-netbsdaout* | vax-*-netbsd*)
 			targ_emul=vaxnbsd
 			targ_extra_emuls=elf32vax ;;
+vax-*-openbsd*)		targ_emul=elf32vax_obsd
+			targ_extra_emuls=vaxnbsd ;;
 vax-*-linux-*)  	targ_emul=elf32vax
 			;;
 w65-*-*)		targ_emul=w65
diff --git a/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32vax_obsd.sh b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32vax_obsd.sh
new file mode 100644
index 00000000000..996426edad5
--- /dev/null
+++ b/gnu/usr.bin/binutils-2.17/ld/emulparams/elf32vax_obsd.sh
@@ -0,0 +1,2 @@
+. ${srcdir}/emulparams/elf32vax.sh
+. ${srcdir}/emulparams/elf_obsd.sh