Index: common/autoconf/generated-configure.sh
--- common/autoconf/generated-configure.sh.orig
+++ common/autoconf/generated-configure.sh
@@ -41202,7 +41202,7 @@ fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z wxneeded" >&5
 $as_echo_n "checking if ld requires -z wxneeded... " >&6; }
     PUSHED_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -Wl,-z,wxneeded"
+    LDFLAGS="$LDFLAGS -Wl,-z,wxneeded -Wl,-z,nobtcfi"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { }
@@ -41212,7 +41212,7 @@ if ac_fn_cxx_try_link "$LINENO"; then :
           if $READELF -l conftest$ac_exeext | $GREP OPENBSD_WXNEED > /dev/null; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-            LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded"
+            LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded -Wl,-z,nobtcfi"
           else
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }