correct riscv64 blocks

discussion with espie kettenis jsg

diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index f7c2af0..611a216 100644 (file)
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.22 2021/05/05 04:52:39 drahn Exp $
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.23 2021/06/21 14:20:20 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -59,7 +59,8 @@ CONFIGTARGET=--target=${TARGET_ARCH}-unknown-openbsd${OSREV}
 CONFIGTARGET=
 .endif
 
-.if ${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_ARCH} == "aarch64" || ${TARGET_ARCH} == "powerpc64" || \
+    ${TARGET_ARCH} == "riscv64"
 CONFIGTARGET+=--without-gnu-ld
 CONFIGTARGET+=--without-gnu-as
 .endif

diff --git a/gnu/usr.bin/binutils-2.17/configure b/gnu/usr.bin/binutils-2.17/configure
index 999d8c2..ba999a3 100755 (executable)
--- a/gnu/usr.bin/binutils-2.17/configure
+++ b/gnu/usr.bin/binutils-2.17/configure
@@ -1237,9 +1237,6 @@ case "${target}" in
        ;;
     esac
     ;;
-  riscv*-*-openbsd*)
-    noconfigdirs="ld gas"
-    ;;
   *-*-netware*)
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
@@ -1588,9 +1585,6 @@ case "${target}" in
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof ${libgcj}"
     ;;
-  riscv*-*-openbsd*)
-    noconfigdirs="ld gas"
-    ;;
   romp-*-*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
     ;;

diff --git a/gnu/usr.bin/binutils-2.17/configure.in b/gnu/usr.bin/binutils-2.17/configure.in
index 4e71d49..3cf10f0 100644 (file)
--- a/gnu/usr.bin/binutils-2.17/configure.in
+++ b/gnu/usr.bin/binutils-2.17/configure.in
@@ -777,9 +777,6 @@ case "${target}" in
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof ${libgcj}"
     ;;
-  riscv*-*-openbsd*)
-    noconfigdirs="$noconfigdirs gas ld"
-    ;;
   romp-*-*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
     ;;