equal
deleted
inserted
replaced
686 CFLAGS_WARNINGS_ARE_ERRORS |
686 CFLAGS_WARNINGS_ARE_ERRORS |
687 DISABLE_WARNING_PREFIX |
687 DISABLE_WARNING_PREFIX |
688 WARNINGS_AS_ERRORS |
688 WARNINGS_AS_ERRORS |
689 COMPILER_SUPPORTS_TARGET_BITS_FLAG |
689 COMPILER_SUPPORTS_TARGET_BITS_FLAG |
690 ZERO_ARCHFLAG |
690 ZERO_ARCHFLAG |
691 LDFLAGS_TESTEXE_SUFFIX |
|
692 LDFLAGS_TESTLIB_SUFFIX |
|
693 LDFLAGS_TESTEXE |
691 LDFLAGS_TESTEXE |
694 LDFLAGS_TESTLIB |
692 LDFLAGS_TESTLIB |
695 LDFLAGS_CXX_JDK |
693 LDFLAGS_CXX_JDK |
696 LDFLAGS_JDKEXE_SUFFIX |
694 JDKEXE_LIBS |
697 LDFLAGS_JDKLIB_SUFFIX |
695 JDKLIB_LIBS |
698 LDFLAGS_JDKEXE |
696 LDFLAGS_JDKEXE |
699 LDFLAGS_JDKLIB |
697 LDFLAGS_JDKLIB |
700 CXXFLAGS_TESTEXE |
698 CXXFLAGS_TESTEXE |
701 CXXFLAGS_TESTLIB |
699 CXXFLAGS_TESTLIB |
702 CFLAGS_TESTEXE |
700 CFLAGS_TESTEXE |
4593 # definitions. It is replaced with custom functionality when building |
4591 # definitions. It is replaced with custom functionality when building |
4594 # custom sources. |
4592 # custom sources. |
4595 #CUSTOM_AUTOCONF_INCLUDE |
4593 #CUSTOM_AUTOCONF_INCLUDE |
4596 |
4594 |
4597 # Do not change or remove the following line, it is needed for consistency checks: |
4595 # Do not change or remove the following line, it is needed for consistency checks: |
4598 DATE_WHEN_GENERATED=1446128654 |
4596 DATE_WHEN_GENERATED=1446132586 |
4599 |
4597 |
4600 ############################################################################### |
4598 ############################################################################### |
4601 # |
4599 # |
4602 # Initialization / Boot-strapping |
4600 # Initialization / Boot-strapping |
4603 # |
4601 # |
43566 fi |
43564 fi |
43567 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
43565 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
43568 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" |
43566 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" |
43569 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" |
43567 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" |
43570 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
43568 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
43571 LDFLAGS_JDK="${LDFLAGS_JDK} -brtl -bnolibpath -liconv -bexpall -bernotok" |
43569 LDFLAGS_JDK="${LDFLAGS_JDK} -brtl -bnolibpath -bexpall -bernotok" |
43572 fi |
43570 fi |
43573 |
43571 |
43574 # Customize LDFLAGS for executables |
43572 # Customize LDFLAGS for executables |
43575 |
43573 |
43576 LDFLAGS_JDKEXE="${LDFLAGS_JDK}" |
43574 LDFLAGS_JDKEXE="${LDFLAGS_JDK}" |
43589 # Customize LDFLAGS for libs |
43587 # Customize LDFLAGS for libs |
43590 LDFLAGS_JDKLIB="${LDFLAGS_JDK}" |
43588 LDFLAGS_JDKLIB="${LDFLAGS_JDK}" |
43591 |
43589 |
43592 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
43590 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
43593 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" |
43591 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" |
43594 LDFLAGS_JDKLIB_SUFFIX="" |
43592 JDKLIB_LIBS="" |
43595 else |
43593 else |
43596 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \ |
43594 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \ |
43597 -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}" |
43595 -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}" |
43598 |
43596 |
43599 # On some platforms (mac) the linker warns about non existing -L dirs. |
43597 # On some platforms (mac) the linker warns about non existing -L dirs. |
43608 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/minimal" |
43606 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/minimal" |
43609 else |
43607 else |
43610 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server" |
43608 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server" |
43611 fi |
43609 fi |
43612 |
43610 |
43613 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm" |
43611 JDKLIB_LIBS="-ljava -ljvm" |
43614 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
43612 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
43615 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc" |
43613 JDKLIB_LIBS="$JDKLIB_LIBS -lc" |
|
43614 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
|
43615 JDKLIB_LIBS="$JDKLIB_LIBS -liconv" |
43616 fi |
43616 fi |
43617 fi |
43617 fi |
43618 |
43618 |
43619 |
43619 |
43620 |
43620 |
43622 |
43622 |
43623 |
43623 |
43624 |
43624 |
43625 LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" |
43625 LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" |
43626 LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" |
43626 LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" |
43627 LDFLAGS_TESTLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX" |
|
43628 LDFLAGS_TESTEXE_SUFFIX="$LDFLAGS_JDKEXE_SUFFIX" |
|
43629 |
|
43630 |
|
43631 |
43627 |
43632 |
43628 |
43633 |
43629 |
43634 |
43630 |
43635 |
43631 |