Merge pull request #679 from Chilledheart/misc_finish_post_1_6_0_tasks

Misc finish post 1.6.0 tasks

.github/workflows/releases-freebsd-binary.yml

@@ -45,7 +45,6 @@ jobs:
         arch:
         - 'amd64'
         abi:
-        - '12'
         - '13'
         - '14'
     runs-on: ubuntu-20.04

.github/workflows/releases-rpm.yml

@@ -46,7 +46,7 @@ jobs:
         - 'centos7'
         - 'centos8'
         - 'fedora38'
-        - 'alpine318'
+        - 'alpine319'
         - 'opensuse15'
         # - 'centos9'
     runs-on: ubuntu-22.04
@@ -164,7 +164,7 @@ jobs:
       fail-fast: false
       matrix:
         container:
-        - 'alpine318'
+        - 'alpine319'
     runs-on: ubuntu-22.04
     needs: docker_publish
     container:

third_party/libc++/ohos.patch

@@ -1,16 +1,16 @@
 diff --git a/include/__config b/include/__config
-index ee7730516..f7e1ceef2 100644
+index ee272a627..a943aa164 100644
 --- a/include/__config
 +++ b/include/__config
-@@ -1042,6 +1042,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
+@@ -1071,6 +1071,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
          defined(__GNU__) ||                                                                                            \
          defined(__APPLE__) ||                                                                                          \
          defined(__MVS__) ||                                                                                            \
 +        defined(__OHOS_FAMILY__) || \
          defined(_AIX) ||                                                                                               \
          defined(__EMSCRIPTEN__)
  // clang-format on
-@@ -1121,7 +1122,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
+@@ -1145,7 +1146,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c
  #  endif
 
  #  if defined(__BIONIC__) || defined(__NuttX__) || defined(__Fuchsia__) || defined(__wasi__) ||                        \
@@ -20,16 +20,16 @@ index ee7730516..f7e1ceef2 100644
  #  endif
 
 diff --git a/include/__locale b/include/__locale
-index eda81976d..8b3ca41b0 100644
+index 3ba7ac18b..ce0d69adf 100644
 --- a/include/__locale
 +++ b/include/__locale
 @@ -49,6 +49,9 @@
  #elif defined(__wasi__)
  // WASI libc uses musl's locales support.
- # include <__support/musl/xlocale.h>
+ #  include <__support/musl/xlocale.h>
 +#elif defined(__LITEOS__) || defined(__OHOS__)
 +// LiteOS libc uses musl's locales support.
-+# include <__support/musl/xlocale.h>
++#  include <__support/musl/xlocale.h>
  #elif defined(_LIBCPP_HAS_MUSL_LIBC)
- # include <__support/musl/xlocale.h>
+ #  include <__support/musl/xlocale.h>
  #endif