Add support for *BSD to makefiles

make/Hsdis.gmk

@@ -62,6 +62,8 @@ ifeq ($(HSDIS_BACKEND), llvm)
     LLVM_OS := apple-darwin
   else ifeq ($(call isTargetOs, windows), true)
     LLVM_OS := pc-windows-msvc
+  else ifeq ($(call isTargetOs, bsd), true)
+    LLVM_OS := unknown-$(OPENJDK_TARGET_OS_ENV:bsd.%=%)
   else
     $(error No support for LLVM on this platform)
   endif

make/RunTestsPrebuilt.gmk

@@ -169,6 +169,8 @@ else
     OPENJDK_TARGET_OS := linux
   else ifeq ($(UNAME_OS), Darwin)
     OPENJDK_TARGET_OS := macosx
+  else ifneq ($(findstring BSD,$(UNAME_OS)),)
+    OPENJDK_TARGET_OS := bsd
   else
     OPENJDK_TARGET_OS := $(UNAME_OS)
   endif
@@ -214,6 +216,9 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
   MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024)
+else ifeq ($(OPENJDK_TARGET_OS), bsd)
+  NUM_CORES := $(shell /sbin/sysctl -n hw.ncpu)
+  MEMORY_SIZE := $(shell $(EXPR) `/sbin/sysctl -n hw.physmem` / 1024 / 1024)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \

make/autoconf/platform.m4

@@ -493,9 +493,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
 
   # Setup OPENJDK_$1_CPU_OSARCH, which is used to set the os.arch Java system property
   OPENJDK_$1_CPU_OSARCH="$OPENJDK_$1_CPU"
-  if test "x$OPENJDK_$1_OS" = xbsd -o "x$OPENJDK_$1_OS" = xlinux \
-      && test "x$OPENJDK_$1_CPU" = xx86; then
-    # On linux and BSD only, we replace x86 with i386.
+  if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xx86; then
+    # On linux only, we replace x86 with i386.
     OPENJDK_$1_CPU_OSARCH="i386"
   elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.

make/common/JdkNativeCompilation.gmk

@@ -234,6 +234,10 @@ define AddJdkLibrary
   ifeq ($(call isTargetOs, aix)+$$($1_$2_MODULE):$$($1_$2_NAME), true+java.base:jli)
     $1_$2_STATIC_LIBRARY := true
   endif
+  ifeq ($(call isTargetOsEnv, bsd.openbsd)+$$($1_$2_MODULE):$$($1_$2_NAME), true+java.base:jli)
+    $1_$2_STATIC_LIBRARY := true
+    $1_LIBS += $(LIBZ_LIBS) $(LIBPTHREAD)
+  endif
   ifeq ($$($1_$2_MODULE):$$($1_$2_NAME), gtest:gtest)
     $1_$2_STATIC_LIBRARY := true
   endif

make/common/Utils.gmk

@@ -196,6 +196,9 @@ isTargetOs = \
 isTargetOsType = \
   $(strip $(if $(filter $(OPENJDK_TARGET_OS_TYPE), $1), true, false))
 
+isTargetOsEnv = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_OS_ENV), $1), true, false))
+
 isTargetCpu = \
   $(strip $(if $(filter $(OPENJDK_TARGET_CPU), $1), true, false))
 

make/common/modules/LauncherCommon.gmk

@@ -182,6 +182,7 @@ define SetupBuildLauncherBody
       DISABLED_WARNINGS_clang := unused-function, \
       LDFLAGS := $$($1_LDFLAGS), \
       LDFLAGS_linux := $$(call SetExecutableOrigin,/../lib), \
+      LDFLAGS_bsd := $$(call SetExecutableOrigin,/../lib), \
       LDFLAGS_macosx := $$(call SetExecutableOrigin,/../lib), \
       LDFLAGS_FILTER_OUT := $$($1_LDFLAGS_FILTER_OUT), \
       JDK_LIBS := $$($1_JDK_LIBS), \

make/common/native/Link.gmk

@@ -185,7 +185,7 @@ define CreateDynamicLibraryOrExecutable
 	        $$($1_SYSROOT_LDFLAGS) -o $$($1_TARGET) $$($1_LD_OBJ_ARG) \
 	        $$($1_LIBS) $$($1_EXTRA_LIBS))
         ifeq ($$($1_CREATE_DEBUGINFO), true)
-          ifeq ($(call isTargetOs, linux), true)
+          ifeq ($(call isTargetOs, linux bsd), true)
             # This cannot be run separately since it updates the original target
             # file.
 	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_create_debuginfo, \
@@ -206,14 +206,17 @@ define CreateDynamicLibraryOrExecutable
 	      $$($1_STRIP) $$($1_STRIPFLAGS) $$($1_TARGET))
         endif
         ifeq ($$($1_CREATE_DEBUGINFO), true)
-          ifeq ($(call isTargetOs, linux), true)
+          ifeq ($(call isTargetOs, linux bsd), true)
             # Run this after strip is called, since strip can sometimes mangle
             # the embedded debuglink, which we want to avoid.
 	    $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_add_debuginfo_link, \
 	        $(CD) $$($1_SYMBOLS_DIR) && \
 	            $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET))
           endif
         endif
+        ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
+          /usr/sbin/paxctl +m $$@
+        endif
         ifneq ($(MACOSX_CODESIGN_MODE), disabled)
           # Remove signature explicitly first to avoid warnings if the linker
           # added a default adhoc signature.

make/devkit/createAutoconfBundle.sh

@@ -51,6 +51,9 @@ case `uname -s` in
     Linux)
         os=linux
         ;;
+    *BSD)
+        os=bsd
+        ;;
     CYGWIN*)
         os=cygwin
         ;;

make/devkit/createTidyBundle.sh

@@ -55,7 +55,7 @@ mkdir -p "$SRC_DIR/$BUILD_DIR"
 cd "$SRC_DIR/$BUILD_DIR"
 
 case $OS_NAME in
-  Linux|Darwin)
+  Linux|Darwin|*BSD)
     echo "Building Tidy HTML5 for Unix-like platform ($OS_NAME)..."
 
     CMAKE_ARCH_OPTIONS=""

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -45,6 +45,8 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   else ifeq ($(call isBuildOs, windows), true)
     ADLC_CFLAGS := -nologo -EHsc
     ADLC_CFLAGS_WARNINGS := -W3 -D_CRT_SECURE_NO_WARNINGS
+  else ifeq ($(call isBuildOs, bsd), true)
+    ADLC_CFLAGS := -fno-exceptions -D_ALLBSD_SOURCE=1 -D_BSDONLY_SOURCE
   endif
 
   # Set the C++ standard
@@ -106,6 +108,8 @@ ifeq ($(call check-jvm-feature, compiler2), true)
     ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
       ADLCFLAGS += -DR18_RESERVED
     endif
+  else ifeq ($(call isTargetOs, bsd), true)
+    ADLCFLAGS += -D_ALLBSD_SOURCE=1 -D_BSDONLY_SOURCE
   else ifeq ($(call isTargetOs, windows), true)
     ADLCFLAGS += -D_WIN64=1
     ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)

make/hotspot/gensrc/GensrcDtrace.gmk

@@ -32,7 +32,7 @@ ifeq ($(INCLUDE), true)
 
 ifeq ($(call check-jvm-feature, dtrace), true)
 
-  ifeq ($(call isTargetOs, macosx), true)
+  ifeq ($(call isTargetOs, macosx bsd), true)
     DTRACE_CPP_FLAGS := -D_LP64 -x c
   else ifeq ($(call isTargetOs, linux), true)
     DTRACE_CPP_FLAGS := -x c

make/hotspot/lib/CompileJvm.gmk

@@ -167,7 +167,7 @@ ifeq ($(call isTargetOs, windows), true)
   JVM_LDFLAGS += -def:$(WIN_EXPORT_FILE)
 endif
 
-ifeq ($(call isTargetOs, linux), true)
+ifeq ($(call isTargetOs, linux bsd), true)
   HOTSPOT_VERSION_SCRIPT := $(TOPDIR)/make/data/hotspot-symbols/version-script-$(TOOLCHAIN_TYPE).txt
 
   JVM_LDFLAGS += -Wl,-version-script=$(HOTSPOT_VERSION_SCRIPT)
@@ -222,6 +222,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     DISABLED_WARNINGS_clang_g1YoungGCPostEvacuateTasks.cpp := delete-abstract-non-virtual-dtor, \
     DISABLED_WARNINGS_clang_management.cpp := missing-field-initializers, \
     DISABLED_WARNINGS_clang_notificationThread.cpp := bitwise-instead-of-logical, \
+    DISABLED_WARNINGS_clang_os_bsd_aarch64.cpp := format-nonliteral, \
     DISABLED_WARNINGS_clang_os_posix.cpp := mismatched-tags missing-field-initializers, \
     DISABLED_WARNINGS_clang_aix_os_posix.cpp := format-nonliteral, \
     DISABLED_WARNINGS_clang_postaloc.cpp := tautological-undefined-compare, \

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -82,6 +82,7 @@ ifeq ($(call isTargetOs, linux), true)
   endif
 
 else ifeq ($(call isTargetOs, macosx), true)
+  JVM_EXCLUDE_FILES += decoder_bsd.cpp
   # The copied fdlibm routines in these files must not be optimized
   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
@@ -147,6 +148,65 @@ else ifeq ($(call isTargetOs, windows), true)
   # Workaround for jvmciCompilerToVM.cpp long compilation time
   BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
 
+else ifeq ($(call isTargetOs, bsd), true)
+  JVM_EXCLUDE_FILES += decoder_mach0.cpp
+  BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+
+  BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
+  ifneq ($(DEBUG_LEVEL), slowdebug)
+    BUILD_LIBJVM_unsafe.cpp_CXXFLAGS := -O1
+  endif
+
+  ifeq ($(TOOLCHAIN_TYPE), gcc)
+    BUILD_LIBJVM_unsafe.cpp_CXXFLAGS += -Wno-maybe-uninitialized
+  endif
+
+  ifeq ($(TOOLCHAIN_TYPE), clang)
+    ifeq ($(call isTargetCpu, x86), true)
+      ifneq ($(DEBUG_LEVEL), slowdebug)
+        # hotspot/jtreg/compiler/c2/Test8062950.java test fails on x86
+        # with clang when parse2.cpp is optimized above -O1
+        BUILD_LIBJVM_parse2.cpp_CXXFLAGS := -O1
+      endif
+    endif
+
+    # The following files are compiled at various optimization
+    # levels due to optimization issues encountered at the
+    # default level. The Clang compiler issues a compile
+    # time error if there is an optimization level specification
+    # skew between the PCH file and the C++ file.  Especially if the
+    # PCH file is compiled at a higher optimization level than
+    # the C++ file.  One solution might be to prepare extra optimization
+    # level specific PCH files for the opt build and use them here, but
+    # it's probably not worth the effort as long as only a few files
+    # need this special handling.
+    JVM_PRECOMPILED_HEADER_EXCLUDE := \
+        sharedRuntimeTrig.cpp \
+        sharedRuntimeTrans.cpp \
+        loopTransform.cpp \
+        unsafe.cpp \
+        parse2.cpp \
+        #
+
+    ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+      JVM_PRECOMPILED_HEADER_EXCLUDE += \
+          memnode.cpp
+          #
+      BUILD_LIBJVM_memnode.cpp_CXXFLAGS := -O0
+    endif
+
+    # retguard interferes with these files leading to SIGTRAP
+    ifeq ($(call isTargetOsEnv, bsd.openbsd), true)
+      JVM_PRECOMPILED_HEADER_EXCLUDE += \
+          c1_Runtime1.cpp \
+          sharedRuntime.cpp \
+          #
+      BUILD_LIBJVM_c1_Runtime1.cpp_CXXFLAGS := -fno-ret-protector
+      BUILD_LIBJVM_sharedRuntime.cpp_CXXFLAGS := -fno-ret-protector
+    endif
+  endif
+
 endif
 
 ################################################################################

make/modules/java.base/Java.gmk

@@ -45,7 +45,7 @@ EXCLUDE_FILES += \
 # data files and shouldn't go in the product
 EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
 
-ifeq ($(call isTargetOs, macosx aix), false)
+ifeq ($(call isTargetOs, macosx aix bsd), false)
   EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
 endif
 

make/modules/java.base/Launcher.gmk

@@ -77,6 +77,7 @@ ifeq ($(call isTargetOs, linux), true)
       OPTIMIZATION := LOW, \
       EXTRA_HEADER_DIRS := libjli, \
       CFLAGS_linux := -fPIC, \
+      CFLAGS_bsd := -fPIC, \
       LD_SET_ORIGIN := false, \
       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
   ))

make/modules/java.base/Lib.gmk

@@ -57,6 +57,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
         -delayload:winhttp.dll, \
     JDK_LIBS := libjava libjvm, \
     LIBS_linux := $(LIBDL), \
+    LIBS_bsd := $(LIBPTHREAD), \
     LIBS_aix := $(LIBDL), \
     LIBS_windows := advapi32.lib delayimp.lib iphlpapi.lib secur32.lib \
         winhttp.lib ws2_32.lib, \
@@ -74,6 +75,7 @@ TARGETS += $(BUILD_LIBNET)
 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     NAME := nio, \
     OPTIMIZATION := HIGH, \
+    CFLAGS_bsd := -D_WITH_GETLINE, \
     EXTRA_HEADER_DIRS := \
         libnio/ch \
         libnio/fs \
@@ -82,6 +84,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     DISABLED_WARNINGS_clang_UnixNativeDispatcher.c := unused-variable, \
     JDK_LIBS := libjava libnet, \
     LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
+    LIBS_bsd := $(LIBPTHREAD), \
     LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
         -framework CoreFoundation \
@@ -156,16 +159,24 @@ endif
 ## Build libsyslookup
 ## The LIBDL dependency on Linux is needed to dynamically access libdl symbols,
 ## which may be needed as part of resolving some standard symbols
+## The BSDLIBC dependency on OpenBSD is needed to access libc symbols. On
+## OpenBSD libc is not added by default to shared libraries.
 ################################################################################
 
+ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.openbsd)
+  BSDLIBC= -lc
+endif
+
 $(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
     NAME := syslookup, \
     EXTRA_HEADER_DIRS := java.base:libjava, \
     LD_SET_ORIGIN := false, \
     LDFLAGS_linux := -Wl$(COMMA)--no-as-needed, \
+    LDFLAGS_bsd := -Wl$(COMMA)--no-as-needed, \
     LDFLAGS_aix := -brtl -bexpfull, \
     LIBS_linux := $(LIBDL) $(LIBM), \
     LIBS_aix := -ldecNumber $(LIBM), \
+    LIBS_bsd := $(LIBDL) $(LIBM) $(BSDLIBC), \
 ))
 
 TARGETS += $(BUILD_LIBSYSLOOKUP)

make/modules/java.base/lib/CoreLibraries.gmk

@@ -69,6 +69,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
         -framework Foundation \
         -framework SystemConfiguration, \
     LIBS_windows := advapi32.lib ole32.lib shell32.lib version.lib, \
+    LIBS_bsd := $(LIBDL), \
 ))
 
 TARGETS += $(BUILD_LIBJAVA)
@@ -177,6 +178,12 @@ ifeq ($(call isTargetOs, aix), true)
   LIBJLI_STATIC_EXCLUDE_OBJS += java_md_aix.o
 endif
 
+ifeq ($(call isTargetOsEnv, bsd.openbsd), true)
+  # OpenBSD requires a static libjli because the runtime linker doesn't fully
+  # support $ORIGIN in '-rpath'
+  BUILD_LIBJLI_TYPE := STATIC_LIBRARY
+endif
+
 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     NAME := jli, \
     TYPE := $(BUILD_LIBJLI_TYPE), \
@@ -191,6 +198,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     DISABLED_WARNINGS_clang_java_md_macosx.m := unused-variable, \
     LIBS_unix := $(LIBZ_LIBS), \
     LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
+    LIBS_bsd := $(LIBPTHREAD),\
     LIBS_macosx := \
         -framework ApplicationServices \
         -framework Cocoa \

make/modules/java.desktop/Gensrc.gmk

@@ -31,7 +31,7 @@ ifeq ($(call isTargetOs, windows), false)
   include gensrc/GensrcIcons.gmk
 endif
 
-ifeq ($(call isTargetOs, linux aix), true)
+ifeq ($(call isTargetOs, linux aix bsd), true)
   include gensrc/GensrcX11Wrappers.gmk
 endif
 

make/modules/java.desktop/Lib.gmk

@@ -38,6 +38,7 @@ include lib/AwtLibraries.gmk
 include lib/ClientLibraries.gmk
 
 ifeq ($(call isTargetOs, aix), false)
+ifneq ($(OPENJDK_TARGET_OS_ENV), bsd.openbsd)
   ##############################################################################
   # Build libjsound
   ##############################################################################
@@ -51,11 +52,22 @@ ifeq ($(call isTargetOs, aix), false)
       -DUSE_PLATFORM_MIDI_IN=TRUE \
       #
 
+  ifeq ($(call isTargetOs, bsd), false)
+    LIBJSOUND_CFLAGS += \
+        -DUSE_PLATFORM_MIDI_OUT=TRUE \
+        -DUSE_PLATFORM_MIDI_IN=TRUE \
+        #
+  endif
+
   LIBJSOUND_LINK_TYPE := C
   ifeq ($(call isTargetOs, macosx), true)
     LIBJSOUND_LINK_TYPE := C++
   endif
 
+  ifeq ($(call isTargetOs, bsd), true)
+    LIBJSOUND_CFLAGS += $(ICONV_CFLAGS)
+  endif
+
   $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
       NAME := jsound, \
       LINK_TYPE := $(LIBJSOUND_LINK_TYPE), \
@@ -68,7 +80,9 @@ ifeq ($(call isTargetOs, aix), false)
       DISABLED_WARNINGS_clang_PLATFORM_API_MacOSX_MidiUtils.c := \
           unused-but-set-variable, \
       DISABLED_WARNINGS_clang_DirectAudioDevice.c := unused-function, \
+      LDFLAGS_bsd := $(ICONV_LDFLAGS), \
       LIBS_linux := $(ALSA_LIBS), \
+      LIBS_bsd := $(ALSA_LIBS), \
       LIBS_macosx := \
           -framework AudioToolbox \
           -framework AudioUnit \
@@ -81,6 +95,7 @@ ifeq ($(call isTargetOs, aix), false)
 
   TARGETS += $(BUILD_LIBJSOUND)
 endif
+endif
 
 ifeq ($(call isTargetOs, macosx), true)
   ##############################################################################