From 2db573aa4fc51d569554fc11afc76bc922bddb34 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Sat, 11 Jun 2022 23:24:21 +0100
Subject: [PATCH] Build the systemconf library on all platforms, simply
 returning JNI_FALSE if !LINUX

---
 make/modules/java.base/Lib.gmk                | 22 +++++++++----------
 .../native/libsystemconf/systemconf.c         | 12 ++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)
 rename src/java.base/{linux => share}/native/libsystemconf/systemconf.c (97%)

diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index cb7a56852f744..c8bc5bde1e139 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -178,19 +178,17 @@ ifeq ($(USE_SYSCONF_NSS), true)
   LIBSYSTEMCONF_CXXFLAGS += $(NSS_CFLAGS) -DSYSCONF_NSS
 endif
 
-ifeq ($(OPENJDK_BUILD_OS), linux)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSYSTEMCONF, \
-      NAME := systemconf, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(LIBSYSTEMCONF_CFLAGS), \
-      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSYSTEMCONF_CXXFLAGS), \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS_unix := $(LIBDL) $(NSS_LIBS), \
-  ))
+$(eval $(call SetupJdkLibrary, BUILD_LIBSYSTEMCONF, \
+    NAME := systemconf, \
+    OPTIMIZATION := LOW, \
+    CFLAGS := $(CFLAGS_JDKLIB) $(LIBSYSTEMCONF_CFLAGS), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSYSTEMCONF_CXXFLAGS), \
+    LDFLAGS := $(LDFLAGS_JDKLIB) \
+        $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LIBS_unix := $(LIBDL) $(NSS_LIBS), \
+))
 
-  TARGETS += $(BUILD_LIBSYSTEMCONF)
-endif
+TARGETS += $(BUILD_LIBSYSTEMCONF)
 
 ################################################################################
 # Create the symbols file for static builds.
diff --git a/src/java.base/linux/native/libsystemconf/systemconf.c b/src/java.base/share/native/libsystemconf/systemconf.c
similarity index 97%
rename from src/java.base/linux/native/libsystemconf/systemconf.c
rename to src/java.base/share/native/libsystemconf/systemconf.c
index 8dcb7d9073f45..ddf9befe5bcce 100644
--- a/src/java.base/linux/native/libsystemconf/systemconf.c
+++ b/src/java.base/share/native/libsystemconf/systemconf.c
@@ -28,6 +28,8 @@
 #include "jvm_md.h"
 #include <stdio.h>
 
+#ifdef LINUX
+
 #ifdef SYSCONF_NSS
 #include <nss3/pk11pub.h>
 #else
@@ -222,3 +224,13 @@ JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEn
       return (fips_enabled == '1' ? JNI_TRUE : JNI_FALSE);
     }
 }
+
+#else // !LINUX
+
+JNIEXPORT jboolean JNICALL Java_java_security_SystemConfigurator_getSystemFIPSEnabled
+  (JNIEnv *env, jclass cls)
+{
+    return JNI_FALSE;
+}
+
+#endif