Initial Support for using gcc to compile a Windows JDK

TheShermanTanker · Nov 13, 2024 · 8299ca7 · 8299ca7
1 parent c00e20c
commit 8299ca7
Show file tree

Hide file tree

Showing 165 changed files with 1,573 additions and 990 deletions.
diff --git a/make/Hsdis.gmk b/make/Hsdis.gmk
@@ -38,7 +38,7 @@ HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
 REAL_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
 BUILT_HSDIS_LIB := $(HSDIS_OUTPUT_DIR)/$(REAL_HSDIS_NAME)
 
-HSDIS_LINK_TYPE := C
+HSDIS_LANG := C
 
 ifeq ($(HSDIS_BACKEND), capstone)
   ifeq ($(call isTargetCpuArch, x86), true)
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(HSDIS_BACKEND), llvm)
   # Use C++ instead of C
-  HSDIS_LINK_TYPE := C++
+  HSDIS_LANG := C++
 
   ifeq ($(call isTargetOs, linux), true)
     LLVM_OS := pc-linux-gnu
@@ -142,7 +142,7 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
     NAME := hsdis, \
-    LINK_TYPE := $(HSDIS_LINK_TYPE), \
+    LANG := $(HSDIS_LANG), \
     SRC := $(TOPDIR)/src/utils/hsdis/$(HSDIS_BACKEND), \
     EXTRA_HEADER_DIRS := \
           java.base:include \

diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4
@@ -165,7 +165,7 @@ AC_DEFUN([BPERF_SETUP_CCACHE],
   if test "x$TOOLCHAIN_PATH" != x; then
     PATH=$TOOLCHAIN_PATH:$PATH
   fi
-  UTIL_LOOKUP_PROGS(CCACHE, ccache)
+  UTIL_LOOKUP_PROGS(CCACHE, ccache, , NOFIXPATH)
   PATH="$OLD_PATH"
 
   AC_MSG_CHECKING([if ccache is available])

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -35,14 +35,24 @@
 AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
 [
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    # Default works for linux, might work on other platforms as well.
-    SHARED_LIBRARY_FLAGS='-shared'
-    # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
-    # This protects internal library dependencies within the JDK from being
-    # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
-    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
-    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
-    SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+    if test "x$OPENJDK_TARGET_OS" = xwindows; then
+      # Linking is different on Windows
+      SHARED_LIBRARY_FLAGS='-shared'
+      SET_EXECUTABLE_ORIGIN=''
+      SET_SHARED_LIBRARY_ORIGIN=""
+      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+
+    elif test "x$OPENJDK_TARGET_OS" = xlinux; then
+      # Default works for linux, might work on other platforms as well.
+      SHARED_LIBRARY_FLAGS='-shared'
+      # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+      # This protects internal library dependencies within the JDK from being
+      # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
+      SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
+      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+
+    fi
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
@@ -124,7 +134,11 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
       )
     fi
 
-    CFLAGS_DEBUG_SYMBOLS="-g -gdwarf-4"
+    GDWARF_FLAGS="-gcodeview"
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${GDWARF_FLAGS}],
+        IF_FALSE: [GDWARF_FLAGS="-gdwarf-4"])
+
+    CFLAGS_DEBUG_SYMBOLS="-g ${GDWARF_FLAGS}"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
@@ -457,7 +471,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 [
   #### OS DEFINES, these should be independent on toolchain
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    CFLAGS_OS_DEF_JVM="-DLINUX -D_FILE_OFFSET_BITS=64"
+    CFLAGS_OS_DEF_JVM="-DLINUX -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_REENTRANT"
     CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
@@ -468,7 +482,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$OPENJDK_TARGET_OS" = xbsd; then
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xwindows; then
-    CFLAGS_OS_DEF_JVM="-D_WINDOWS -DWIN32 -D_JNI_IMPLEMENTATION_"
+    CFLAGS_OS_DEF_JVM="-D_WINDOWS -DWIN32 -D_JNI_IMPLEMENTATION_ \
+        -DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602"
+    # _WIN32_WINNT=0x0602 means access APIs for Windows 8 and above. See
+    # https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
+    CFLAGS_OS_DEF_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
+        -DWIN32 -DIAL"
   fi
 
   CFLAGS_OS_DEF_JDK="$CFLAGS_OS_DEF_JDK -D$OPENJDK_TARGET_OS_UPPERCASE"
@@ -501,39 +520,37 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 
   #### TOOLCHAIN DEFINES
 
-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
-  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+  if test "x$TOOLCHAIN_TYPE" = xclang; then
     ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # _WIN32_WINNT=0x0602 means access APIs for Windows 8 and above. See
-    # https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
-    ALWAYS_DEFINES="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
-        -D_CRT_DECLARE_NONSTDC_NAMES -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
-    ALWAYS_DEFINES_JDK="$ALWAYS_DEFINES -DWIN32 -DIAL"
-    ALWAYS_DEFINES_JVM="$ALWAYS_DEFINES -DNOMINMAX"
+    ALWAYS_DEFINES_JDK="-D_CRT_DECLARE_NONSTDC_NAMES -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
+    ALWAYS_DEFINES_JVM="-D_CRT_DECLARE_NONSTDC_NAMES -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
   fi
 
   ##############################################################################
   #
   #
   # CFLAGS BASIC
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    # COMMON to gcc and clang
-    TOOLCHAIN_CFLAGS_JVM="-pipe -fno-rtti -fno-exceptions \
-        -fvisibility=hidden -fno-strict-aliasing -fno-omit-frame-pointer"
-  fi
-
-  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-    # clang compiler on aix needs -ffunction-sections
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno -fstack-protector"
-    TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char -fstack-protector"
+    if test "x$OPENJDK_TARGET_OS" = xwindows; then
+      TOOLCHAIN_CFLAGS_JVM="-pipe -fno-rtti -fno-exceptions \
+          -fno-strict-aliasing -fno-omit-frame-pointer"
+    else
+      # COMMON to gcc and clang
+      TOOLCHAIN_CFLAGS_JVM="-pipe -fno-rtti -fno-exceptions \
+          -fvisibility=hidden -fno-strict-aliasing -fno-omit-frame-pointer"
+    fi
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
-    TOOLCHAIN_CFLAGS_JDK="-fvisibility=hidden -pipe -fstack-protector"
-    # reduce lib size on linux in link step, this needs also special compile flags
+    if test "x$OPENJDK_TARGET_OS" = xwindows; then
+      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fno-stack-protector"
+      TOOLCHAIN_CFLAGS_JDK="-pipe -fno-stack-protector"
+    else
+      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
+      TOOLCHAIN_CFLAGS_JDK="-fvisibility=hidden -pipe -fstack-protector"
+    fi
+    # reduce lib size for gcc in link step, this needs also special compile flags
     # do this on s390x also for libjvm (where serviceability agent is not supported)
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
@@ -546,6 +563,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing"
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      # clang compiler on aix needs -ffunction-sections
+      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno -fstack-protector"
+      TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char -fstack-protector"
+    fi
+  
     # Restrict the debug information created by Clang to avoid
     # too big object files and speed the build up a little bit
     # (see http://llvm.org/bugs/show_bug.cgi?id=7554)
@@ -572,8 +595,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
     # compilation of all source files regardless of the active code page on Windows.
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -utf-8 -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -utf-8 -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -volatile:iso -utf-8 -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -permissive- -volatile:iso -utf-8 -Zc:wchar_t-"
   fi
 
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -631,8 +654,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 
   # Where does this really belong??
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    PICFLAG="-fPIC"
-    PIEFLAG="-fPIE"
+    if test "x$OPENJDK_TARGET_OS" = xwindows; then
+      PICFLAG=""
+      PIEFLAG=""
+    else
+      PICFLAG="-fPIC"
+      PIEFLAG="-fPIE"
+    fi
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     PICFLAG=""
   fi

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
@@ -50,8 +50,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
     # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
-    BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
-    # Linux : remove unused code+data in link step
+    if test "x$OPENJDK_TARGET_OS" = xlinux; then
+      BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
+    elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+      BASIC_LDFLAGS="-Wl,--no-undefined -fno-stack-protector -Wl,--exclude-libs,ALL"
+    fi
+    # gcc : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       if test "x$OPENJDK_TARGET_CPU" = xs390x; then
         BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections"
@@ -60,7 +64,11 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
 
-    BASIC_LDFLAGS_JVM_ONLY=""
+    if test "x$OPENJDK_TARGET_OS" = xwindows; then
+      BASIC_LDFLAGS_JVM_ONLY="-Wl,--exclude-all-symbols -Wl,--subsystem,windows"
+    else
+      BASIC_LDFLAGS_JVM_ONLY=""
+    fi
 
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
@@ -90,7 +98,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   fi
 
   if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
-      && test "x$OPENJDK_TARGET_OS" != xaix; then
+      && test "x$OPENJDK_TARGET_OS" != xaix \
+      && test "x$OPENJDK_TARGET_OS" != xwindows; then
     if test -n "$HAS_NOEXECSTACK"; then
       BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,noexecstack"
     fi
@@ -122,10 +131,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup LDFLAGS for linking executables
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
-    # java heap.
-    if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
-      EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -pie"
+    if test "x$OPENJDK_TARGET_OS" != xwindows; then
+      # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
+      # java heap.
+      if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
+        EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -pie"
+      fi
     fi
   fi
 
@@ -168,14 +179,22 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
       $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
     fi
 
-    # MIPS ABI does not support GNU hash style
-    if test "x${OPENJDK_$1_CPU}" = xmips ||
-        test "x${OPENJDK_$1_CPU}" = xmipsel ||
-        test "x${OPENJDK_$1_CPU}" = xmips64 ||
-        test "x${OPENJDK_$1_CPU}" = xmips64el; then
-      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv"
+    if test "x${OPENJDK_$1_OS}" != xwindows; then
+      # MIPS ABI does not support GNU hash style
+      if test "x${OPENJDK_$1_CPU}" = xmips ||
+          test "x${OPENJDK_$1_CPU}" = xmipsel ||
+          test "x${OPENJDK_$1_CPU}" = xmips64 ||
+          test "x${OPENJDK_$1_CPU}" = xmips64el; then
+          $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv"
+      else
+        $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu"
+      fi
     else
-      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu"
+      if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
+        $1_CPU_EXECUTABLE_LDFLAGS="-Wl,--stack=327680"
+      elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
+        $1_CPU_EXECUTABLE_LDFLAGS="-Wl,--stack=1048576"
+      fi
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then

diff --git a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
@@ -88,11 +88,12 @@ AC_DEFUN([FLAGS_SETUP_STRIPFLAGS],
 AC_DEFUN([FLAGS_SETUP_RCFLAGS],
 [
   # On Windows, we need to set RC flags.
+  RCFLAGS=""
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     RCFLAGS="-nologo"
-    if test "x$DEBUG_LEVEL" = xrelease; then
-      RCFLAGS="$RCFLAGS -DNDEBUG"
-    fi
+  fi
+  if test "x$DEBUG_LEVEL" = xrelease; then
+    RCFLAGS="$RCFLAGS -DNDEBUG"
   fi
   AC_SUBST(RCFLAGS)
 ])

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
@@ -115,6 +115,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
       CHECKING_MSG: [if linker should clean out unused code (linktime-gc)])
   AC_SUBST(ENABLE_LINKTIME_GC)
 
+  UTIL_ARG_ENABLE(NAME: linktime-opt, DEFAULT: false,
+      DEFAULT_DESC: [auto], RESULT: ENABLE_LINKTIME_OPT,
+      DESC: [perform link time optimization on native code not including HotSpot],
+      CHECKING_MSG: [if link time optimization should be performed on native code excluding HotSpot (linktime-opt)])
+  AC_SUBST(ENABLE_LINKTIME_OPT)
+
   # Check for full doc dependencies
   FULL_DOCS_AVAILABLE=true
   AC_MSG_CHECKING([for graphviz dot])
@@ -259,9 +265,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
       [AS_HELP_STRING([--with-native-debug-symbols],
       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
       [
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
           if test "x$withval" = xinternal; then
-            AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
+            AC_MSG_ERROR([Microsoft does not support the parameter 'internal' for --with-native-debug-symbols])
           fi
         fi
       ],

diff --git a/make/autoconf/lib-std.m4 b/make/autoconf/lib-std.m4
@@ -76,12 +76,48 @@ AC_DEFUN_ONCE([LIB_SETUP_STD_LIBS],
       OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS $STATIC_STDCXX_FLAGS"
       AC_MSG_RESULT([static])
     fi
+  elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      # Test if stdc++ can be linked statically.
+      AC_MSG_CHECKING([if static link of stdc++ is possible])
+      STATIC_STDCXX_FLAGS="-static-libstdc++ -static-libgcc"
+      AC_LANG_PUSH(C++)
+      OLD_LIBS="$LIBS"
+      LIBS="$STATIC_STDCXX_FLAGS"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
+          [has_static_libstdcxx=yes],
+          [has_static_libstdcxx=no])
+      LIBS="$OLD_LIBS"
+      AC_LANG_POP(C++)
+      AC_MSG_RESULT([$has_static_libstdcxx])
+
+      if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
+        AC_MSG_ERROR([Static linking of libstdc++ was not possible!])
+      fi
+
+      # If dynamic was requested, it's available since it would fail above otherwise.
+      # If dynamic wasn't requested, go with static unless it isn't available.
+      AC_MSG_CHECKING([how to link with libstdc++])
+      if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno ; then
+        AC_MSG_RESULT([dynamic])
+      else
+        LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
+        JVM_LDFLAGS="$JVM_LDFLAGS $STATIC_STDCXX_FLAGS"
+        ADLC_LDFLAGS="$ADLC_LDFLAGS $STATIC_STDCXX_FLAGS"
+        # Ideally, we should test stdc++ for the BUILD toolchain separately. For now
+        # just use the same setting as for the TARGET toolchain.
+        OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS $STATIC_STDCXX_FLAGS"
+        AC_MSG_RESULT([static])
+      fi
+    fi
   fi
 
   AC_SUBST(LIBCXX)
 
   # Setup Windows runtime dlls
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    TOOLCHAIN_SETUP_VS_RUNTIME_DLLS
+    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+      TOOLCHAIN_SETUP_VS_RUNTIME_DLLS
+    fi
   fi
 ])
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
@@ -157,9 +157,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   fi
 
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
-        comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+    # Only Visual C++ requires static import libraries
+    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+      BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
+          comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
+          ws2_32.lib winmm.lib version.lib psapi.lib"
+    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
+      BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpowrprof -lws2_32 -lwinmm -lversion -lpsapi"
+    fi
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)