5 files changed, 70 insertions, 9 deletions

diff --git a/lib/libomp/kmp_config.h b/lib/libomp/kmp_config.h
index fd25b7404178..7d11e27cc4b1 100644
--- a/lib/libomp/kmp_config.h
+++ b/lib/libomp/kmp_config.h
@@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
  * kmp_config.h -- Feature macros
  */
@@ -51,7 +50,11 @@
 #define OMP_PROFILING_SUPPORT LIBOMP_PROFILING_SUPPORT
 #define LIBOMP_OMPT_OPTIONAL 1
 #define OMPT_OPTIONAL LIBOMP_OMPT_OPTIONAL
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_USE_ADAPTIVE_LOCKS 1
+#else
+#define LIBOMP_USE_ADAPTIVE_LOCKS 0
+#endif // } FreeBSD customization
 #define KMP_USE_ADAPTIVE_LOCKS LIBOMP_USE_ADAPTIVE_LOCKS
 #define KMP_DEBUG_ADAPTIVE_LOCKS 0
 #define LIBOMP_USE_INTERNODE_ALIGNMENT 0
@@ -65,29 +68,73 @@
 #define KMP_USE_HWLOC LIBOMP_USE_HWLOC
 #define LIBOMP_ENABLE_SHARED 1
 #define KMP_DYNAMIC_LIB LIBOMP_ENABLE_SHARED
+#if KMP_ARCH_X86 // FreeBSD customization {
+#define KMP_ARCH_STR "IA-32"
+#elif KMP_ARCH_X86_64
 #define KMP_ARCH_STR "Intel(R) 64"
+#elif KMP_ARCH_AARCH64
+#define KMP_ARCH_STR "AARCH64"
+#elif KMP_ARCH_PPC64
+#define KMP_ARCH_STR "PPC64BE"
+#elif KMP_ARCH_MIPS
+#define KMP_ARCH_STR "MIPS"
+#elif KMP_ARCH_MIPS64
+#define KMP_ARCH_STR "MIPS64"
+#elif KMP_ARCH_RISCV64
+#define KMP_ARCH_STR "RISCV64"
+#else
+#error Unknown KMP_ARCH value
+#endif // } FreeBSD customization
 #define KMP_LIBRARY_FILE "libomp.so"
 #define KMP_VERSION_MAJOR 5
 #define KMP_VERSION_MINOR 0
 #define MSVC 0
 #define KMP_MSVC_COMPAT MSVC
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_WAITPKG_INTRINSICS 1
+#else
+#define LIBOMP_HAVE_WAITPKG_INTRINSICS 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_WAITPKG_INTRINSICS LIBOMP_HAVE_WAITPKG_INTRINSICS
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_RTM_INTRINSICS 1
+#else
+#define LIBOMP_HAVE_RTM_INTRINSICS 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_RTM_INTRINSICS LIBOMP_HAVE_RTM_INTRINSICS
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_IMMINTRIN_H 1
+#else
+#define LIBOMP_HAVE_IMMINTRIN_H 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_IMMINTRIN_H LIBOMP_HAVE_IMMINTRIN_H
 #define LIBOMP_HAVE_INTRIN_H 0
 #define KMP_HAVE_INTRIN_H LIBOMP_HAVE_INTRIN_H
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_ATTRIBUTE_WAITPKG 1
+#else
+#define LIBOMP_HAVE_ATTRIBUTE_WAITPKG 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_ATTRIBUTE_WAITPKG LIBOMP_HAVE_ATTRIBUTE_WAITPKG
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_ATTRIBUTE_RTM 1
+#else
+#define LIBOMP_HAVE_ATTRIBUTE_RTM 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_ATTRIBUTE_RTM LIBOMP_HAVE_ATTRIBUTE_RTM
 #define LIBOMP_ARCH_AARCH64_A64FX 0
 #define KMP_ARCH_AARCH64_A64FX LIBOMP_ARCH_AARCH64_A64FX
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE_XMMINTRIN_H 1
+#else
+#define LIBOMP_HAVE_XMMINTRIN_H 0
+#endif // } FreeBSD customization
 #define KMP_HAVE_XMMINTRIN_H LIBOMP_HAVE_XMMINTRIN_H
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64 // FreeBSD customization {
 #define LIBOMP_HAVE__MM_MALLOC 1
+#else
+#define LIBOMP_HAVE__MM_MALLOC 0
+#endif // } FreeBSD customization
 #define KMP_HAVE__MM_MALLOC LIBOMP_HAVE__MM_MALLOC
 #define LIBOMP_HAVE_ALIGNED_ALLOC 1
 #define KMP_HAVE_ALIGNED_ALLOC LIBOMP_HAVE_ALIGNED_ALLOC
diff --git a/lib/libomp/kmp_i18n_default.inc b/lib/libomp/kmp_i18n_default.inc
index f10caed57de6..5c59f8b7778c 100644
--- a/lib/libomp/kmp_i18n_default.inc
+++ b/lib/libomp/kmp_i18n_default.inc
@@ -1,6 +1,5 @@
-// $FreeBSD$
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Mon Nov 22 22:46:03 2021. //
+// The file was generated from en_US.txt by message-converter.pl on Sat Feb  5 21:17:04 2022. //
 
 static char const *
 __kmp_i18n_default_meta[] =
@@ -310,6 +309,7 @@ __kmp_i18n_default_messages[] =
         "%1$s: %2$s (%3$d total cores)",
         "%1$s: granularity setting: %2$s does not exist in topology.  Using granularity=%3$s instead.",
         "%1$s: hybrid core type detected: %2$d %3$s cores.",
+        "%1$s:   %2$d with core efficiency %3$d.",
         "%1$s must be bound to a work-sharing or work-queuing construct with an \"ordered\" clause",
         "Detected end of %1$s without first executing a corresponding beginning.",
         "Iteration range too large in %1$s.",
@@ -407,6 +407,13 @@ __kmp_i18n_default_messages[] =
         "%1$s: topology layer \"%2$s\" is equivalent to \"%3$s\".",
         "%1$s: granularity=%2$s is too coarse, setting granularity=group.",
         "%1$s: \"%2$s\" value is deprecated. Please use \"%3$s\" instead.",
+        "num_teams value must be positive, it is %1$d, using %2$d instead.",
+        "KMP_HW_SUBSET ignored: %1$s, %2$s: attributes are ambiguous, please only specify one.",
+        "KMP_HW_SUBSET ignored: %1$s: attribute specified more than once.",
+        "KMP_HW_SUBSET ignored: %1$s: attribute value %2$s is invalid.",
+        "KMP_HW_SUBSET ignored: all hardware resources would be filtered, please reduce the filter.",
+        "KMP_HW_SUBSET ignored: Too many attributes specified. This machine is not a hybrid architecutre.",
+        "KMP_HW_SUBSET: ignoring %1$s attribute. This machine is not a hybrid architecutre.",
         NULL
     };
 
@@ -442,6 +449,7 @@ __kmp_i18n_default_hints[] =
         "System error #193 is \"Bad format of EXE or DLL file\". Usually it means the file is found, but it is corrupted or a file for another architecture. Check whether \"%1$s\" is a file for %2$s architecture.",
         "System-related limit on the number of threads.",
         "Try setting new bounds (preferably less than or equal to %1$d) for num_teams clause.",
+        "Valid values are from %1$d to %2$d.",
         NULL
     };
 
@@ -458,8 +466,8 @@ __kmp_i18n_sections[] =
         { 5, __kmp_i18n_default_meta },
         { 79, __kmp_i18n_default_strings },
         { 6, __kmp_i18n_default_formats },
-        { 290, __kmp_i18n_default_messages },
-        { 28, __kmp_i18n_default_hints },
+        { 298, __kmp_i18n_default_messages },
+        { 29, __kmp_i18n_default_hints },
         { 0, NULL }
     };
 
diff --git a/lib/libomp/kmp_i18n_id.inc b/lib/libomp/kmp_i18n_id.inc
index 4ef2ea7a7c41..46127e4fef8f 100644
--- a/lib/libomp/kmp_i18n_id.inc
+++ b/lib/libomp/kmp_i18n_id.inc
@@ -1,6 +1,5 @@
-// $FreeBSD$
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Mon Nov 22 22:46:03 2021. //
+// The file was generated from en_US.txt by message-converter.pl on Sat Feb  5 21:17:04 2022. //
 
 enum kmp_i18n_id {
 
@@ -304,6 +303,7 @@ enum kmp_i18n_id {
     kmp_i18n_msg_TopologyGeneric,
     kmp_i18n_msg_AffGranularityBad,
     kmp_i18n_msg_TopologyHybrid,
+    kmp_i18n_msg_TopologyHybridCoreEff,
     kmp_i18n_msg_CnsBoundToWorksharing,
     kmp_i18n_msg_CnsDetectedEnd,
     kmp_i18n_msg_CnsIterationRangeTooLarge,
@@ -401,6 +401,13 @@ enum kmp_i18n_id {
     kmp_i18n_msg_AffEqualTopologyTypes,
     kmp_i18n_msg_AffGranTooCoarseProcGroup,
     kmp_i18n_msg_StgDeprecatedValue,
+    kmp_i18n_msg_NumTeamsNotPositive,
+    kmp_i18n_msg_AffHWSubsetIncompat,
+    kmp_i18n_msg_AffHWSubsetAttrRepeat,
+    kmp_i18n_msg_AffHWSubsetAttrInvalid,
+    kmp_i18n_msg_AffHWSubsetAllFiltered,
+    kmp_i18n_msg_AffHWSubsetAttrsNonHybrid,
+    kmp_i18n_msg_AffHWSubsetIgnoringAttr,
     kmp_i18n_msg_last,
 
     // Set #5, hints.
@@ -433,6 +440,7 @@ enum kmp_i18n_id {
     kmp_i18n_hnt_BadExeFormat,
     kmp_i18n_hnt_SystemLimitOnThreads,
     kmp_i18n_hnt_SetNewBound,
+    kmp_i18n_hnt_ValidValuesRange,
     kmp_i18n_hnt_last,
 
     kmp_i18n_xxx_lastest
diff --git a/lib/libomp/omp-tools.h b/lib/libomp/omp-tools.h
index 1749be7e0508..5092174d66ef 100644
--- a/lib/libomp/omp-tools.h
+++ b/lib/libomp/omp-tools.h
@@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
  * include/omp-tools.h.var
  */
diff --git a/lib/libomp/omp.h b/lib/libomp/omp.h
index f36a6d6c7de0..64bfae3f9fdc 100644
--- a/lib/libomp/omp.h
+++ b/lib/libomp/omp.h
@@ -1,4 +1,3 @@
-// $FreeBSD$
 /*
  * include/omp.h.var
  */