common/autoconf/toolchain.m4

*** 263,277 ****
      # platform. We can't use the AC_PROG_CC macro, since it can only be used
      # once. Also, we need to do this before adding a tools dir to the path,
      # otherwise we might pick up cross-compilers which don't use standard naming.
      # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
      # to wait until they are properly discovered.
!     AC_PATH_PROGS(BUILD_CC, [cl cc gcc])
      BASIC_FIXUP_EXECUTABLE(BUILD_CC)
!     AC_PATH_PROGS(BUILD_CXX, [cl CC g++])
      BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
!     AC_PATH_PROG(BUILD_LD, ld)
      BASIC_FIXUP_EXECUTABLE(BUILD_LD)
    fi
    AC_SUBST(BUILD_CC)
    AC_SUBST(BUILD_CXX)
    AC_SUBST(BUILD_LD)
--- 263,277 ----
      # platform. We can't use the AC_PROG_CC macro, since it can only be used
      # once. Also, we need to do this before adding a tools dir to the path,
      # otherwise we might pick up cross-compilers which don't use standard naming.
      # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
      # to wait until they are properly discovered.
!     BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
      BASIC_FIXUP_EXECUTABLE(BUILD_CC)
!     BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
      BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
!     BASIC_PATH_PROGS(BUILD_LD, ld)
      BASIC_FIXUP_EXECUTABLE(BUILD_LD)
    fi
    AC_SUBST(BUILD_CC)
    AC_SUBST(BUILD_CXX)
    AC_SUBST(BUILD_LD)
*** 468,478 ****
    AC_SUBST(LDCXX)
    # Linking C++ executables.
    AC_SUBST(LDEXECXX)
  
    if test "x$OPENJDK_TARGET_OS" != xwindows; then
!     AC_CHECK_TOOL(AR, ar)
      BASIC_FIXUP_EXECUTABLE(AR)
    fi
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
      ARFLAGS="-r"
    elif test "x$OPENJDK_TARGET_OS" = xaix; then
--- 468,478 ----
    AC_SUBST(LDCXX)
    # Linking C++ executables.
    AC_SUBST(LDEXECXX)
  
    if test "x$OPENJDK_TARGET_OS" != xwindows; then
!     BASIC_CHECK_TOOLS(AR, ar)
      BASIC_FIXUP_EXECUTABLE(AR)
    fi
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
      ARFLAGS="-r"
    elif test "x$OPENJDK_TARGET_OS" = xaix; then
*** 596,645 ****
      PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
    fi
  
    # Find the right assembler.
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
!     AC_PATH_PROG(AS, as)
      BASIC_FIXUP_EXECUTABLE(AS)
    else
      AS="$CC -c"
    fi
    AC_SUBST(AS)
  
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
!     AC_PATH_PROG(NM, nm)
      BASIC_FIXUP_EXECUTABLE(NM)
!     AC_PATH_PROG(GNM, gnm)
      BASIC_FIXUP_EXECUTABLE(GNM)
!     AC_PATH_PROG(STRIP, strip)
      BASIC_FIXUP_EXECUTABLE(STRIP)
!     AC_PATH_PROG(MCS, mcs)
      BASIC_FIXUP_EXECUTABLE(MCS)
    elif test "x$OPENJDK_TARGET_OS" != xwindows; then
      AC_PATH_PROG(OTOOL, otool)
      if test "x$OTOOL" = "x"; then
        OTOOL="true"
      fi
!     AC_CHECK_TOOL(NM, nm)
      BASIC_FIXUP_EXECUTABLE(NM)
      GNM="$NM"
      AC_SUBST(GNM)
!     AC_CHECK_TOOL(STRIP, strip)
      BASIC_FIXUP_EXECUTABLE(STRIP)
    fi
  
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
!     AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
      # Only call fixup if objcopy was found.
      if test -n "$OBJCOPY"; then
        BASIC_FIXUP_EXECUTABLE(OBJCOPY)
      fi
    fi
  
!   AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
    if test "x$OBJDUMP" != x; then
      # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
      BASIC_FIXUP_EXECUTABLE(OBJDUMP)
    fi
  
--- 596,645 ----
      PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
    fi
  
    # Find the right assembler.
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
!     BASIC_PATH_PROGS(AS, as)
      BASIC_FIXUP_EXECUTABLE(AS)
    else
      AS="$CC -c"
    fi
    AC_SUBST(AS)
  
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
!     BASIC_PATH_PROGS(NM, nm)
      BASIC_FIXUP_EXECUTABLE(NM)
!     BASIC_PATH_PROGS(GNM, gnm)
      BASIC_FIXUP_EXECUTABLE(GNM)
!     BASIC_PATH_PROGS(STRIP, strip)
      BASIC_FIXUP_EXECUTABLE(STRIP)
!     BASIC_PATH_PROGS(MCS, mcs)
      BASIC_FIXUP_EXECUTABLE(MCS)
    elif test "x$OPENJDK_TARGET_OS" != xwindows; then
      AC_PATH_PROG(OTOOL, otool)
      if test "x$OTOOL" = "x"; then
        OTOOL="true"
      fi
!     BASIC_CHECK_TOOLS(NM, nm)
      BASIC_FIXUP_EXECUTABLE(NM)
      GNM="$NM"
      AC_SUBST(GNM)
!     BASIC_CHECK_TOOLS(STRIP, strip)
      BASIC_FIXUP_EXECUTABLE(STRIP)
    fi
  
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
!     BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
      # Only call fixup if objcopy was found.
      if test -n "$OBJCOPY"; then
        BASIC_FIXUP_EXECUTABLE(OBJCOPY)
      fi
    fi
  
!   BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
    if test "x$OBJDUMP" != x; then
      # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
      BASIC_FIXUP_EXECUTABLE(OBJDUMP)
    fi
  
*** 1411,1421 ****
        fi
  
        AC_MSG_RESULT($JTREGEXE)
      else
        # try to find jtreg on path
!       BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
        JT_HOME="`$DIRNAME $JTREGEXE`"
      fi
    fi
  
    AC_SUBST(JT_HOME)
--- 1411,1421 ----
        fi
  
        AC_MSG_RESULT($JTREGEXE)
      else
        # try to find jtreg on path
!       BASIC_REQUIRE_PROGS(JTREGEXE, jtreg)
        JT_HOME="`$DIRNAME $JTREGEXE`"
      fi
    fi
  
    AC_SUBST(JT_HOME)