Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 2204
- 0e87966d7ff1
- parent 2172
- a0101c7abbb9
- child 2206
- 7ba4e17574e0
equal
deleted
inserted
replaced
| 2203:28b247535e18 | 2204:0e87966d7ff1 |
|---|---|
| 263 # platform. We can't use the AC_PROG_CC macro, since it can only be used | 263 # platform. We can't use the AC_PROG_CC macro, since it can only be used |
| 264 # once. Also, we need to do this before adding a tools dir to the path, | 264 # once. Also, we need to do this before adding a tools dir to the path, |
| 265 # otherwise we might pick up cross-compilers which don't use standard naming. | 265 # otherwise we might pick up cross-compilers which don't use standard naming. |
| 266 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have | 266 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have |
| 267 # to wait until they are properly discovered. | 267 # to wait until they are properly discovered. |
| 268 AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) | 268 BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc]) |
| 269 BASIC_FIXUP_EXECUTABLE(BUILD_CC) | 269 BASIC_FIXUP_EXECUTABLE(BUILD_CC) |
| 270 AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) | 270 BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++]) |
| 271 BASIC_FIXUP_EXECUTABLE(BUILD_CXX) | 271 BASIC_FIXUP_EXECUTABLE(BUILD_CXX) |
| 272 AC_PATH_PROG(BUILD_LD, ld) | 272 BASIC_PATH_PROGS(BUILD_LD, ld) |
| 273 BASIC_FIXUP_EXECUTABLE(BUILD_LD) | 273 BASIC_FIXUP_EXECUTABLE(BUILD_LD) |
| 274 fi | 274 fi |
| 275 AC_SUBST(BUILD_CC) | 275 AC_SUBST(BUILD_CC) |
| 276 AC_SUBST(BUILD_CXX) | 276 AC_SUBST(BUILD_CXX) |
| 277 AC_SUBST(BUILD_LD) | 277 AC_SUBST(BUILD_LD) |
| 468 AC_SUBST(LDCXX) | 468 AC_SUBST(LDCXX) |
| 469 # Linking C++ executables. | 469 # Linking C++ executables. |
| 470 AC_SUBST(LDEXECXX) | 470 AC_SUBST(LDEXECXX) |
| 471 | 471 |
| 472 if test "x$OPENJDK_TARGET_OS" != xwindows; then | 472 if test "x$OPENJDK_TARGET_OS" != xwindows; then |
| 473 AC_CHECK_TOOL(AR, ar) | 473 BASIC_CHECK_TOOLS(AR, ar) |
| 474 BASIC_FIXUP_EXECUTABLE(AR) | 474 BASIC_FIXUP_EXECUTABLE(AR) |
| 475 fi | 475 fi |
| 476 if test "x$OPENJDK_TARGET_OS" = xmacosx; then | 476 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
| 477 ARFLAGS="-r" | 477 ARFLAGS="-r" |
| 478 elif test "x$OPENJDK_TARGET_OS" = xaix; then | 478 elif test "x$OPENJDK_TARGET_OS" = xaix; then |
| 596 PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}" | 596 PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}" |
| 597 fi | 597 fi |
| 598 | 598 |
| 599 # Find the right assembler. | 599 # Find the right assembler. |
| 600 if test "x$OPENJDK_TARGET_OS" = xsolaris; then | 600 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
| 601 AC_PATH_PROG(AS, as) | 601 BASIC_PATH_PROGS(AS, as) |
| 602 BASIC_FIXUP_EXECUTABLE(AS) | 602 BASIC_FIXUP_EXECUTABLE(AS) |
| 603 else | 603 else |
| 604 AS="$CC -c" | 604 AS="$CC -c" |
| 605 fi | 605 fi |
| 606 AC_SUBST(AS) | 606 AC_SUBST(AS) |
| 607 | 607 |
| 608 if test "x$OPENJDK_TARGET_OS" = xsolaris; then | 608 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
| 609 AC_PATH_PROG(NM, nm) | 609 BASIC_PATH_PROGS(NM, nm) |
| 610 BASIC_FIXUP_EXECUTABLE(NM) | 610 BASIC_FIXUP_EXECUTABLE(NM) |
| 611 AC_PATH_PROG(GNM, gnm) | 611 BASIC_PATH_PROGS(GNM, gnm) |
| 612 BASIC_FIXUP_EXECUTABLE(GNM) | 612 BASIC_FIXUP_EXECUTABLE(GNM) |
| 613 AC_PATH_PROG(STRIP, strip) | 613 BASIC_PATH_PROGS(STRIP, strip) |
| 614 BASIC_FIXUP_EXECUTABLE(STRIP) | 614 BASIC_FIXUP_EXECUTABLE(STRIP) |
| 615 AC_PATH_PROG(MCS, mcs) | 615 BASIC_PATH_PROGS(MCS, mcs) |
| 616 BASIC_FIXUP_EXECUTABLE(MCS) | 616 BASIC_FIXUP_EXECUTABLE(MCS) |
| 617 elif test "x$OPENJDK_TARGET_OS" != xwindows; then | 617 elif test "x$OPENJDK_TARGET_OS" != xwindows; then |
| 618 AC_PATH_PROG(OTOOL, otool) | 618 AC_PATH_PROG(OTOOL, otool) |
| 619 if test "x$OTOOL" = "x"; then | 619 if test "x$OTOOL" = "x"; then |
| 620 OTOOL="true" | 620 OTOOL="true" |
| 621 fi | 621 fi |
| 622 AC_CHECK_TOOL(NM, nm) | 622 BASIC_CHECK_TOOLS(NM, nm) |
| 623 BASIC_FIXUP_EXECUTABLE(NM) | 623 BASIC_FIXUP_EXECUTABLE(NM) |
| 624 GNM="$NM" | 624 GNM="$NM" |
| 625 AC_SUBST(GNM) | 625 AC_SUBST(GNM) |
| 626 AC_CHECK_TOOL(STRIP, strip) | 626 BASIC_CHECK_TOOLS(STRIP, strip) |
| 627 BASIC_FIXUP_EXECUTABLE(STRIP) | 627 BASIC_FIXUP_EXECUTABLE(STRIP) |
| 628 fi | 628 fi |
| 629 | 629 |
| 630 # objcopy is used for moving debug symbols to separate files when | 630 # objcopy is used for moving debug symbols to separate files when |
| 631 # full debug symbols are enabled. | 631 # full debug symbols are enabled. |
| 632 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then | 632 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
| 633 AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) | 633 BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
| 634 # Only call fixup if objcopy was found. | 634 # Only call fixup if objcopy was found. |
| 635 if test -n "$OBJCOPY"; then | 635 if test -n "$OBJCOPY"; then |
| 636 BASIC_FIXUP_EXECUTABLE(OBJCOPY) | 636 BASIC_FIXUP_EXECUTABLE(OBJCOPY) |
| 637 fi | 637 fi |
| 638 fi | 638 fi |
| 639 | 639 |
| 640 AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump]) | 640 BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump]) |
| 641 if test "x$OBJDUMP" != x; then | 641 if test "x$OBJDUMP" != x; then |
| 642 # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing. | 642 # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing. |
| 643 BASIC_FIXUP_EXECUTABLE(OBJDUMP) | 643 BASIC_FIXUP_EXECUTABLE(OBJDUMP) |
| 644 fi | 644 fi |
| 645 | 645 |
| 1411 fi | 1411 fi |
| 1412 | 1412 |
| 1413 AC_MSG_RESULT($JTREGEXE) | 1413 AC_MSG_RESULT($JTREGEXE) |
| 1414 else | 1414 else |
| 1415 # try to find jtreg on path | 1415 # try to find jtreg on path |
| 1416 BASIC_REQUIRE_PROG(JTREGEXE, jtreg) | 1416 BASIC_REQUIRE_PROGS(JTREGEXE, jtreg) |
| 1417 JT_HOME="`$DIRNAME $JTREGEXE`" | 1417 JT_HOME="`$DIRNAME $JTREGEXE`" |
| 1418 fi | 1418 fi |
| 1419 fi | 1419 fi |
| 1420 | 1420 |
| 1421 AC_SUBST(JT_HOME) | 1421 AC_SUBST(JT_HOME) |
