Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 1762 insertions, 0 deletions

diff --git a/intl/icu-patches/bug-1198952-workaround-make-3.82-bug.diff b/intl/icu-patches/bug-1198952-workaround-make-3.82-bug.diff
new file mode 100644
index 0000000000..dc4f4e2692
--- /dev/null
+++ b/intl/icu-patches/bug-1198952-workaround-make-3.82-bug.diff
@@ -0,0 +1,42 @@
+diff --git a/intl/icu/source/Makefile.in b/intl/icu/source/Makefile.in
+--- a/intl/icu/source/Makefile.in
++++ b/intl/icu/source/Makefile.in
+@@ -134,32 +134,36 @@ endif
+ 
+ LOCAL_SUBDIRS = $(SUBDIRS)
+ CLEAN_FIRST_SUBDIRS = $(TOOLS)
+ 
+ $(LIBDIR) $(BINDIR):
+ 	-$(MKINSTALLDIRS) $@
+ 
+ ## Recursive targets
++## Strictly speaking, the $(MAKEOVERRIDES) is not necessary when recursing, but
++## there is a bug in GNU make 3.82 that throws away the original overrides in
++## favor of RECURSIVE=YES when the submake in the subdirectory restarts itself
++## after dependency files have been created.
+ all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive check-exhaustive-recursive: $(LIBDIR) $(BINDIR)
+ ifneq ($(NEED_ESCAPING),)
+ 	@echo "building tools/escapesrc (Needed for this platform with NEED_ESCAPING)"
+-	@(cd tools/escapesrc && $(MAKE) RECURSIVE=YES $$local_target) || exit
++	@(cd tools/escapesrc && $(MAKE) $(MAKEOVERRIDES) RECURSIVE=YES $$local_target) || exit
+ endif
+ 	@dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(LOCAL_SUBDIRS)'; for subdir in $$list; do \
+ 	  echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \
+ 	  if test "$$subdir" = "."; then \
+ 	    dot_seen=yes; \
+ 	    local_target="$$target-local"; \
+ 	  else \
+ 	    local_target="$$target"; \
+ 	  fi; \
+-	  (cd $$subdir && $(MAKE) RECURSIVE=YES $$local_target) || exit; \
++	  (cd $$subdir && $(MAKE) $(MAKEOVERRIDES) RECURSIVE=YES $$local_target) || exit; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) "$$target-local" || exit; \
+ 	fi
+ 
+ clean-recursive-with-twist:
+ 	$(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out $(CLEAN_FIRST_SUBDIRS),$(LOCAL_SUBDIRS))'
+ 
diff --git a/intl/icu-patches/bug-1614941-dsb-hsb-dates.diff b/intl/icu-patches/bug-1614941-dsb-hsb-dates.diff
new file mode 100644
index 0000000000..222b1e4678
--- /dev/null
+++ b/intl/icu-patches/bug-1614941-dsb-hsb-dates.diff
@@ -0,0 +1,62 @@
+diff --git a/intl/icu/source/data/locales/dsb.txt b/intl/icu/source/data/locales/dsb.txt
+--- a/intl/icu/source/data/locales/dsb.txt
++++ b/intl/icu/source/data/locales/dsb.txt
+@@ -547,23 +547,27 @@ dsb{
+                     other{"W. 'tyźeń' MMMM"}
+                     two{"W. 'tyźeń' MMMM"}
+                 }
+                 MMMMd{"d. MMMM"}
+                 MMMd{"d. MMM"}
++                MMd{"d. MM"}
++                MMdd{"dd. MM"}
+                 Md{"d.M."}
+                 d{"d."}
+                 h{"h a"}
+                 hm{"h:mm a"}
+                 hms{"h:mm:ss a"}
+                 ms{"mm:ss"}
+                 y{"y"}
+                 yM{"M.y"}
+                 yMEd{"E, d.M.y"}
++                yMM{"MM y"}
+                 yMMM{"MMM y"}
+                 yMMMEd{"E, d. MMM y"}
+                 yMMMM{"LLLL y"}
+                 yMMMd{"d. MMM y"}
++                yMMdd{"dd. MM y"}
+                 yMd{"d.M.y"}
+                 yQQQ{"QQQ y"}
+                 yQQQQ{"QQQQ y"}
+                 yw{
+                     few{"w. 'tyźeń' 'lěta' Y"}
+diff --git a/intl/icu/source/data/locales/hsb.txt b/intl/icu/source/data/locales/hsb.txt
+--- a/intl/icu/source/data/locales/hsb.txt
++++ b/intl/icu/source/data/locales/hsb.txt
+@@ -546,23 +546,27 @@ hsb{
+                     other{"W. 'tydźeń' MMMM"}
+                     two{"W. 'tydźeń' MMMM"}
+                 }
+                 MMMMd{"d. MMMM"}
+                 MMMd{"d. MMM"}
++                MMd{"d. MM"}
++                MMdd{"dd. MM"}
+                 Md{"d.M."}
+                 d{"d."}
+                 h{"h a"}
+                 hm{"h:mm a"}
+                 hms{"h:mm:ss a"}
+                 ms{"mm:ss"}
+                 y{"y"}
+                 yM{"M.y"}
+                 yMEd{"E, d.M.y"}
++                yMM{"MM y"}
+                 yMMM{"MMM y"}
+                 yMMMEd{"E, d. MMM y"}
+                 yMMMM{"LLLL y"}
+                 yMMMd{"d. MMM y"}
++                yMMdd{"dd. MM y"}
+                 yMd{"d.M.y"}
+                 yQQQ{"QQQ y"}
+                 yQQQQ{"QQQQ y"}
+                 yw{
+                     few{"w. 'tydźeń' 'lěta' Y"}
diff --git a/intl/icu-patches/bug-1636984-append-item-dayperiod-fractional-seconds.diff b/intl/icu-patches/bug-1636984-append-item-dayperiod-fractional-seconds.diff
new file mode 100644
index 0000000000..32ba468950
--- /dev/null
+++ b/intl/icu-patches/bug-1636984-append-item-dayperiod-fractional-seconds.diff
@@ -0,0 +1,86 @@
+# Add <appendItem> entries for "DayPeriod" and "FractionalSeconds" to avoid the
+# "├ ┤" parentheses from ICU and instead use the normal "( )" parentheses.
+#
+# CLDR bug: https://unicode-org.atlassian.net/browse/CLDR-13184
+
+diff --git a/intl/icu/source/data/locales/root.txt b/intl/icu/source/data/locales/root.txt
+--- a/intl/icu/source/data/locales/root.txt
++++ b/intl/icu/source/data/locales/root.txt
+@@ -213,17 +213,19 @@ root{
+             }
+             NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+             NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+             appendItems{
+                 Day{"{0} ({2}: {1})"}
++                DayPeriod{"{0} ({2}: {1})"}
+                 Day-Of-Week{"{0} {1}"}
+                 Era{"{1} {0}"}
+                 Hour{"{0} ({2}: {1})"}
+                 Minute{"{0} ({2}: {1})"}
+                 Month{"{0} ({2}: {1})"}
+                 Quarter{"{0} ({2}: {1})"}
+                 Second{"{0} ({2}: {1})"}
++                FractionalSecond{"{0} ({2}: {1})"}
+                 Timezone{"{0} {1}"}
+                 Week{"{0} ({2}: {1})"}
+                 Year{"{1} {0}"}
+             }
+             availableFormats{
+@@ -749,17 +751,19 @@ root{
+             }
+             NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"}
+             NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"}
+             appendItems{
+                 Day{"{0} ({2}: {1})"}
++                DayPeriod{"{0} ({2}: {1})"}
+                 Day-Of-Week{"{0} {1}"}
+                 Era{"{1} {0}"}
+                 Hour{"{0} ({2}: {1})"}
+                 Minute{"{0} ({2}: {1})"}
+                 Month{"{0} ({2}: {1})"}
+                 Quarter{"{0} ({2}: {1})"}
+                 Second{"{0} ({2}: {1})"}
++                FractionalSecond{"{0} ({2}: {1})"}
+                 Timezone{"{0} {1}"}
+                 Week{"{0} ({2}: {1})"}
+                 Year{"{1} {0}"}
+             }
+             availableFormats{
+@@ -1018,17 +1022,19 @@ root{
+                 "{1} {0}",
+                 "{1} {0}",
+             }
+             appendItems{
+                 Day{"{0} ({2}: {1})"}
++                DayPeriod{"{0} ({2}: {1})"}
+                 Day-Of-Week{"{0} {1}"}
+                 Era{"{1} {0}"}
+                 Hour{"{0} ({2}: {1})"}
+                 Minute{"{0} ({2}: {1})"}
+                 Month{"{0} ({2}: {1})"}
+                 Quarter{"{0} ({2}: {1})"}
+                 Second{"{0} ({2}: {1})"}
++                FractionalSecond{"{0} ({2}: {1})"}
+                 Timezone{"{0} {1}"}
+                 Week{"{0} ({2}: {1})"}
+                 Year{"{1} {0}"}
+             }
+             availableFormats{
+diff --git a/intl/icu/source/i18n/dtptngen.cpp b/intl/icu/source/i18n/dtptngen.cpp
+--- a/intl/icu/source/i18n/dtptngen.cpp
++++ b/intl/icu/source/i18n/dtptngen.cpp
+@@ -257,12 +257,12 @@ static const dtTypeElem dtTypes[] = {
+     {0, UDATPG_FIELD_COUNT, 0, 0, 0} , // last row of dtTypes[]
+  };
+ 
+ static const char* const CLDR_FIELD_APPEND[] = {
+     "Era", "Year", "Quarter", "Month", "Week", "*", "Day-Of-Week",
+-    "*", "*", "Day", "*", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J
+-    "Hour", "Minute", "Second", "*", "Timezone"
++    "*", "*", "Day", "DayPeriod", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J
++    "Hour", "Minute", "Second", "FractionalSecond", "Timezone"
+ };
+ 
+ static const char* const CLDR_FIELD_NAME[UDATPG_FIELD_COUNT] = {
+     "era", "year", "quarter", "month", "week", "weekOfMonth", "weekday",
+     "dayOfYear", "weekdayOfMonth", "day", "dayperiod", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J
diff --git a/intl/icu-patches/bug-1636984-display-name-fractional-seconds.diff b/intl/icu-patches/bug-1636984-display-name-fractional-seconds.diff
new file mode 100644
index 0000000000..1e68a20b42
--- /dev/null
+++ b/intl/icu-patches/bug-1636984-display-name-fractional-seconds.diff
@@ -0,0 +1,39 @@
+# Give fractional seconds a more useful display name than "F14".
+#
+# CLDR bug: https://unicode-org.atlassian.net/browse/CLDR-13623
+
+diff --git a/intl/icu/source/data/locales/root.txt b/intl/icu/source/data/locales/root.txt
+--- a/intl/icu/source/data/locales/root.txt
++++ b/intl/icu/source/data/locales/root.txt
+@@ -2527,10 +2527,15 @@ root{
+         zone{
+             dn{"Zone"}
+         }
+         zone-narrow:alias{"/LOCALE/fields/zone-short"}
+         zone-short:alias{"/LOCALE/fields/zone"}
++        fractionalSecond{
++            dn{"Fractional Second"}
++        }
++        fractionalSecond-narrow:alias{"/LOCALE/fields/fractionalSecond-short"}
++        fractionalSecond-short:alias{"/LOCALE/fields/fractionalSecond"}
+     }
+     layout{
+         characters{"left-to-right"}
+         lines{"top-to-bottom"}
+     }
+diff --git a/intl/icu/source/i18n/dtptngen.cpp b/intl/icu/source/i18n/dtptngen.cpp
+--- a/intl/icu/source/i18n/dtptngen.cpp
++++ b/intl/icu/source/i18n/dtptngen.cpp
+@@ -264,11 +264,11 @@ static const char* const CLDR_FIELD_APPE
+ };
+ 
+ static const char* const CLDR_FIELD_NAME[UDATPG_FIELD_COUNT] = {
+     "era", "year", "quarter", "month", "week", "weekOfMonth", "weekday",
+     "dayOfYear", "weekdayOfMonth", "day", "dayperiod", // The UDATPG_x_FIELD constants and these fields have a different order than in ICU4J
+-    "hour", "minute", "second", "*", "zone"
++    "hour", "minute", "second", "fractionalSecond", "zone"
+ };
+ 
+ static const char* const CLDR_FIELD_WIDTH[] = { // [UDATPG_WIDTH_COUNT]
+     "", "-short", "-narrow"
+ };
diff --git a/intl/icu-patches/bug-1706949-wasi-workaround.diff b/intl/icu-patches/bug-1706949-wasi-workaround.diff
new file mode 100644
index 0000000000..6d64fa81c1
--- /dev/null
+++ b/intl/icu-patches/bug-1706949-wasi-workaround.diff
@@ -0,0 +1,769 @@
+# Handle WASI lack of support for <thread> and <atomic>.
+#
+# WASI issue: https://github.com/WebAssembly/wasi-sdk/issues/180
+
+diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h
+index 5b95a68..7097232 100644
+--- a/intl/icu/source/common/putilimp.h
++++ b/intl/icu/source/common/putilimp.h
+@@ -103,6 +103,8 @@ typedef size_t uintptr_t;
+ #endif
+ #elif U_PLATFORM == U_PF_OS400
+    /* not defined */
++#elif defined(__wasi__)
++   /* not defined */
+ #else
+ #   define U_TZSET tzset
+ #endif
+@@ -128,6 +130,8 @@ typedef size_t uintptr_t;
+    /* not defined */
+ #elif U_PLATFORM == U_PF_IPHONE
+    /* not defined */
++#elif defined(__wasi__)
++   /* not defined */
+ #else
+ #   define U_TIMEZONE timezone
+ #endif
+@@ -141,6 +145,8 @@ typedef size_t uintptr_t;
+ #endif
+ #elif U_PLATFORM == U_PF_OS400
+    /* not defined */
++#elif defined(__wasi__)
++   /* not defined */
+ #else
+ #   define U_TZNAME tzname
+ #endif
+diff --git a/intl/icu/source/common/umapfile.h b/intl/icu/source/common/umapfile.h
+index 92bd567..4ed1112 100644
+--- a/intl/icu/source/common/umapfile.h
++++ b/intl/icu/source/common/umapfile.h
+@@ -41,6 +41,8 @@ U_CFUNC void  uprv_unmapFile(UDataMemory *pData);
+ 
+ #if UCONFIG_NO_FILE_IO
+ #   define MAP_IMPLEMENTATION MAP_NONE
++#elif defined(__wasi__)
++#   define MAP_IMPLEMENTATION MAP_STDIO
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
+ #   define MAP_IMPLEMENTATION MAP_WIN32
+ #elif U_HAVE_MMAP || U_PLATFORM == U_PF_OS390
+diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp
+index ccbee99..6c3452c 100644
+--- a/intl/icu/source/common/umutex.cpp
++++ b/intl/icu/source/common/umutex.cpp
+@@ -43,6 +43,7 @@ U_NAMESPACE_BEGIN
+  *
+  *************************************************************************************************/
+ 
++#ifndef __wasi__
+ namespace {
+ std::mutex *initMutex;
+ std::condition_variable *initCondition;
+@@ -55,9 +56,11 @@ std::once_flag initFlag;
+ std::once_flag *pInitFlag = &initFlag;
+ 
+ }  // Anonymous namespace
++#endif
+ 
+ U_CDECL_BEGIN
+ static UBool U_CALLCONV umtx_cleanup() {
++#ifndef __wasi__
+     initMutex->~mutex();
+     initCondition->~condition_variable();
+     UMutex::cleanup();
+@@ -66,17 +69,21 @@ static UBool U_CALLCONV umtx_cleanup() {
+     // Do not use this trick anywhere else in ICU; use umtx_initOnce, not std::call_once().
+     pInitFlag->~once_flag();
+     pInitFlag = new(&initFlag) std::once_flag();
++#endif
+     return true;
+ }
+ 
+ static void U_CALLCONV umtx_init() {
++#ifndef __wasi__
+     initMutex = STATIC_NEW(std::mutex);
+     initCondition = STATIC_NEW(std::condition_variable);
+     ucln_common_registerCleanup(UCLN_COMMON_MUTEX, umtx_cleanup);
++#endif
+ }
+ U_CDECL_END
+ 
+ 
++#ifndef __wasi__
+ std::mutex *UMutex::getMutex() {
+     std::mutex *retPtr = fMutex.load(std::memory_order_acquire);
+     if (retPtr == nullptr) {
+@@ -93,14 +100,17 @@ std::mutex *UMutex::getMutex() {
+     U_ASSERT(retPtr != nullptr);
+     return retPtr;
+ }
++#endif
+ 
+ UMutex *UMutex::gListHead = nullptr;
+ 
+ void UMutex::cleanup() {
+     UMutex *next = nullptr;
+     for (UMutex *m = gListHead; m != nullptr; m = next) {
++#ifndef __wasi__
+         (*m->fMutex).~mutex();
+         m->fMutex = nullptr;
++#endif
+         next = m->fListLink;
+         m->fListLink = nullptr;
+     }
+@@ -110,20 +120,24 @@ void UMutex::cleanup() {
+ 
+ U_CAPI void  U_EXPORT2
+ umtx_lock(UMutex *mutex) {
++#ifndef __wasi__
+     if (mutex == nullptr) {
+         mutex = &globalMutex;
+     }
+     mutex->lock();
++#endif
+ }
+ 
+ 
+ U_CAPI void  U_EXPORT2
+ umtx_unlock(UMutex* mutex)
+ {
++#ifndef __wasi__
+     if (mutex == nullptr) {
+         mutex = &globalMutex;
+     }
+     mutex->unlock();
++#endif
+ }
+ 
+ 
+@@ -143,18 +157,22 @@ umtx_unlock(UMutex* mutex)
+ //
+ U_COMMON_API UBool U_EXPORT2
+ umtx_initImplPreInit(UInitOnce &uio) {
++#ifndef __wasi__
+     std::call_once(*pInitFlag, umtx_init);
+     std::unique_lock<std::mutex> lock(*initMutex);
++#endif
+     if (umtx_loadAcquire(uio.fState) == 0) {
+         umtx_storeRelease(uio.fState, 1);
+         return true;      // Caller will next call the init function.
+     } else {
++#ifndef __wasi__
+         while (umtx_loadAcquire(uio.fState) == 1) {
+             // Another thread is currently running the initialization.
+             // Wait until it completes.
+             initCondition->wait(lock);
+         }
+         U_ASSERT(uio.fState == 2);
++#endif
+         return false;
+     }
+ }
+@@ -168,11 +186,13 @@ umtx_initImplPreInit(UInitOnce &uio) {
+ 
+ U_COMMON_API void U_EXPORT2
+ umtx_initImplPostInit(UInitOnce &uio) {
++#ifndef __wasi__
+     {
+         std::unique_lock<std::mutex> lock(*initMutex);
+         umtx_storeRelease(uio.fState, 2);
+     }
+     initCondition->notify_all();
++#endif
+ }
+ 
+ U_NAMESPACE_END
+diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
+index 8d76b3f..c1a58db 100644
+--- a/intl/icu/source/common/umutex.h
++++ b/intl/icu/source/common/umutex.h
+@@ -20,9 +20,12 @@
+ #ifndef UMUTEX_H
+ #define UMUTEX_H
+ 
++#ifndef __wasi__
+ #include <atomic>
+ #include <condition_variable>
+ #include <mutex>
++#endif
++
+ #include <type_traits>
+ 
+ #include "unicode/utypes.h"
+@@ -37,6 +40,8 @@
+ #error U_USER_ATOMICS and U_USER_MUTEX_H are not supported
+ #endif
+ 
++#ifndef __wasi__
++
+ // Export an explicit template instantiation of std::atomic<int32_t>. 
+ // When building DLLs for Windows this is required as it is used as a data member of the exported SharedObject class.
+ // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples.
+@@ -61,6 +66,7 @@ template struct std::atomic<std::mutex *>;
+ #endif
+ #endif
+ 
++#endif
+ 
+ U_NAMESPACE_BEGIN
+ 
+@@ -70,6 +76,8 @@ U_NAMESPACE_BEGIN
+  *
+  ****************************************************************************/
+ 
++#ifndef __wasi__
++
+ typedef std::atomic<int32_t> u_atomic_int32_t;
+ #define ATOMIC_INT32_T_INITIALIZER(val) ATOMIC_VAR_INIT(val)
+ 
+@@ -89,6 +97,28 @@ inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
+     return var->fetch_sub(1) - 1;
+ }
+ 
++#else
++
++typedef int32_t u_atomic_int32_t;
++#define ATOMIC_INT32_T_INITIALIZER(val) val
++
++inline int32_t umtx_loadAcquire(u_atomic_int32_t &var) {
++    return var;
++}
++
++inline void umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
++    var = val;
++}
++
++inline int32_t umtx_atomic_inc(u_atomic_int32_t *var) {
++    return ++(*var);
++}
++
++inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
++    return --(*var);
++}
++
++#endif
+ 
+ /*************************************************************************************************
+  *
+@@ -231,17 +261,25 @@ class U_COMMON_API UMutex {
+ 
+     // requirements for C++ BasicLockable, allows UMutex to work with std::lock_guard
+     void lock() {
++#ifndef __wasi__
+         std::mutex *m = fMutex.load(std::memory_order_acquire);
+         if (m == nullptr) { m = getMutex(); }
+         m->lock();
++#endif
++    }
++    void unlock() {
++#ifndef __wasi__
++        fMutex.load(std::memory_order_relaxed)->unlock();
++#endif
+     }
+-    void unlock() { fMutex.load(std::memory_order_relaxed)->unlock(); }
+ 
+     static void cleanup();
+ 
+ private:
++#ifndef __wasi__
+     alignas(std::mutex) char fStorage[sizeof(std::mutex)] {};
+     std::atomic<std::mutex *> fMutex { nullptr };
++#endif
+ 
+     /** All initialized UMutexes are kept in a linked list, so that they can be found,
+      * and the underlying std::mutex destructed, by u_cleanup().
+@@ -253,7 +291,9 @@ class U_COMMON_API UMutex {
+      * Initial fast check is inline, in lock().  The returned value may never
+      * be nullptr.
+      */
++#ifndef __wasi__
+     std::mutex *getMutex();
++#endif
+ };
+ 
+ 
+diff --git a/intl/icu/source/common/unifiedcache.cpp b/intl/icu/source/common/unifiedcache.cpp
+--- a/intl/icu/source/common/unifiedcache.cpp
++++ b/intl/icu/source/common/unifiedcache.cpp
+@@ -11,19 +11,23 @@
+ */
+ 
+ #include "unifiedcache.h"
+ 
+ #include <algorithm>      // For std::max()
+-#include <mutex>
++#ifndef __wasi__
++ #include <mutex>
++#endif
+ 
+ #include "uassert.h"
+ #include "uhash.h"
+ #include "ucln_cmn.h"
+ 
+ static icu::UnifiedCache *gCache = nullptr;
++#ifndef __wasi__
+ static std::mutex *gCacheMutex = nullptr;
+ static std::condition_variable *gInProgressValueAddedCond;
++#endif
+ static icu::UInitOnce gCacheInitOnce {};
+ 
+ static const int32_t MAX_EVICT_ITERATIONS = 10;
+ static const int32_t DEFAULT_MAX_UNUSED = 1000;
+ static const int32_t DEFAULT_PERCENTAGE_OF_IN_USE = 100;
+@@ -32,14 +36,16 @@ static const int32_t DEFAULT_PERCENTAGE_OF_IN_USE = 100;
+ U_CDECL_BEGIN
+ static UBool U_CALLCONV unifiedcache_cleanup() {
+     gCacheInitOnce.reset();
+     delete gCache;
+     gCache = nullptr;
++#ifndef __wasi__
+     gCacheMutex->~mutex();
+     gCacheMutex = nullptr;
+     gInProgressValueAddedCond->~condition_variable();
+     gInProgressValueAddedCond = nullptr;
++#endif
+     return true;
+ }
+ U_CDECL_END
+ 
+ 
+@@ -70,12 +76,14 @@ CacheKeyBase::~CacheKeyBase() {
+ static void U_CALLCONV cacheInit(UErrorCode &status) {
+     U_ASSERT(gCache == nullptr);
+     ucln_common_registerCleanup(
+             UCLN_COMMON_UNIFIED_CACHE, unifiedcache_cleanup);
+ 
++#ifndef __wasi__
+     gCacheMutex = STATIC_NEW(std::mutex);
+     gInProgressValueAddedCond = STATIC_NEW(std::condition_variable);
++#endif
+     gCache = new UnifiedCache(status);
+     if (gCache == nullptr) {
+         status = U_MEMORY_ALLOCATION_ERROR;
+     }
+     if (U_FAILURE(status)) {
+@@ -133,41 +141,53 @@ void UnifiedCache::setEvictionPolicy(
+     }
+     if (count < 0 || percentageOfInUseItems < 0) {
+         status = U_ILLEGAL_ARGUMENT_ERROR;
+         return;
+     }
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     fMaxUnused = count;
+     fMaxPercentageOfInUse = percentageOfInUseItems;
+ }
+ 
+ int32_t UnifiedCache::unusedCount() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     return uhash_count(fHashtable) - fNumValuesInUse;
+ }
+ 
+ int64_t UnifiedCache::autoEvictedCount() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     return fAutoEvictedCount;
+ }
+ 
+ int32_t UnifiedCache::keyCount() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     return uhash_count(fHashtable);
+ }
+ 
+ void UnifiedCache::flush() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+ 
+     // Use a loop in case cache items that are flushed held hard references to
+     // other cache items making those additional cache items eligible for
+     // flushing.
+     while (_flush(false));
+ }
+ 
+ void UnifiedCache::handleUnreferencedObject() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     --fNumValuesInUse;
+     _runEvictionSlice();
+ }
+ 
+ #ifdef UNIFIED_CACHE_DEBUG
+@@ -182,11 +202,13 @@ void UnifiedCache::dump() {
+     }
+     cache->dumpContents();
+ }
+ 
+ void UnifiedCache::dumpContents() const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     _dumpContents();
+ }
+ 
+ // Dumps content of cache.
+ // On entry, gCacheMutex must be held.
+@@ -222,11 +244,13 @@ UnifiedCache::~UnifiedCache() {
+     flush();
+     {
+         // Now all that should be left in the cache are entries that refer to
+         // each other and entries with hard references from outside the cache.
+         // Nothing we can do about these so proceed to wipe out the cache.
++#ifndef __wasi__
+         std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+         _flush(true);
+     }
+     uhash_close(fHashtable);
+     fHashtable = nullptr;
+     delete fNoValue;
+@@ -323,11 +347,13 @@ void UnifiedCache::_putNew(
+ 
+ void UnifiedCache::_putIfAbsentAndGet(
+         const CacheKeyBase &key,
+         const SharedObject *&value,
+         UErrorCode &status) const {
++#ifndef __wasi__
+     std::lock_guard<std::mutex> lock(*gCacheMutex);
++#endif
+     const UHashElement *element = uhash_find(fHashtable, &key);
+     if (element != nullptr && !_inProgress(element)) {
+         _fetch(element, value, status);
+         return;
+     }
+@@ -348,18 +374,22 @@ UBool UnifiedCache::_poll(
+         const CacheKeyBase &key,
+         const SharedObject *&value,
+         UErrorCode &status) const {
+     U_ASSERT(value == nullptr);
+     U_ASSERT(status == U_ZERO_ERROR);
++#ifndef __wasi__
+     std::unique_lock<std::mutex> lock(*gCacheMutex);
++#endif
+     const UHashElement *element = uhash_find(fHashtable, &key);
+ 
+     // If the hash table contains an inProgress placeholder entry for this key,
+     // this means that another thread is currently constructing the value object.
+     // Loop, waiting for that construction to complete.
+      while (element != nullptr && _inProgress(element)) {
++#ifndef __wasi__
+          gInProgressValueAddedCond->wait(lock);
++#endif
+          element = uhash_find(fHashtable, &key);
+     }
+ 
+     // If the hash table contains an entry for the key,
+     // fetch out the contents and return them.
+@@ -426,13 +456,15 @@ void UnifiedCache::_put(
+     UHashElement *ptr = const_cast<UHashElement *>(element);
+     ptr->value.pointer = (void *) value;
+     U_ASSERT(oldValue == fNoValue);
+     removeSoftRef(oldValue);
+ 
++#ifndef __wasi__
+     // Tell waiting threads that we replace in-progress status with
+     // an error.
+     gInProgressValueAddedCond->notify_all();
++#endif
+ }
+ 
+ void UnifiedCache::_fetch(
+         const UHashElement *element,
+         const SharedObject *&value,
+diff --git a/intl/icu/source/i18n/decContext.h b/intl/icu/source/i18n/decContext.h
+index 59ab65e..20f3526 100644
+--- a/intl/icu/source/i18n/decContext.h
++++ b/intl/icu/source/i18n/decContext.h
+@@ -61,7 +61,9 @@
+ /* #include <stdint.h>   */         /* C99 standard integers           */
+   #endif
+   #include <stdio.h>               /* for printf, etc.                */
++#ifndef __wasi__
+   #include <signal.h>              /* for traps                       */
++#endif
+ 
+   /* Extended flags setting -- set this to 0 to use only IEEE flags   */
+   #if !defined(DECEXTFLAG)
+diff --git a/intl/icu/source/i18n/decimfmt.cpp b/intl/icu/source/i18n/decimfmt.cpp
+index daa1129..c8f1eda 100644
+--- a/intl/icu/source/i18n/decimfmt.cpp
++++ b/intl/icu/source/i18n/decimfmt.cpp
+@@ -480,8 +480,13 @@ DecimalFormat& DecimalFormat::operator=(const DecimalFormat& rhs) {
+ DecimalFormat::~DecimalFormat() {
+     if (fields == nullptr) { return; }
+ 
++#ifndef __wasi__
+     delete fields->atomicParser.exchange(nullptr);
+     delete fields->atomicCurrencyParser.exchange(nullptr);
++#else
++    delete fields->atomicParser;
++    delete fields->atomicCurrencyParser;
++#endif
+     delete fields;
+ }
+ 
+@@ -1626,8 +1631,13 @@ void DecimalFormat::touch(UErrorCode& status) {
+     setupFastFormat();
+ 
+     // Delete the parsers if they were made previously
++#ifndef __wasi__
+     delete fields->atomicParser.exchange(nullptr);
+     delete fields->atomicCurrencyParser.exchange(nullptr);
++#else
++    delete fields->atomicParser;
++    delete fields->atomicCurrencyParser;
++#endif
+ 
+     // In order for the getters to work, we need to populate some fields in NumberFormat.
+     NumberFormat::setCurrency(fields->exportedProperties.currency.get(status).getISOCurrency(), status);
+@@ -1662,7 +1672,11 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getParser(UErrorCode& sta
+     }
+ 
+     // First try to get the pre-computed parser
++#ifndef __wasi__
+     auto* ptr = fields->atomicParser.load();
++#else
++    auto* ptr = fields->atomicParser;
++#endif
+     if (ptr != nullptr) {
+         return ptr;
+     }
+@@ -1681,6 +1695,7 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getParser(UErrorCode& sta
+     // it is set to what is actually stored in the atomic
+     // if another thread beat us to computing the parser object.
+     auto* nonConstThis = const_cast<DecimalFormat*>(this);
++#ifndef __wasi__
+     if (!nonConstThis->fields->atomicParser.compare_exchange_strong(ptr, temp)) {
+         // Another thread beat us to computing the parser
+         delete temp;
+@@ -1689,13 +1704,21 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getParser(UErrorCode& sta
+         // Our copy of the parser got stored in the atomic
+         return temp;
+     }
++#else
++    nonConstThis->fields->atomicParser = temp;
++    return temp;
++#endif
+ }
+ 
+ const numparse::impl::NumberParserImpl* DecimalFormat::getCurrencyParser(UErrorCode& status) const {
+     if (U_FAILURE(status)) { return nullptr; }
+ 
+     // First try to get the pre-computed parser
++#ifndef __wasi__
+     auto* ptr = fields->atomicCurrencyParser.load();
++#else
++    auto* ptr = fields->atomicCurrencyParser;
++#endif
+     if (ptr != nullptr) {
+         return ptr;
+     }
+@@ -1710,6 +1733,7 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getCurrencyParser(UErrorC
+     // Note: ptr starts as nullptr; during compare_exchange, it is set to what is actually stored in the
+     // atomic if another thread beat us to computing the parser object.
+     auto* nonConstThis = const_cast<DecimalFormat*>(this);
++#ifndef __wasi__
+     if (!nonConstThis->fields->atomicCurrencyParser.compare_exchange_strong(ptr, temp)) {
+         // Another thread beat us to computing the parser
+         delete temp;
+@@ -1718,6 +1742,10 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getCurrencyParser(UErrorC
+         // Our copy of the parser got stored in the atomic
+         return temp;
+     }
++#else
++    nonConstThis->fields->atomicCurrencyParser = temp;
++    return temp;
++#endif
+ }
+ 
+ void
+diff --git a/intl/icu/source/i18n/number_mapper.h b/intl/icu/source/i18n/number_mapper.h
+index 9ecd776..d094289 100644
+--- a/intl/icu/source/i18n/number_mapper.h
++++ b/intl/icu/source/i18n/number_mapper.h
+@@ -7,7 +7,6 @@
+ #ifndef __NUMBER_MAPPER_H__
+ #define __NUMBER_MAPPER_H__
+ 
+-#include <atomic>
+ #include "number_types.h"
+ #include "unicode/currpinf.h"
+ #include "standardplural.h"
+@@ -15,6 +14,10 @@
+ #include "number_currencysymbols.h"
+ #include "numparse_impl.h"
+ 
++#ifndef __wasi__
++#include <atomic>
++#endif
++
+ U_NAMESPACE_BEGIN
+ namespace number {
+ namespace impl {
+@@ -193,10 +196,18 @@ struct DecimalFormatFields : public UMemory {
+     LocalizedNumberFormatter formatter;
+ 
+     /** The lazy-computed parser for .parse() */
++#ifndef __wasi__
+     std::atomic<::icu::numparse::impl::NumberParserImpl*> atomicParser = {};
++#else
++    ::icu::numparse::impl::NumberParserImpl* atomicParser = nullptr;
++#endif
+ 
+     /** The lazy-computed parser for .parseCurrency() */
++#ifndef __wasi__
+     std::atomic<::icu::numparse::impl::NumberParserImpl*> atomicCurrencyParser = {};
++#else
++    ::icu::numparse::impl::NumberParserImpl* atomicCurrencyParser = {};
++#endif
+ 
+     /** Small object ownership warehouse for the formatter and parser */
+     DecimalFormatWarehouse warehouse;
+diff --git a/intl/icu/source/i18n/numrange_fluent.cpp b/intl/icu/source/i18n/numrange_fluent.cpp
+--- a/intl/icu/source/i18n/numrange_fluent.cpp
++++ b/intl/icu/source/i18n/numrange_fluent.cpp
+@@ -238,33 +238,53 @@ LocalizedNumberRangeFormatter::LocalizedNumberRangeFormatter(LocalizedNumberRang
+ 
+ LocalizedNumberRangeFormatter::LocalizedNumberRangeFormatter(NFS<LNF>&& src) noexcept
+         : NFS<LNF>(std::move(src)) {
+     // Steal the compiled formatter
+     LNF&& _src = static_cast<LNF&&>(src);
++#ifndef __wasi__
+     auto* stolen = _src.fAtomicFormatter.exchange(nullptr);
+     delete fAtomicFormatter.exchange(stolen);
++#else
++    delete fAtomicFormatter;
++    fAtomicFormatter = _src.fAtomicFormatter;
++    _src.fAtomicFormatter = nullptr;
++#endif
+ }
+ 
+ LocalizedNumberRangeFormatter& LocalizedNumberRangeFormatter::operator=(const LNF& other) {
+     if (this == &other) { return *this; }  // self-assignment: no-op
+     NFS<LNF>::operator=(static_cast<const NFS<LNF>&>(other));
+     // Do not steal; just clear
++#ifndef __wasi__
+     delete fAtomicFormatter.exchange(nullptr);
++#else
++    delete fAtomicFormatter;
++#endif
+     return *this;
+ }
+ 
+ LocalizedNumberRangeFormatter& LocalizedNumberRangeFormatter::operator=(LNF&& src) noexcept {
+     NFS<LNF>::operator=(static_cast<NFS<LNF>&&>(src));
+     // Steal the compiled formatter
++#ifndef __wasi__
+     auto* stolen = src.fAtomicFormatter.exchange(nullptr);
+     delete fAtomicFormatter.exchange(stolen);
++#else
++    delete fAtomicFormatter;
++    fAtomicFormatter = src.fAtomicFormatter;
++    src.fAtomicFormatter = nullptr;
++#endif
+     return *this;
+ }
+ 
+ 
+ LocalizedNumberRangeFormatter::~LocalizedNumberRangeFormatter() {
++#ifndef __wasi__
+     delete fAtomicFormatter.exchange(nullptr);
++#else
++    delete fAtomicFormatter;
++#endif
+ }
+ 
+ LocalizedNumberRangeFormatter::LocalizedNumberRangeFormatter(const RangeMacroProps& macros, const Locale& locale) {
+     fMacros = macros;
+     fMacros.locale = locale;
+@@ -344,11 +364,15 @@ LocalizedNumberRangeFormatter::getFormatter(UErrorCode& status) const {
+     if (U_FAILURE(status)) {
+         return nullptr;
+     }
+ 
+     // First try to get the pre-computed formatter
++#ifndef __wasi__
+     auto* ptr = fAtomicFormatter.load();
++#else
++    auto* ptr = fAtomicFormatter;
++#endif
+     if (ptr != nullptr) {
+         return ptr;
+     }
+ 
+     // Try computing the formatter on our own
+@@ -364,18 +388,23 @@ LocalizedNumberRangeFormatter::getFormatter(UErrorCode& status) const {
+ 
+     // Note: ptr starts as nullptr; during compare_exchange,
+     // it is set to what is actually stored in the atomic
+     // if another thread beat us to computing the formatter object.
+     auto* nonConstThis = const_cast<LocalizedNumberRangeFormatter*>(this);
++#ifndef __wasi__
+     if (!nonConstThis->fAtomicFormatter.compare_exchange_strong(ptr, temp)) {
+         // Another thread beat us to computing the formatter
+         delete temp;
+         return ptr;
+     } else {
+         // Our copy of the formatter got stored in the atomic
+         return temp;
+     }
++#else
++    nonConstThis->fAtomicFormatter = temp;
++    return temp;
++#endif
+ 
+ }
+ 
+ 
+ #endif /* #if !UCONFIG_NO_FORMATTING */
+diff --git a/intl/icu/source/i18n/unicode/numberrangeformatter.h b/intl/icu/source/i18n/unicode/numberrangeformatter.h
+index b9a4600..0ba2fa0 100644
+--- a/intl/icu/source/i18n/unicode/numberrangeformatter.h
++++ b/intl/icu/source/i18n/unicode/numberrangeformatter.h
+@@ -10,7 +10,6 @@
+ 
+ #if !UCONFIG_NO_FORMATTING
+ 
+-#include <atomic>
+ #include "unicode/appendable.h"
+ #include "unicode/fieldpos.h"
+ #include "unicode/formattedvalue.h"
+@@ -18,6 +17,10 @@
+ #include "unicode/numberformatter.h"
+ #include "unicode/unumberrangeformatter.h"
+ 
++#ifndef __wasi__
++#include <atomic>
++#endif
++
+ /**
+  * \file
+  * \brief C++ API: Library for localized formatting of number, currency, and unit ranges.
+@@ -77,7 +80,9 @@ struct UFormattedNumberRangeImpl;
+ } // namespace icu::number
+ U_NAMESPACE_END
+ 
++#ifndef __wasi__
+ template struct U_I18N_API std::atomic< U_NAMESPACE_QUALIFIER number::impl::NumberRangeFormatterImpl*>;
++#endif
+ 
+ U_NAMESPACE_BEGIN
+ namespace number {  // icu::number
+@@ -546,7 +551,11 @@ class U_I18N_API LocalizedNumberRangeFormatter
+     ~LocalizedNumberRangeFormatter();
+ 
+   private:
++#ifndef __wasi__
+     std::atomic<impl::NumberRangeFormatterImpl*> fAtomicFormatter = {};
++#else
++    impl::NumberRangeFormatterImpl* fAtomicFormatter = nullptr;
++#endif
+ 
+     const impl::NumberRangeFormatterImpl* getFormatter(UErrorCode& stauts) const;
+ 
diff --git a/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff b/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff
new file mode 100644
index 0000000000..e31f02d637
--- /dev/null
+++ b/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff
@@ -0,0 +1,28 @@
+diff --git a/intl/icu/source/i18n/vtzone.cpp b/intl/icu/source/i18n/vtzone.cpp
+--- a/intl/icu/source/i18n/vtzone.cpp
++++ b/intl/icu/source/i18n/vtzone.cpp
+@@ -1735,14 +1735,17 @@ VTimeZone::write(VTZWriter& writer, UErr
+             }
+         }
+     } else {
+-        UnicodeString icutzprop;
+-        UVector customProps(nullptr, uhash_compareUnicodeString, status);
++        UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
+         if (olsonzid.length() > 0 && icutzver.length() > 0) {
+-            icutzprop.append(olsonzid);
+-            icutzprop.append(u'[');
+-            icutzprop.append(icutzver);
+-            icutzprop.append(u']');
+-            customProps.addElement(&icutzprop, status);
++            LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
++            if (U_FAILURE(status)) {
++                return;
++            }
++            icutzprop->append(olsonzid);
++            icutzprop->append(u'[');
++            icutzprop->append(icutzver);
++            icutzprop->append(u']');
++            customProps.adoptElement(icutzprop.orphan(), status);
+         }
+         writeZone(writer, *tz, &customProps, status);
+     }
diff --git a/intl/icu-patches/bug-1814862-ICU-22260.diff b/intl/icu-patches/bug-1814862-ICU-22260.diff
new file mode 100644
index 0000000000..264dda3a31
--- /dev/null
+++ b/intl/icu-patches/bug-1814862-ICU-22260.diff
@@ -0,0 +1,201 @@
+# Support relative date formatting with UCONFIG_NO_BREAK_ITERATION
+#
+# ICU bug: https://unicode-org.atlassian.net/browse/ICU-22260
+
+diff --git a/intl/icu/source/i18n/reldatefmt.cpp b/intl/icu/source/i18n/reldatefmt.cpp
+index 24d22a4b4b..6a0c9e65ef 100644
+--- a/intl/icu/source/i18n/reldatefmt.cpp
++++ b/intl/icu/source/i18n/reldatefmt.cpp
+@@ -12,7 +12,7 @@
+
+ #include "unicode/reldatefmt.h"
+
+-#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION
++#if !UCONFIG_NO_FORMATTING
+
+ #include <cmath>
+ #include <functional>
+@@ -761,6 +761,7 @@ RelativeDateTimeFormatter::RelativeDateTimeFormatter(UErrorCode& status) :
+         fStyle(UDAT_STYLE_LONG),
+         fContext(UDISPCTX_CAPITALIZATION_NONE),
+         fOptBreakIterator(nullptr) {
++    (void)fOptBreakIterator; // suppress unused field warning
+     init(nullptr, nullptr, status);
+ }
+
+@@ -809,11 +810,16 @@ RelativeDateTimeFormatter::RelativeDateTimeFormatter(
+         return;
+     }
+     if (capitalizationContext == UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE) {
++#if !UCONFIG_NO_BREAK_ITERATION
+         BreakIterator *bi = BreakIterator::createSentenceInstance(locale, status);
+         if (U_FAILURE(status)) {
+             return;
+         }
+         init(nfToAdopt, bi, status);
++#else
++        status = U_UNSUPPORTED_ERROR;
++        return;
++#endif // !UCONFIG_NO_BREAK_ITERATION
+     } else {
+         init(nfToAdopt, nullptr, status);
+     }
+@@ -832,9 +838,11 @@ RelativeDateTimeFormatter::RelativeDateTimeFormatter(
+     fCache->addRef();
+     fNumberFormat->addRef();
+     fPluralRules->addRef();
++#if !UCONFIG_NO_BREAK_ITERATION
+     if (fOptBreakIterator != nullptr) {
+       fOptBreakIterator->addRef();
+     }
++#endif // !UCONFIG_NO_BREAK_ITERATION
+ }
+
+ RelativeDateTimeFormatter& RelativeDateTimeFormatter::operator=(
+@@ -843,7 +851,9 @@ RelativeDateTimeFormatter& RelativeDateTimeFormatter::operator=(
+         SharedObject::copyPtr(other.fCache, fCache);
+         SharedObject::copyPtr(other.fNumberFormat, fNumberFormat);
+         SharedObject::copyPtr(other.fPluralRules, fPluralRules);
++#if !UCONFIG_NO_BREAK_ITERATION
+         SharedObject::copyPtr(other.fOptBreakIterator, fOptBreakIterator);
++#endif // !UCONFIG_NO_BREAK_ITERATION
+         fStyle = other.fStyle;
+         fContext = other.fContext;
+         fLocale = other.fLocale;
+@@ -861,9 +871,11 @@ RelativeDateTimeFormatter::~RelativeDateTimeFormatter() {
+     if (fPluralRules != nullptr) {
+         fPluralRules->removeRef();
+     }
++#if !UCONFIG_NO_BREAK_ITERATION
+     if (fOptBreakIterator != nullptr) {
+         fOptBreakIterator->removeRef();
+     }
++#endif // !UCONFIG_NO_BREAK_ITERATION
+ }
+
+ const NumberFormat& RelativeDateTimeFormatter::getNumberFormat() const {
+@@ -1191,6 +1203,7 @@ UnicodeString& RelativeDateTimeFormatter::combineDateAndTime(
+ }
+
+ UnicodeString& RelativeDateTimeFormatter::adjustForContext(UnicodeString &str) const {
++#if !UCONFIG_NO_BREAK_ITERATION
+     if (fOptBreakIterator == nullptr
+         || str.length() == 0 || !u_islower(str.char32At(0))) {
+         return str;
+@@ -1204,25 +1217,36 @@ UnicodeString& RelativeDateTimeFormatter::adjustForContext(UnicodeString &str) c
+             fOptBreakIterator->get(),
+             fLocale,
+             U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT);
++#endif // !UCONFIG_NO_BREAK_ITERATION
+     return str;
+ }
+
+ UBool RelativeDateTimeFormatter::checkNoAdjustForContext(UErrorCode& status) const {
++#if !UCONFIG_NO_BREAK_ITERATION
+     // This is unsupported because it's hard to keep fields in sync with title
+     // casing. The code could be written and tested if there is demand.
+     if (fOptBreakIterator != nullptr) {
+         status = U_UNSUPPORTED_ERROR;
+         return false;
+     }
++#else
++    (void)status; // suppress unused argument warning
++#endif // !UCONFIG_NO_BREAK_ITERATION
+     return true;
+ }
+
+ void RelativeDateTimeFormatter::init(
+         NumberFormat *nfToAdopt,
++#if !UCONFIG_NO_BREAK_ITERATION
+         BreakIterator *biToAdopt,
++#else
++        std::nullptr_t,
++#endif // !UCONFIG_NO_BREAK_ITERATION
+         UErrorCode &status) {
+     LocalPointer<NumberFormat> nf(nfToAdopt);
++#if !UCONFIG_NO_BREAK_ITERATION
+     LocalPointer<BreakIterator> bi(biToAdopt);
++#endif // !UCONFIG_NO_BREAK_ITERATION
+     UnifiedCache::getByLocale(fLocale, fCache, status);
+     if (U_FAILURE(status)) {
+         return;
+@@ -1251,6 +1275,7 @@ void RelativeDateTimeFormatter::init(
+         nf.orphan();
+         SharedObject::copyPtr(shared, fNumberFormat);
+     }
++#if !UCONFIG_NO_BREAK_ITERATION
+     if (bi.isNull()) {
+         SharedObject::clearPtr(fOptBreakIterator);
+     } else {
+@@ -1262,6 +1287,7 @@ void RelativeDateTimeFormatter::init(
+         bi.orphan();
+         SharedObject::copyPtr(shared, fOptBreakIterator);
+     }
++#endif // !UCONFIG_NO_BREAK_ITERATION
+ }
+
+ U_NAMESPACE_END
+diff --git a/intl/icu/source/i18n/unicode/reldatefmt.h b/intl/icu/source/i18n/unicode/reldatefmt.h
+index 4123468c65..5dc4905b12 100644
+--- a/intl/icu/source/i18n/unicode/reldatefmt.h
++++ b/intl/icu/source/i18n/unicode/reldatefmt.h
+@@ -248,8 +248,6 @@ typedef enum UDateDirection {
+ #endif  // U_HIDE_DEPRECATED_API
+ } UDateDirection;
+
+-#if !UCONFIG_NO_BREAK_ITERATION
+-
+ U_NAMESPACE_BEGIN
+
+ class BreakIterator;
+@@ -696,11 +694,19 @@ class U_I18N_API RelativeDateTimeFormatter : public UObject {
+     const SharedPluralRules *fPluralRules;
+     UDateRelativeDateTimeFormatterStyle fStyle;
+     UDisplayContext fContext;
++#if !UCONFIG_NO_BREAK_ITERATION
+     const SharedBreakIterator *fOptBreakIterator;
++#else
++    std::nullptr_t fOptBreakIterator = nullptr;
++#endif // !UCONFIG_NO_BREAK_ITERATION
+     Locale fLocale;
+     void init(
+             NumberFormat *nfToAdopt,
++#if !UCONFIG_NO_BREAK_ITERATION
+             BreakIterator *brkIter,
++#else
++            std::nullptr_t,
++#endif // !UCONFIG_NO_BREAK_ITERATION
+             UErrorCode &status);
+     UnicodeString& adjustForContext(UnicodeString &) const;
+     UBool checkNoAdjustForContext(UErrorCode& status) const;
+@@ -743,7 +749,6 @@ class U_I18N_API RelativeDateTimeFormatter : public UObject {
+
+ U_NAMESPACE_END
+
+-#endif /* !UCONFIG_NO_BREAK_ITERATION */
+ #endif /* !UCONFIG_NO_FORMATTING */
+
+ #endif /* U_SHOW_CPLUSPLUS_API */
+diff --git a/intl/icu/source/i18n/unicode/ureldatefmt.h b/intl/icu/source/i18n/unicode/ureldatefmt.h
+index 3c44890043..0882360d14 100644
+--- a/intl/icu/source/i18n/unicode/ureldatefmt.h
++++ b/intl/icu/source/i18n/unicode/ureldatefmt.h
+@@ -12,7 +12,7 @@
+
+ #include "unicode/utypes.h"
+
+-#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION
++#if !UCONFIG_NO_FORMATTING
+
+ #include "unicode/unum.h"
+ #include "unicode/udisplaycontext.h"
+@@ -505,6 +505,6 @@ ureldatefmt_combineDateAndTime( const URelativeDateTimeFormatter* reldatefmt,
+                     int32_t           resultCapacity,
+                     UErrorCode*       status );
+
+-#endif /* !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION */
++#endif /* !UCONFIG_NO_FORMATTING */
+
+ #endif
+--
+2.34.1
diff --git a/intl/icu-patches/bug-1838173-ICU-22412-start-time-iso8601.diff b/intl/icu-patches/bug-1838173-ICU-22412-start-time-iso8601.diff
new file mode 100644
index 0000000000..3338a72457
--- /dev/null
+++ b/intl/icu-patches/bug-1838173-ICU-22412-start-time-iso8601.diff
@@ -0,0 +1,47 @@
+# Allow to set the Gregorian change date for ISO8601 calendars.
+#
+# ICU bug: https://unicode-org.atlassian.net/browse/ICU-22412
+
+diff --git a/intl/icu/source/i18n/ucal.cpp b/intl/icu/source/i18n/ucal.cpp
+--- a/intl/icu/source/i18n/ucal.cpp
++++ b/intl/icu/source/i18n/ucal.cpp
+@@ -22,10 +22,11 @@
+ #include "unicode/ustring.h"
+ #include "unicode/strenum.h"
+ #include "unicode/localpointer.h"
+ #include "cmemory.h"
+ #include "cstring.h"
++#include "iso8601cal.h"
+ #include "ustrenum.h"
+ #include "uenumimp.h"
+ #include "ulist.h"
+ #include "ulocimp.h"
+ 
+@@ -305,11 +306,12 @@ ucal_setGregorianChange(UCalendar *cal, 
+         // We normally don't check "this" pointers for nullptr, but this here avoids
+         // compiler-generated exception-throwing code in case cal == nullptr.
+         *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR;
+         return;
+     }
+-    if(typeid(*cpp_cal) != typeid(GregorianCalendar)) {
++    if(typeid(*cpp_cal) != typeid(GregorianCalendar) &&
++       typeid(*cpp_cal) != typeid(ISO8601Calendar)) {
+         *pErrorCode = U_UNSUPPORTED_ERROR;
+         return;
+     }
+     gregocal->setGregorianChange(date, *pErrorCode);
+ }
+@@ -327,11 +329,12 @@ ucal_getGregorianChange(const UCalendar 
+         // We normally don't check "this" pointers for nullptr, but this here avoids
+         // compiler-generated exception-throwing code in case cal == nullptr.
+         *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR;
+         return (UDate)0;
+     }
+-    if(typeid(*cpp_cal) != typeid(GregorianCalendar)) {
++    if(typeid(*cpp_cal) != typeid(GregorianCalendar) &&
++       typeid(*cpp_cal) != typeid(ISO8601Calendar)) {
+         *pErrorCode = U_UNSUPPORTED_ERROR;
+         return (UDate)0;
+     }
+     return gregocal->getGregorianChange();
+ }
diff --git a/intl/icu-patches/bug-1856290-ICU-20548-dateinterval-timezone.diff b/intl/icu-patches/bug-1856290-ICU-20548-dateinterval-timezone.diff
new file mode 100644
index 0000000000..8d2762b48a
--- /dev/null
+++ b/intl/icu-patches/bug-1856290-ICU-20548-dateinterval-timezone.diff
@@ -0,0 +1,163 @@
+# Handle 'O' time zone skeleton in DateIntervalFormat.
+# Keep time zone skeleton field widths in DateIntervalFormat.
+#
+# ICU bug: https://unicode-org.atlassian.net/browse/ICU-20548
+
+diff --git a/intl/icu/source/i18n/dtitv_impl.h b/intl/icu/source/i18n/dtitv_impl.h
+--- a/intl/icu/source/i18n/dtitv_impl.h
++++ b/intl/icu/source/i18n/dtitv_impl.h
+@@ -84,16 +84,19 @@
+ #define CAP_W             ((char16_t)0x0057)
+ #define CAP_Y             ((char16_t)0x0059)
+ #define CAP_Z             ((char16_t)0x005A)
+ 
+ //#define MINIMUM_SUPPORTED_CALENDAR_FIELD    UCAL_MINUTE
+ 
+ #define MAX_E_COUNT      5
+ #define MAX_M_COUNT      5
++#define MAX_z_COUNT      4
++#define MAX_v_COUNT      4
++#define MAX_O_COUNT      4
+ //#define MAX_INTERVAL_INDEX 4
+ #define MAX_POSITIVE_INT  56632
+ 
+ 
+ #endif /* #if !UCONFIG_NO_FORMATTING */
+ 
+ #endif 
+ //eof
+diff --git a/intl/icu/source/i18n/dtitvfmt.cpp b/intl/icu/source/i18n/dtitvfmt.cpp
+--- a/intl/icu/source/i18n/dtitvfmt.cpp
++++ b/intl/icu/source/i18n/dtitvfmt.cpp
+@@ -1061,16 +1061,17 @@ DateIntervalFormat::getDateTimeSkeleton(
+     // timeSkeleton follows the sequence of hm*[v|z]?
+     int32_t ECount = 0;
+     int32_t dCount = 0;
+     int32_t MCount = 0;
+     int32_t yCount = 0;
+     int32_t mCount = 0;
+     int32_t vCount = 0;
+     int32_t zCount = 0;
++    int32_t OCount = 0;
+     char16_t hourChar = u'\0';
+     int32_t i;
+ 
+     for (i = 0; i < skeleton.length(); ++i) {
+         char16_t ch = skeleton[i];
+         switch ( ch ) {
+           case CAP_E:
+             dateSkeleton.append(ch);
+@@ -1123,16 +1124,20 @@ DateIntervalFormat::getDateTimeSkeleton(
+           case LOW_Z:
+             ++zCount;
+             timeSkeleton.append(ch);
+             break;
+           case LOW_V:
+             ++vCount;
+             timeSkeleton.append(ch);
+             break;
++          case CAP_O:
++            ++OCount;
++            timeSkeleton.append(ch);
++            break;
+           case LOW_A:
+           case CAP_V:
+           case CAP_Z:
+           case LOW_J:
+           case LOW_S:
+           case CAP_S:
+           case CAP_A:
+           case LOW_B:
+@@ -1174,20 +1179,41 @@ DateIntervalFormat::getDateTimeSkeleton(
+     /* generate normalized form for time */
+     if ( hourChar != u'\0' ) {
+         normalizedTimeSkeleton.append(hourChar);
+     }
+     if ( mCount != 0 ) {
+         normalizedTimeSkeleton.append(LOW_M);
+     }
+     if ( zCount != 0 ) {
+-        normalizedTimeSkeleton.append(LOW_Z);
++        if ( zCount <= 3 ) {
++            normalizedTimeSkeleton.append(LOW_Z);
++        } else {
++            for ( int32_t j = 0; j < zCount && j < MAX_z_COUNT; ++j ) {
++                 normalizedTimeSkeleton.append(LOW_Z);
++            }
++        }
+     }
+     if ( vCount != 0 ) {
+-        normalizedTimeSkeleton.append(LOW_V);
++        if ( vCount <= 3 ) {
++            normalizedTimeSkeleton.append(LOW_V);
++        } else {
++            for ( int32_t j = 0; j < vCount && j < MAX_v_COUNT; ++j ) {
++                 normalizedTimeSkeleton.append(LOW_V);
++            }
++        }
++    }
++    if ( OCount != 0 ) {
++        if ( OCount <= 3 ) {
++            normalizedTimeSkeleton.append(CAP_O);
++        } else {
++            for ( int32_t j = 0; j < OCount && j < MAX_O_COUNT; ++j ) {
++                 normalizedTimeSkeleton.append(CAP_O);
++            }
++        }
+     }
+ }
+ 
+ 
+ /**
+  * Generate date or time interval pattern from resource,
+  * and set them into the interval pattern locale to this formatter.
+  *
+@@ -1732,18 +1758,23 @@ DateIntervalFormat::adjustFieldWidth(con
+         findReplaceInPattern(adjustedPtn, UnicodeString(u"a\u202F",-1), UnicodeString());
+         findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString());
+         // adjust interior double spaces, remove exterior whitespace
+         findReplaceInPattern(adjustedPtn, UnicodeString("  "), UnicodeString(" "));
+         adjustedPtn.trim();
+     }
+     if ( differenceInfo == 2 ) {
+         if (inputSkeleton.indexOf(LOW_Z) != -1) {
++             bestMatchSkeletonFieldWidth[(int)(LOW_Z - PATTERN_CHAR_BASE)] = bestMatchSkeletonFieldWidth[(int)(LOW_V - PATTERN_CHAR_BASE)];
+              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_V), UnicodeString(LOW_Z));
+          }
++         if (inputSkeleton.indexOf(CAP_O) != -1) {
++             bestMatchSkeletonFieldWidth[(int)(CAP_O - PATTERN_CHAR_BASE)] = bestMatchSkeletonFieldWidth[(int)(LOW_V - PATTERN_CHAR_BASE)];
++             findReplaceInPattern(adjustedPtn, UnicodeString(LOW_V), UnicodeString(CAP_O));
++         }
+          if (inputSkeleton.indexOf(CAP_K) != -1) {
+              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_H), UnicodeString(CAP_K));
+          }
+          if (inputSkeleton.indexOf(LOW_K) != -1) {
+              findReplaceInPattern(adjustedPtn, UnicodeString(CAP_H), UnicodeString(LOW_K));
+          }
+          if (inputSkeleton.indexOf(LOW_B) != -1) {
+              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString(LOW_B));
+diff --git a/intl/icu/source/i18n/dtitvinf.cpp b/intl/icu/source/i18n/dtitvinf.cpp
+--- a/intl/icu/source/i18n/dtitvinf.cpp
++++ b/intl/icu/source/i18n/dtitvinf.cpp
+@@ -582,19 +582,20 @@ DateIntervalInfo::getBestSkeleton(const 
+ 
+     // hack for certain alternate characters
+     // resource bundles only have time skeletons containing 'v', 'h', and 'H'
+     // but not time skeletons containing 'z', 'K', or 'k'
+     // the skeleton may also include 'a' or 'b', which never occur in the resource bundles, so strip them out too
+     UBool replacedAlternateChars = false;
+     const UnicodeString* inputSkeleton = &skeleton;
+     UnicodeString copySkeleton;
+-    if ( skeleton.indexOf(LOW_Z) != -1 || skeleton.indexOf(LOW_K) != -1 || skeleton.indexOf(CAP_K) != -1 || skeleton.indexOf(LOW_A) != -1 || skeleton.indexOf(LOW_B) != -1 ) {
++    if ( skeleton.indexOf(LOW_Z) != -1 || skeleton.indexOf(CAP_O) != -1 || skeleton.indexOf(LOW_K) != -1 || skeleton.indexOf(CAP_K) != -1 || skeleton.indexOf(LOW_A) != -1 || skeleton.indexOf(LOW_B) != -1 ) {
+         copySkeleton = skeleton;
+         copySkeleton.findAndReplace(UnicodeString(LOW_Z), UnicodeString(LOW_V));
++        copySkeleton.findAndReplace(UnicodeString(CAP_O), UnicodeString(LOW_V));
+         copySkeleton.findAndReplace(UnicodeString(LOW_K), UnicodeString(CAP_H));
+         copySkeleton.findAndReplace(UnicodeString(CAP_K), UnicodeString(LOW_H));
+         copySkeleton.findAndReplace(UnicodeString(LOW_A), UnicodeString());
+         copySkeleton.findAndReplace(UnicodeString(LOW_B), UnicodeString());
+         inputSkeleton = &copySkeleton;
+         replacedAlternateChars = true;
+     }
+ 
diff --git a/intl/icu-patches/bug-1856291-ICU-22526-calendar-timezone-offset-limit.diff b/intl/icu-patches/bug-1856291-ICU-22526-calendar-timezone-offset-limit.diff
new file mode 100644
index 0000000000..9f47ba0394
--- /dev/null
+++ b/intl/icu-patches/bug-1856291-ICU-22526-calendar-timezone-offset-limit.diff
@@ -0,0 +1,27 @@
+# Increase the minimum limit for time zone offsets to -24 hours to support
+# time zone offset strings like "-23:59".
+#
+# ICU bug: https://unicode-org.atlassian.net/browse/ICU-22526
+
+diff --git a/intl/icu/source/i18n/calendar.cpp b/intl/icu/source/i18n/calendar.cpp
+--- a/intl/icu/source/i18n/calendar.cpp
++++ b/intl/icu/source/i18n/calendar.cpp
+@@ -649,17 +649,17 @@ static const int32_t kCalendarLimits[UCA
+     {           1,            1,             7,             7  }, // DAY_OF_WEEK
+     {/*N/A*/-1,       /*N/A*/-1,     /*N/A*/-1,       /*N/A*/-1}, // DAY_OF_WEEK_IN_MONTH
+     {           0,            0,             1,             1  }, // AM_PM
+     {           0,            0,            11,            11  }, // HOUR
+     {           0,            0,            23,            23  }, // HOUR_OF_DAY
+     {           0,            0,            59,            59  }, // MINUTE
+     {           0,            0,            59,            59  }, // SECOND
+     {           0,            0,           999,           999  }, // MILLISECOND
+-    {-16*kOneHour, -16*kOneHour,   12*kOneHour,   30*kOneHour  }, // ZONE_OFFSET
++    {-24*kOneHour, -16*kOneHour,   12*kOneHour,   30*kOneHour  }, // ZONE_OFFSET
+     { -1*kOneHour,  -1*kOneHour,    2*kOneHour,    2*kOneHour  }, // DST_OFFSET
+     {/*N/A*/-1,       /*N/A*/-1,     /*N/A*/-1,       /*N/A*/-1}, // YEAR_WOY
+     {           1,            1,             7,             7  }, // DOW_LOCAL
+     {/*N/A*/-1,       /*N/A*/-1,     /*N/A*/-1,       /*N/A*/-1}, // EXTENDED_YEAR
+     { -0x7F000000,  -0x7F000000,    0x7F000000,    0x7F000000  }, // JULIAN_DAY
+     {           0,            0, 24*kOneHour-1, 24*kOneHour-1  }, // MILLISECONDS_IN_DAY
+     {           0,            0,             1,             1  }, // IS_LEAP_MONTH
+     {           0,            0,            11,            11  }  // ORDINAL_MONTH
diff --git a/intl/icu-patches/bug-1856428-ICU-22541.diff b/intl/icu-patches/bug-1856428-ICU-22541.diff
new file mode 100644
index 0000000000..64c98c3e10
--- /dev/null
+++ b/intl/icu-patches/bug-1856428-ICU-22541.diff
@@ -0,0 +1,39 @@
+# Fix MacOS 14 default timezone issue
+#
+# ICU bug: https://unicode-org.atlassian.net/browse/ICU-22541
+
+diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp
+--- a/intl/icu/source/common/putil.cpp
++++ b/intl/icu/source/common/putil.cpp
+@@ -1170,16 +1170,31 @@ uprv_tzname(int n)
+         This is a trick to look at the name of the link to get the Olson ID
+         because the tzfile contents is underspecified.
+         This isn't guaranteed to work because it may not be a symlink.
+         */
+         char *ret = realpath(TZDEFAULT, gTimeZoneBuffer);
+         if (ret != nullptr && uprv_strcmp(TZDEFAULT, gTimeZoneBuffer) != 0) {
+             int32_t tzZoneInfoTailLen = uprv_strlen(TZZONEINFOTAIL);
+             const char *tzZoneInfoTailPtr = uprv_strstr(gTimeZoneBuffer, TZZONEINFOTAIL);
++            // MacOS14 has the realpath as something like
++            // /usr/share/zoneinfo.default/Australia/Melbourne
++            // which will not have "/zoneinfo/" in the path.
++            // Therefore if we fail, we fall back to read the link which is
++            // /var/db/timezone/zoneinfo/Australia/Melbourne
++            // We also fall back to reading the link if the realpath leads to something like
++            // /usr/share/zoneinfo/posixrules
++            if (tzZoneInfoTailPtr == nullptr ||
++                    uprv_strcmp(tzZoneInfoTailPtr + tzZoneInfoTailLen, "posixrules") == 0) {
++                ssize_t size = readlink(TZDEFAULT, gTimeZoneBuffer, sizeof(gTimeZoneBuffer)-1);
++                if (size > 0) {
++                    gTimeZoneBuffer[size] = 0;
++                    tzZoneInfoTailPtr = uprv_strstr(gTimeZoneBuffer, TZZONEINFOTAIL);
++                }
++            }
+             if (tzZoneInfoTailPtr != nullptr) {
+                 tzZoneInfoTailPtr += tzZoneInfoTailLen;
+                 skipZoneIDPrefix(&tzZoneInfoTailPtr);
+                 if (isValidOlsonID(tzZoneInfoTailPtr)) {
+                     return (gTimeZoneBufferPtr = tzZoneInfoTailPtr);
+                 }
+             }
+         } else {
diff --git a/intl/icu-patches/bug-915735 b/intl/icu-patches/bug-915735
new file mode 100644
index 0000000000..c713581f8e
--- /dev/null
+++ b/intl/icu-patches/bug-915735
@@ -0,0 +1,28 @@
+Bug 915735 - Fix linking the ICU libraries on Mac
+
+diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin
+--- a/intl/icu/source/config/mh-darwin
++++ b/intl/icu/source/config/mh-darwin
+@@ -25,21 +25,17 @@ ARFLAGS += -c
+ COMPILE.c=	$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c
+ COMPILE.cc=	$(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
+ 
+ ## Commands to make a shared library
+ SHLIB.c=	$(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+ SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+ 
+ ## Compiler switches to embed a library name and version information
+-ifeq ($(ENABLE_RPATH),YES)
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+-else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
+-endif
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
+ LD_RPATH_PRE= -Wl,-rpath,
+ 
+ ## Environment variable to set a runtime search path
+ LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
+ 
diff --git a/intl/icu-patches/double-conversion.diff b/intl/icu-patches/double-conversion.diff
new file mode 100644
index 0000000000..8d1471b081
--- /dev/null
+++ b/intl/icu-patches/double-conversion.diff
@@ -0,0 +1,151 @@
+diff --git a/intl/icu/source/i18n/number_decimalquantity.cpp b/intl/icu/source/i18n/number_decimalquantity.cpp
+--- a/intl/icu/source/i18n/number_decimalquantity.cpp
++++ b/intl/icu/source/i18n/number_decimalquantity.cpp
+@@ -11,28 +11,37 @@
+ #include <stdlib.h>
+ 
+ #include "unicode/plurrule.h"
+ #include "cmemory.h"
+ #include "number_decnum.h"
+ #include "putilimp.h"
+ #include "number_decimalquantity.h"
+ #include "number_roundingutils.h"
++#ifdef JS_HAS_INTL_API
++#include "double-conversion/double-conversion.h"
++#else
+ #include "double-conversion.h"
++#endif
+ #include "charstr.h"
+ #include "number_utils.h"
+ #include "uassert.h"
+ #include "util.h"
+ 
+ using namespace icu;
+ using namespace icu::number;
+ using namespace icu::number::impl;
+ 
++#ifdef JS_HAS_INTL_API
++using double_conversion::DoubleToStringConverter;
++using double_conversion::StringToDoubleConverter;
++#else
+ using icu::double_conversion::DoubleToStringConverter;
+ using icu::double_conversion::StringToDoubleConverter;
++#endif
+ 
+ namespace {
+ 
+ int8_t NEGATIVE_FLAG = 1;
+ int8_t INFINITY_FLAG = 2;
+ int8_t NAN_FLAG = 4;
+ 
+ /** Helper function for safe subtraction (no overflow). */
+diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp
+--- a/intl/icu/source/i18n/number_rounding.cpp
++++ b/intl/icu/source/i18n/number_rounding.cpp
+@@ -5,17 +5,21 @@
+ 
+ #if !UCONFIG_NO_FORMATTING
+ 
+ #include "charstr.h"
+ #include "uassert.h"
+ #include "unicode/numberformatter.h"
+ #include "number_types.h"
+ #include "number_decimalquantity.h"
++#ifdef JS_HAS_INTL_API
++#include "double-conversion/double-conversion.h"
++#else
+ #include "double-conversion.h"
++#endif
+ #include "number_roundingutils.h"
+ #include "number_skeletons.h"
+ #include "number_decnum.h"
+ #include "putilimp.h"
+ #include "string_segment.h"
+ 
+ using namespace icu;
+ using namespace icu::number;
+diff --git a/intl/icu/source/i18n/number_utils.cpp b/intl/icu/source/i18n/number_utils.cpp
+--- a/intl/icu/source/i18n/number_utils.cpp
++++ b/intl/icu/source/i18n/number_utils.cpp
+@@ -12,26 +12,34 @@
+ #include <stdlib.h>
+ #include <cmath>
+ #include "number_decnum.h"
+ #include "number_types.h"
+ #include "number_utils.h"
+ #include "charstr.h"
+ #include "decContext.h"
+ #include "decNumber.h"
++#ifdef JS_HAS_INTL_API
++#include "double-conversion/double-conversion.h"
++#else
+ #include "double-conversion.h"
++#endif
+ #include "fphdlimp.h"
+ #include "uresimp.h"
+ #include "ureslocs.h"
+ 
+ using namespace icu;
+ using namespace icu::number;
+ using namespace icu::number::impl;
+ 
++#ifdef JS_HAS_INTL_API
++using double_conversion::DoubleToStringConverter;
++#else
+ using icu::double_conversion::DoubleToStringConverter;
++#endif
+ 
+ 
+ namespace {
+ 
+ const char16_t*
+ doGetPattern(UResourceBundle* res, const char* nsName, const char* patternKey, UErrorCode& publicStatus,
+              UErrorCode& localStatus) {
+     // Construct the path into the resource bundle
+diff --git a/intl/icu/source/i18n/units_converter.cpp b/intl/icu/source/i18n/units_converter.cpp
+--- a/intl/icu/source/i18n/units_converter.cpp
++++ b/intl/icu/source/i18n/units_converter.cpp
+@@ -2,17 +2,21 @@
+ // License & terms of use: http://www.unicode.org/copyright.html
+ 
+ #include "unicode/utypes.h"
+ 
+ #if !UCONFIG_NO_FORMATTING
+ 
+ #include "charstr.h"
+ #include "cmemory.h"
++#ifdef JS_HAS_INTL_API
++#include "double-conversion/string-to-double.h"
++#else
+ #include "double-conversion-string-to-double.h"
++#endif
+ #include "measunit_impl.h"
+ #include "putilimp.h"
+ #include "uassert.h"
+ #include "unicode/errorcode.h"
+ #include "unicode/localpointer.h"
+ #include "unicode/stringpiece.h"
+ #include "units_converter.h"
+ #include <algorithm>
+@@ -101,17 +105,21 @@ void U_I18N_API Factor::substituteConsta
+         this->constantExponents[i] = 0;
+     }
+ }
+ 
+ namespace {
+ 
+ /* Helpers */
+ 
++#ifdef JS_HAS_INTL_API
++using double_conversion::StringToDoubleConverter;
++#else
+ using icu::double_conversion::StringToDoubleConverter;
++#endif
+ 
+ // TODO: Make this a shared-utility function.
+ // Returns `double` from a scientific number(i.e. "1", "2.01" or "3.09E+4")
+ double strToDouble(StringPiece strNum, UErrorCode &status) {
+     // We are processing well-formed input, so we don't need any special options to
+     // StringToDoubleConverter.
+     StringToDoubleConverter converter(0, 0, 0, "", "");
+     int32_t count;
diff --git a/intl/icu-patches/suppress-warnings.diff b/intl/icu-patches/suppress-warnings.diff
new file mode 100644
index 0000000000..e124a1689d
--- /dev/null
+++ b/intl/icu-patches/suppress-warnings.diff
@@ -0,0 +1,80 @@
+diff --git a/intl/icu/source/acinclude.m4 b/intl/icu/source/acinclude.m4
+--- a/intl/icu/source/acinclude.m4
++++ b/intl/icu/source/acinclude.m4
+@@ -469,30 +469,36 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
+             *)
+                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
+                 # We use -std=c11 to disable the gnu99 defaults and its associated warnings
+                 CFLAGS="$CFLAGS -std=c11"
+                 ;;
+             esac
+             
+             CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
++
++            # Suppress clang C warnings:
++            CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CFLAGS="$CFLAGS /W4"
+                 fi ;;
+             *-*-mingw*)
+                 CFLAGS="$CFLAGS -W4" ;;
+             esac
+         fi
+         if test "$GXX" = yes
+         then
+             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
++
++            # Suppress clang C++ warnings:
++            CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CXXFLAGS="$CXXFLAGS /W4"
+                 fi ;;
+             *-*-mingw*)
+diff --git a/intl/icu/source/configure b/intl/icu/source/configure
+--- a/intl/icu/source/configure
++++ b/intl/icu/source/configure
+@@ -4359,30 +4359,36 @@ fi
+             *)
+                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
+                 # We use -std=c11 to disable the gnu99 defaults and its associated warnings
+                 CFLAGS="$CFLAGS -std=c11"
+                 ;;
+             esac
+ 
+             CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
++
++            # Suppress clang C warnings:
++            CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CFLAGS="$CFLAGS /W4"
+                 fi ;;
+             *-*-mingw*)
+                 CFLAGS="$CFLAGS -W4" ;;
+             esac
+         fi
+         if test "$GXX" = yes
+         then
+             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
++
++            # Suppress clang C++ warnings:
++            CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter"
+         else
+             case "${host}" in
+             *-*-cygwin)
+                 if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
+                 then
+                     CXXFLAGS="$CXXFLAGS /W4"
+                 fi ;;
+             *-*-mingw*)