Merge branch 'master' into fix-#8328178

make/modules/jdk.jpackage/Lib.gmk

@@ -59,11 +59,11 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
     DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
     CFLAGS_FILTER_OUT := -MD, \
     CXXFLAGS_FILTER_OUT := -MD, \
-    CXXFLAGS := -MT $(JPACKAGE_APPLAUNCHER_INCLUDES), \
-    CFLAGS := -MT $(JPACKAGE_APPLAUNCHER_INCLUDES), \
+    CXXFLAGS := $(JPACKAGE_APPLAUNCHER_INCLUDES), \
+    CFLAGS := $(JPACKAGE_APPLAUNCHER_INCLUDES), \
     CFLAGS_macosx := -Wno-format-nonliteral, \
-    CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
-    CFLAGS_windows := $(JPACKAGE_CFLAGS_windows), \
+    CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
+    CFLAGS_windows := -MT $(JPACKAGE_CFLAGS_windows), \
     LD_SET_ORIGIN := false, \
     LIBS_macosx := -framework Cocoa  -rpath @executable_path/../Frameworks/ -rpath @executable_path/../PlugIns/, \
     LIBS_windows := user32.lib ole32.lib msi.lib shlwapi.lib \
@@ -137,8 +137,8 @@ ifeq ($(call isTargetOs, windows), true)
       OPTIMIZATION := LOW, \
       SRC := $(JPACKAGE_WIXHELPER_SRC), \
       CXXFLAGS_FILTER_OUT := -MD, \
-      CXXFLAGS := -MT $(addprefix -I, $(JPACKAGE_WIXHELPER_SRC)), \
-      CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
+      CXXFLAGS := $(addprefix -I, $(JPACKAGE_WIXHELPER_SRC)), \
+      CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
       LDFLAGS := $(LDFLAGS_CXX_JDK), \
       LIBS := ole32.lib msi.lib User32.lib shlwapi.lib \
           Shell32.lib, \
@@ -157,8 +157,8 @@ ifeq ($(call isTargetOs, windows), true)
       SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/msiwrapper, \
       SRC := $(JPACKAGE_MSIWRAPPER_SRC), \
       CXXFLAGS_FILTER_OUT := -MD, \
-      CXXFLAGS := -MT $(addprefix -I, $(JPACKAGE_MSIWRAPPER_SRC)), \
-      CXXFLAGS_windows := $(JPACKAGE_CXXFLAGS_windows), \
+      CXXFLAGS := $(addprefix -I, $(JPACKAGE_MSIWRAPPER_SRC)), \
+      CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
       LIBS := ole32.lib msi.lib user32.lib shlwapi.lib Shell32.lib, \
   ))
 

src/hotspot/cpu/s390/s390.ad

@@ -7292,7 +7292,7 @@ instruct negD_reg(regD dst, regD src, flagsReg cr) %{
 
 // Sqrt float precision
 instruct sqrtF_reg(regF dst, regF src) %{
-  match(Set dst (ConvD2F (SqrtD (ConvF2D src))));
+  match(Set dst (SqrtF src));
   // CC remains unchanged.
   ins_cost(ALU_REG_COST);
   size(4);
@@ -7315,7 +7315,7 @@ instruct sqrtD_reg(regD dst, regD src) %{
 %}
 
 instruct sqrtF_mem(regF dst, memoryRX src) %{
-  match(Set dst (ConvD2F (SqrtD (ConvF2D src))));
+  match(Set dst (SqrtF src));
   // CC remains unchanged.
   ins_cost(ALU_MEMORY_COST);
   size(6);

src/hotspot/os/aix/os_aix.cpp

@@ -621,17 +621,6 @@ void os::init_system_properties_values() {
 #undef EXTENSIONS_DIR
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// breakpoint support
-
-void os::breakpoint() {
-  BREAKPOINT;
-}
-
-extern "C" void breakpoint() {
-  // use debugger to set breakpoint here
-}
-
 // retrieve memory information.
 // Returns false if something went wrong;
 // content of pmi undefined in this case.
@@ -797,10 +786,8 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   guarantee(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == 0, "???");
 
   // Make sure we run in 1:1 kernel-user-thread mode.
-  if (os::Aix::on_aix()) {
-    guarantee(pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0, "???");
-    guarantee(pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED) == 0, "???");
-  }
+  guarantee(pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0, "???");
+  guarantee(pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED) == 0, "???");
 
   // Start in suspended state, and in os::thread_start, wake the thread up.
   guarantee(pthread_attr_setsuspendstate_np(&attr, PTHREAD_CREATE_SUSPENDED_NP) == 0, "???");
@@ -1306,22 +1293,10 @@ void os::print_memory_info(outputStream* st) {
 
   os::Aix::meminfo_t mi;
   if (os::Aix::get_meminfo(&mi)) {
-    if (os::Aix::on_aix()) {
-      st->print_cr("physical total : " SIZE_FORMAT, mi.real_total);
-      st->print_cr("physical free  : " SIZE_FORMAT, mi.real_free);
-      st->print_cr("swap total     : " SIZE_FORMAT, mi.pgsp_total);
-      st->print_cr("swap free      : " SIZE_FORMAT, mi.pgsp_free);
-    } else {
-      // PASE - Numbers are result of QWCRSSTS; they mean:
-      // real_total: Sum of all system pools
-      // real_free: always 0
-      // pgsp_total: we take the size of the system ASP
-      // pgsp_free: size of system ASP times percentage of system ASP unused
-      st->print_cr("physical total     : " SIZE_FORMAT, mi.real_total);
-      st->print_cr("system asp total   : " SIZE_FORMAT, mi.pgsp_total);
-      st->print_cr("%% system asp used : %.2f",
-        mi.pgsp_total ? (100.0f * (mi.pgsp_total - mi.pgsp_free) / mi.pgsp_total) : -1.0f);
-    }
+    st->print_cr("physical total : " SIZE_FORMAT, mi.real_total);
+    st->print_cr("physical free  : " SIZE_FORMAT, mi.real_free);
+    st->print_cr("swap total     : " SIZE_FORMAT, mi.pgsp_total);
+    st->print_cr("swap free      : " SIZE_FORMAT, mi.pgsp_free);
   }
   st->cr();
 
@@ -2431,9 +2406,7 @@ void os::init(void) {
   }
 
   // Reset the perfstat information provided by ODM.
-  if (os::Aix::on_aix()) {
-    libperfstat::perfstat_reset();
-  }
+  libperfstat::perfstat_reset();
 
   // Now initialize basic system properties. Note that for some of the values we
   // need libperfstat etc.
@@ -2954,9 +2927,7 @@ void os::Aix::initialize_libo4() {
   }
 }
 
-// AIX: initialize the libperfstat library.
 void os::Aix::initialize_libperfstat() {
-  assert(os::Aix::on_aix(), "AIX only");
   if (!libperfstat::init()) {
     trcVerbose("libperfstat initialization failed.");
     assert(false, "libperfstat initialization failed");

src/hotspot/os/aix/os_aix.hpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,13 +101,6 @@ class os::Aix {
     return _on_pase ? true : false;
   }
 
-  // Function returns true if we run on AIX, false if we run on OS/400
-  // (pase).
-  static bool on_aix() {
-    assert(_on_pase != -1, "not initialized");
-    return _on_pase ? false : true;
-  }
-
   // Get 4 byte AIX kernel version number:
   // highest 2 bytes: Version, Release
   // if available: lowest 2 bytes: Tech Level, Service Pack.
@@ -130,11 +123,6 @@ class os::Aix {
     return on_pase() && os_version_short() <= 0x0504;
   }
 
-  // Convenience method: returns true if running on AIX 5.3 or older.
-  static bool on_aix_53_or_older() {
-    return on_aix() && os_version_short() <= 0x0503;
-  }
-
   // Returns true if we run in SPEC1170 compliant mode (XPG_SUS_ENV=ON).
   static bool xpg_sus_mode() {
     assert(_xpg_sus_mode != -1, "not initialized");

src/hotspot/os/bsd/os_bsd.cpp

@@ -535,17 +535,6 @@ void os::init_system_properties_values() {
 #undef EXTENSIONS_DIR
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// breakpoint support
-
-void os::breakpoint() {
-  BREAKPOINT;
-}
-
-extern "C" void breakpoint() {
-  // use debugger to set breakpoint here
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // create new thread
 

src/hotspot/os/linux/os_linux.cpp

@@ -640,17 +640,6 @@ void os::init_system_properties_values() {
 #undef EXTENSIONS_DIR
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// breakpoint support
-
-void os::breakpoint() {
-  BREAKPOINT;
-}
-
-extern "C" void breakpoint() {
-  // use debugger to set breakpoint here
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // detecting pthread library
 

src/hotspot/os/posix/os_posix.cpp

@@ -187,6 +187,17 @@ size_t os::lasterror(char *buf, size_t len) {
   return n;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// breakpoint support
+
+void os::breakpoint() {
+  BREAKPOINT;
+}
+
+extern "C" void breakpoint() {
+  // use debugger to set breakpoint here
+}
+
 // Return true if user is running as root.
 bool os::have_special_privileges() {
   static bool privileges = (getuid() != geteuid()) || (getgid() != getegid());

src/hotspot/share/gc/parallel/parallelArguments.cpp

@@ -79,13 +79,6 @@ void ParallelArguments::initialize() {
     }
   }
 
-  // Par compact uses lower default values since they are treated as
-  // minimums.  These are different defaults because of the different
-  // interpretation and are not ergonomically set.
-  if (FLAG_IS_DEFAULT(MarkSweepDeadRatio)) {
-    FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1);
-  }
-
   if (FLAG_IS_DEFAULT(ParallelRefProcEnabled) && ParallelGCThreads > 1) {
     FLAG_SET_DEFAULT(ParallelRefProcEnabled, true);
   }

src/hotspot/share/gc/parallel/parallel_globals.hpp

@@ -45,16 +45,6 @@
           "Use maximum compaction in the Parallel Old garbage collector "   \
           "for a system GC")                                                \
                                                                             \
-  product(size_t, ParallelOldDeadWoodLimiterMean, 50,                       \
-          "The mean used by the parallel compact dead wood "                \
-          "limiter (a number between 0-100)")                               \
-          range(0, 100)                                                     \
-                                                                            \
-  product(size_t, ParallelOldDeadWoodLimiterStdDev, 80,                     \
-          "The standard deviation used by the parallel compact dead wood "  \
-          "limiter (a number between 0-100)")                               \
-          range(0, 100)                                                     \
-                                                                            \
   product(bool, PSChunkLargeArrays, true,                                   \
           "Process large arrays in chunks")