From 401337cbddf2a2a237ef073bf53fd35551ab67cb Mon Sep 17 00:00:00 2001
From: Tao Liu <tao.liu@ibm.com>
Date: Tue, 14 Nov 2023 13:47:22 -0500
Subject: [PATCH] update

---
 closed/custom/modules/java.base/Copy.gmk                       | 2 +-
 .../classes/build/tools/makejavasecurity/MakeJavaSecurity.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/closed/custom/modules/java.base/Copy.gmk b/closed/custom/modules/java.base/Copy.gmk
index 050bfeb3228..074ba383504 100644
--- a/closed/custom/modules/java.base/Copy.gmk
+++ b/closed/custom/modules/java.base/Copy.gmk
@@ -245,7 +245,7 @@ endif # OPENSSL_BUNDLE_LIB_PATH
 ################################################################################
 # Copy the nss.fips.cfg only on x86/p/z linux
 
-ifneq ($(filter linux-x86 linux-ppc64le linux-s390x, $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU)), ) 
+ifneq ($(filter linux-x86_64 linux-ppc64le linux-s390x, $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU)), ) 
   NSS_FIPS_CFG_SRC := $(TOPDIR)/closed/src/java.base/share/conf/security/nss.fips.cfg
   NSS_FIPS_CFG_DST := $(CONF_DST_DIR)/security/nss.fips.cfg
 
diff --git a/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java b/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
index b7f5562a3cf..8adb202f696 100644
--- a/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
+++ b/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
@@ -115,7 +115,10 @@ public static void main(String[] args) throws Exception {
                 }
                 iter.remove();
             } else if (line.startsWith("#if defined ")) {
+                System.out.println("TAO DEBUG - args[2]: " + args[2]);
+                System.out.println("TAO DEBUG - args[3]: " + args[3]);
                 for (String l : line.split("\\|\\|")) {
+                    System.out.println("TAO DEBUG - l: " + l);
                     if (l.indexOf('-') > 0) {
                         mode = l.trim().endsWith(args[2] + "-" + args[3]) ? 1 : 2;
                     } else {