Initial Support for using gcc to compile a Windows JDK

Author: TheShermanTanker

make/Hsdis.gmk

@@ -35,7 +35,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)
@@ -54,7 +54,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
@@ -71,62 +71,64 @@ endif
 
 ifeq ($(HSDIS_BACKEND), binutils)
   ifeq ($(call isTargetOs, windows), true)
-    # On windows, we need to "fake" a completely different toolchain using gcc
-    # instead of the normal microsoft toolchain. This is quite hacky...
+    ifeq ($(TOOLCHAIN_TYPE), microsoft)
+      # On windows, we need to "fake" a completely different toolchain using gcc
+      # instead of the normal microsoft toolchain. This is quite hacky...
 
-    MINGW_BASE := x86_64-w64-mingw32
+      MINGW_BASE := x86_64-w64-mingw32
 
-    MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
-    ifeq ($(wildcard $(MINGW_SYSROOT)), )
-      # Use fallback path
-      MINGW_SYSROOT := /usr/$(MINGW_BASE)
+      MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
       ifeq ($(wildcard $(MINGW_SYSROOT)), )
-        $(error mingw sysroot not found)
+        # Use fallback path
+        MINGW_SYSROOT := /usr/$(MINGW_BASE)
+        ifeq ($(wildcard $(MINGW_SYSROOT)), )
+          $(error mingw sysroot not found)
+        endif
       endif
-    endif
 
-    BUILD_HSDIS_CC := $(MINGW_BASE)-gcc
-    BUILD_HSDIS_LD := $(MINGW_BASE)-ld
-    BUILD_HSDIS_OBJCOPY := $(MINGW_BASE)-objcopy
-    BUILD_HSDIS_SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT)
-    BUILD_HSDIS_SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT)
+      BUILD_HSDIS_CC := $(MINGW_BASE)-gcc
+      BUILD_HSDIS_LD := $(MINGW_BASE)-ld
+      BUILD_HSDIS_OBJCOPY := $(MINGW_BASE)-objcopy
+      BUILD_HSDIS_SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT)
+      BUILD_HSDIS_SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT)
 
-    MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
-    ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-      # Try without mingw
-      MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
+      MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
       ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-        $(error mingw sysroot lib path not found)
+        # Try without mingw
+        MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
+        ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
+          $(error mingw sysroot lib path not found)
+        endif
       endif
-    endif
 
-    MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
-    MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
-    ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-      # Try using only major version number
-      MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
-      MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
+      MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
+      MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
       ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-        $(error mingw gcc lib path not found)
+        # Try using only major version number
+        MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
+        MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
+        ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
+          $(error mingw gcc lib path not found)
+        endif
       endif
-    endif
 
-    TOOLCHAIN_TYPE := gcc
-    OPENJDK_TARGET_OS := linux
-    OPENJDK_TARGET_OS_TYPE := unix
-    GENDEPS_FLAGS := -MMD -MF
-    CFLAGS_DEBUG_SYMBOLS := -g
-    DISABLED_WARNINGS :=
-    DISABLE_WARNING_PREFIX := -Wno-
-    CFLAGS_WARNINGS_ARE_ERRORS := -Werror
-    SHARED_LIBRARY_FLAGS := -shared
-
-    HSDIS_TOOLCHAIN_DEFAULT_CFLAGS := false
-    HSDIS_TOOLCHAIN_DEFAULT_LDFLAGS := false
-    HSDIS_LDFLAGS += -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
-    MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
-    HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
-        -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
+      TOOLCHAIN_TYPE := gcc
+      OPENJDK_TARGET_OS := linux
+      OPENJDK_TARGET_OS_TYPE := unix
+      GENDEPS_FLAGS := -MMD -MF
+      CFLAGS_DEBUG_SYMBOLS := -g
+      DISABLED_WARNINGS :=
+      DISABLE_WARNING_PREFIX := -Wno-
+      CFLAGS_WARNINGS_ARE_ERRORS := -Werror
+      SHARED_LIBRARY_FLAGS := -shared
+
+      HSDIS_TOOLCHAIN_DEFAULT_CFLAGS := false
+      HSDIS_TOOLCHAIN_DEFAULT_LDFLAGS := false
+      HSDIS_LDFLAGS += -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
+      MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
+      HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
+          -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
+    endif
   else
     HSDIS_TOOLCHAIN_LIBS := -ldl
   endif
@@ -138,7 +140,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 \

make/StaticLibs.gmk

@@ -137,7 +137,7 @@ $(eval $(call SetupBuildLauncher, java, \
     CFLAGS := -DSTATIC_BUILD, \
     LDFLAGS := $(LDFLAGS_STATIC_JDK), \
     LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
-    LINK_TYPE := C++, \
+    LANG := C++, \
     OUTPUT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
     OBJECT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
 ))

make/autoconf/build-performance.m4

@@ -162,7 +162,7 @@ AC_DEFUN([BPERF_SETUP_CCACHE],
   # Check if ccache is available
   CCACHE_AVAILABLE=true
 
-  UTIL_LOOKUP_TOOLCHAIN_PROGS(CCACHE, ccache)
+  UTIL_LOOKUP_TOOLCHAIN_PROGS(CCACHE, ccache, NOFIXPATH)
 
   AC_MSG_CHECKING([if ccache is available])
   if test "x$TOOLCHAIN_TYPE" != "xgcc" && test "x$TOOLCHAIN_TYPE" != "xclang"; then

make/autoconf/flags-cflags.m4

@@ -93,7 +93,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
@@ -282,17 +286,10 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM="-O0"
     C_O_FLAG_NONE="-O0"
 
-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
-      C_O_FLAG_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects"
-    else
-      C_O_FLAG_LTO="-flto -fno-strict-aliasing"
-    fi
-
     if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
       C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} -finline-functions"
       C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} -finline-functions"
       C_O_FLAG_HI="${C_O_FLAG_HI} -finline-functions"
-      C_O_FLAG_LTO="${C_O_FLAG_LTO} -ffat-lto-objects"
     fi
 
     # -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
@@ -324,7 +321,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM=""
     C_O_FLAG_NONE="-Od"
     C_O_FLAG_SIZE="-O1"
-    C_O_FLAG_LTO="-GL"
   fi
 
   # Now copy to C++ flags
@@ -336,7 +332,6 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   CXX_O_FLAG_DEBUG_JVM="$C_O_FLAG_DEBUG_JVM"
   CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
   CXX_O_FLAG_SIZE="$C_O_FLAG_SIZE"
-  CXX_O_FLAG_LTO="$C_O_FLAG_LTO"
 
   # Adjust optimization flags according to debug level.
   case $DEBUG_LEVEL in
@@ -369,15 +364,12 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   AC_SUBST(C_O_FLAG_NORM)
   AC_SUBST(C_O_FLAG_NONE)
   AC_SUBST(C_O_FLAG_SIZE)
-  AC_SUBST(C_O_FLAG_LTO)
-
   AC_SUBST(CXX_O_FLAG_HIGHEST_JVM)
   AC_SUBST(CXX_O_FLAG_HIGHEST)
   AC_SUBST(CXX_O_FLAG_HI)
   AC_SUBST(CXX_O_FLAG_NORM)
   AC_SUBST(CXX_O_FLAG_NONE)
   AC_SUBST(CXX_O_FLAG_SIZE)
-  AC_SUBST(CXX_O_FLAG_LTO)
 ])
 
 AC_DEFUN([FLAGS_SETUP_CFLAGS],
@@ -431,7 +423,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"
@@ -442,7 +434,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"
@@ -485,33 +482,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"
+    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"
@@ -554,8 +555,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -fvisibility=hidden -fstack-protector"
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -volatile:iso -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -volatile:iso -Zc:wchar_t-"
   fi
 
   # Set character encoding in source
@@ -623,8 +624,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