From d07e530d33360dae687552a6dfbe26408f3fb58e Mon Sep 17 00:00:00 2001 From: SendaoYan Date: Mon, 3 Jun 2024 12:07:11 +0000 Subject: [PATCH] 8333128: Linux x86_32 configure fail with --with-hsdis=binutils --with-binutils-src Reviewed-by: shade, jwaters, ihse --- make/autoconf/lib-hsdis.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/make/autoconf/lib-hsdis.m4 b/make/autoconf/lib-hsdis.m4 index 33d8a35f8fd..9b9f24d0da1 100644 --- a/make/autoconf/lib-hsdis.m4 +++ b/make/autoconf/lib-hsdis.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -268,14 +268,16 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS], disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\"" if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \ test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \ - (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a); then + (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a); then HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include" - # libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib or $BINUTILS_INSTALL_DIR/lib64 - # depending on system setup + # libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib, $BINUTILS_INSTALL_DIR/lib32 + # or $BINUTILS_INSTALL_DIR/lib64, depending on system setup LIBIBERTY_LIB="" if test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib/libiberty.a" + elif test -e $BINUTILS_INSTALL_DIR/lib32/libiberty.a; then + LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib32/libiberty.a" else LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib64/libiberty.a" fi