767
768 # Customize LDFLAGS for executables
769
770 LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
771
772 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
773 if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
774 LDFLAGS_STACK_SIZE=1048576
775 else
776 LDFLAGS_STACK_SIZE=327680
777 fi
778 LDFLAGS_JDKEXE="${LDFLAGS_JDKEXE} /STACK:$LDFLAGS_STACK_SIZE"
779 elif test "x$OPENJDK_TARGET_OS" = xlinux; then
780 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
781 fi
782
783 # Customize LDFLAGS for libs
784 LDFLAGS_JDKLIB="${LDFLAGS_JDK}"
785
786 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
787 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${JDK_OUTPUTDIR}/lib"
788 LDFLAGS_JDKLIB_SUFFIX=""
789 else
790 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \
791 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
792
793 # On some platforms (mac) the linker warns about non existing -L dirs.
794 # Add server first if available. Linking aginst client does not always produce the same results.
795 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
796 # Default to server for other variants.
797 if test "x$JVM_VARIANT_SERVER" = xtrue; then
798 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
799 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
800 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
801 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
802 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
803 else
804 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
805 fi
806
807 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
808 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
809 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
810 fi
811 fi
812
813 AC_SUBST(LDFLAGS_JDKLIB)
814 AC_SUBST(LDFLAGS_JDKEXE)
815 AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
816 AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
817 AC_SUBST(LDFLAGS_CXX_JDK)
818 ])
819
820 # FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
821 # [RUN-IF-FALSE])
822 # ------------------------------------------------------------
823 # Check that the c and c++ compilers support an argument
824 AC_DEFUN([FLAGS_COMPILER_CHECK_ARGUMENTS],
|
767
768 # Customize LDFLAGS for executables
769
770 LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
771
772 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
773 if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
774 LDFLAGS_STACK_SIZE=1048576
775 else
776 LDFLAGS_STACK_SIZE=327680
777 fi
778 LDFLAGS_JDKEXE="${LDFLAGS_JDKEXE} /STACK:$LDFLAGS_STACK_SIZE"
779 elif test "x$OPENJDK_TARGET_OS" = xlinux; then
780 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
781 fi
782
783 # Customize LDFLAGS for libs
784 LDFLAGS_JDKLIB="${LDFLAGS_JDK}"
785
786 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
787 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base"
788 LDFLAGS_JDKLIB_SUFFIX=""
789 else
790 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \
791 -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}"
792
793 # On some platforms (mac) the linker warns about non existing -L dirs.
794 # Add server first if available. Linking aginst client does not always produce the same results.
795 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
796 # Default to server for other variants.
797 if test "x$JVM_VARIANT_SERVER" = xtrue; then
798 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server"
799 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
800 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/client"
801 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
802 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
803 else
804 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server"
805 fi
806
807 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
808 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
809 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
810 fi
811 fi
812
813 AC_SUBST(LDFLAGS_JDKLIB)
814 AC_SUBST(LDFLAGS_JDKEXE)
815 AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
816 AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
817 AC_SUBST(LDFLAGS_CXX_JDK)
818 ])
819
820 # FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
821 # [RUN-IF-FALSE])
822 # ------------------------------------------------------------
823 # Check that the c and c++ compilers support an argument
824 AC_DEFUN([FLAGS_COMPILER_CHECK_ARGUMENTS],
|