From 3bb6a3d2ab96373baa4e18f4e61173f11225fd4e Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 4 Feb 2021 21:00:18 +0000
Subject: [PATCH] 8261109: [macOS] Remove disabled warning for JNF in
 make/autoconf/flags-cflags.m4

Reviewed-by: serb, ihse, erikj
---
 make/autoconf/flags-cflags.m4  | 5 -----
 make/modules/java.base/Lib.gmk | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 7a6dfb74168..29b08cf9837 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -168,11 +168,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
 
       DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
 
-      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-        # missing-method-return-type triggers in JavaNativeFoundation framework
-        DISABLED_WARNINGS="$DISABLED_WARNINGS missing-method-return-type"
-      fi
-
       ;;
 
     xlc)
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 0eff999a011..5658ff342e5 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -96,8 +96,6 @@ $(BUILD_LIBNIO): $(BUILD_LIBNET)
 # Create the macosx security library
 
 ifeq ($(call isTargetOs, macosx), true)
-  # JavaNativeFoundation framework not supported in static builds
-  ifneq ($(STATIC_BUILD), true)
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
         NAME := osxsecurity, \
@@ -120,7 +118,6 @@ ifeq ($(call isTargetOs, macosx), true)
 
     TARGETS += $(BUILD_LIBOSXSECURITY)
 
-  endif
 endif
 
 ################################################################################