ndk-sysroot-gcc-compact: bump to 27

Author: licy183

common-files/setup_toolchain_gcc.sh

@@ -195,8 +195,6 @@ _setup_standalone_toolchain_current_ndk_newer_gcc() {
 			echo "Applying patch: $(basename $f)"
 			patch -d "$GCC_STANDALONE_TOOLCHAIN_TMP/sysroot/usr/include/" -p8 < "$f";
 		done
-		# Revert the math header patch
-		patch -d "$GCC_STANDALONE_TOOLCHAIN_TMP/sysroot/usr/include/" -p8 -R < "$TERMUX_SCRIPTDIR/tur/ndk-sysroot-gcc-compact/0001-c++-v1-math-headers.patch"
 		cp -R $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/* \
 			$GCC_STANDALONE_TOOLCHAIN_TMP/sysroot/usr/lib/
 		# Use libc++_shared as libstdc++

tur/ndk-sysroot-gcc-compact/0002-android-versioning.h.patch renamed to tur/ndk-sysroot-gcc-compact/0001-android-versioning.h.patch

@@ -10,7 +10,7 @@ attribute is not available in GCC.
  // The `annotate` attribute always pulls the annotated (inline) function into the object files, thus
  // we should only annotate headers when we are running versioner.
 -#if defined(__BIONIC_VERSIONER)
-+#if defined(__BIONIC_VERSIONER) || ! defined(__clang__)
++#if defined(__BIONIC_VERSIONER) || !defined(__clang__)
 
- #define __INTRODUCED_IN(api_level) __attribute__((annotate("introduced_in=" #api_level)))
- #define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __attribute__((annotate("introduced_in=" #api_level))) __VERSIONER_NO_GUARD
+ #define __INTRODUCED_IN(api_level) __attribute__((__annotate__("introduced_in=" #api_level)))
+ #define __INTRODUCED_IN_NO_GUARD_FOR_NDK(api_level) __attribute__((__annotate__("introduced_in=" #api_level))) __VERSIONER_NO_GUARD

tur/ndk-sysroot-gcc-compact/0001-c++-v1-math-headers.patch

@@ -11,20 +11,11 @@ diff -uNr a/bits/ioctl.h b/bits/ioctl.h
 +#if defined(__clang__) && __has_extension(overloadable_unmarked) && \
 +  !defined(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD)
  /* enable_if(1) just exists to break overloading ties. */
- int ioctl(int __fd, unsigned __request, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
+ int ioctl(int __fd, unsigned __op, ...) __overloadable __enable_if(1, "") __RENAME(ioctl);
  #endif
 diff -uNr a/bits/stdatomic.h b/bits/stdatomic.h
 --- a/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/bits/stdatomic.h
 +++ b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/bits/stdatomic.h
-@@ -41,7 +41,7 @@
-  */
- 
- #include <stddef.h>  /* For ptrdiff_t. */
--#include <stdint.h>
-+#include <stdint.h>  /* TODO: don't drag in all the macros, just the types. */
- // Include uchar.h only when available.  Bionic's stdatomic.h is also used for
- // the host (via a copy in prebuilts/clang) and uchar.h is not available in the
- // glibc used for the host.
 @@ -49,6 +49,20 @@
  # include <uchar.h>  /* For char16_t and char32_t.              */
  #endif
@@ -60,15 +51,10 @@ diff -uNr a/bits/stdatomic.h b/bits/stdatomic.h
 
  /*
   * Clang and recent GCC both provide predefined macros for the memory
-@@ -138,24 +157,63 @@
-  * 7.17.4 Fences.
+@@ -139,23 +158,56 @@
   */
 
--static __inline void atomic_thread_fence(memory_order __order __attribute__((unused))) {
-+static __inline void
-+atomic_thread_fence(memory_order __order __attribute__((unused)))
-+{
-+
+ static __inline void atomic_thread_fence(memory_order __order __attribute__((__unused__))) {
 +#ifdef __CLANG_ATOMICS
  	__c11_atomic_thread_fence(__order);
 +#elif defined(__GNUC_ATOMICS)
@@ -78,11 +64,7 @@ diff -uNr a/bits/stdatomic.h b/bits/stdatomic.h
 +#endif
  }
 
--static __inline void atomic_signal_fence(memory_order __order __attribute__((unused))) {
-+static __inline void
-+atomic_signal_fence(memory_order __order __attribute__((unused)))
-+{
-+
+ static __inline void atomic_signal_fence(memory_order __order __attribute__((__unused__))) {
 +#ifdef __CLANG_ATOMICS
  	__c11_atomic_signal_fence(__order);
 +#elif defined(__GNUC_ATOMICS)
@@ -127,15 +109,15 @@ diff -uNr a/bits/stdatomic.h b/bits/stdatomic.h
  typedef _Atomic(bool)			atomic_bool;
  typedef _Atomic(char)			atomic_char;
  typedef _Atomic(signed char)		atomic_schar;
-@@ -204,6 +262,7 @@
+@@ -204,6 +256,7 @@
   * Compiler-specific operations.
   */
 
 +#if defined(__CLANG_ATOMICS)
  #define	atomic_compare_exchange_strong_explicit(object, expected,	\
      desired, success, failure)						\
  	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-@@ -228,11 +287,91 @@
+@@ -228,11 +281,91 @@
  	__c11_atomic_load(object, order)
  #define	atomic_store_explicit(object, desired, order)			\
  	__c11_atomic_store(object, desired, order)
@@ -227,53 +209,14 @@ diff -uNr a/bits/stdatomic.h b/bits/stdatomic.h
  #define	atomic_compare_exchange_strong(object, expected, desired)	\
  	atomic_compare_exchange_strong_explicit(object, expected,	\
  	    desired, memory_order_seq_cst, memory_order_seq_cst)
-@@ -255,6 +394,7 @@
+@@ -255,6 +388,7 @@
  	atomic_load_explicit(object, memory_order_seq_cst)
  #define	atomic_store(object, desired)					\
  	atomic_store_explicit(object, desired, memory_order_seq_cst)
 +#endif /* !_KERNEL */
 
  /*
   * 7.17.8 Atomic flag type and operations.
-@@ -269,18 +409,33 @@
- 
- #define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(false) }
- 
--static __inline bool atomic_flag_test_and_set_explicit(volatile atomic_flag *__object, memory_order __order) {
-+static __inline bool
-+atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
-+    memory_order __order)
-+{
- 	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
- }
- 
--static __inline void atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order) {
-+static __inline void
-+atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
-+{
-+
- 	atomic_store_explicit(&__object->__flag, 0, __order);
- }
- 
--static __inline bool atomic_flag_test_and_set(volatile atomic_flag *__object) {
--	return (atomic_flag_test_and_set_explicit(__object, memory_order_seq_cst));
-+#ifndef _KERNEL
-+static __inline bool
-+atomic_flag_test_and_set(volatile atomic_flag *__object)
-+{
-+
-+	return (atomic_flag_test_and_set_explicit(__object,
-+	    memory_order_seq_cst));
- }
- 
--static __inline void atomic_flag_clear(volatile atomic_flag *__object) {
-+static __inline void
-+atomic_flag_clear(volatile atomic_flag *__object)
-+{
-+
- 	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
- }
-+#endif /* !_KERNEL */
 diff -uNr a/complex.h b/complex.h
 --- a/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/complex.h
 +++ b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/complex.h

tur/ndk-sysroot-gcc-compact/0004-compact-with-clang-builtins.patch renamed to tur/ndk-sysroot-gcc-compact/0002-compact-with-clang-builtins.patch

@@ -33,23 +33,17 @@ diff -uNr a/sys/cdefs.h b/sys/cdefs.h
  #if defined(__cplusplus)
  #define __BEGIN_DECLS extern "C" {
  #define __END_DECLS }
-@@ -139,12 +162,25 @@
+@@ -142,12 +165,25 @@
 
  #define __wur __attribute__((__warn_unused_result__))
 
--#define __errorattr(msg) __attribute__((unavailable(msg)))
--#define __warnattr(msg) __attribute__((deprecated(msg)))
--#define __warnattr_real(msg) __attribute__((deprecated(msg)))
--#define __enable_if(cond, msg) __attribute__((enable_if(cond, msg)))
--#define __clang_error_if(cond, msg) __attribute__((diagnose_if(cond, msg, "error")))
--#define __clang_warning_if(cond, msg) __attribute__((diagnose_if(cond, msg, "warning")))
 +#ifdef __clang__
-+#  define __errorattr(msg) __attribute__((unavailable(msg)))
-+#  define __warnattr(msg) __attribute__((deprecated(msg)))
-+#  define __warnattr_real(msg) __attribute__((deprecated(msg)))
-+#  define __enable_if(cond, msg) __attribute__((enable_if(cond, msg)))
-+#  define __clang_error_if(cond, msg) __attribute__((diagnose_if(cond, msg, "error")))
-+#  define __clang_warning_if(cond, msg) __attribute__((diagnose_if(cond, msg, "warning")))
+ #define __errorattr(msg) __attribute__((__unavailable__(msg)))
+ #define __warnattr(msg) __attribute__((__deprecated__(msg)))
+ #define __warnattr_real(msg) __attribute__((__deprecated__(msg)))
+ #define __enable_if(cond, msg) __attribute__((__enable_if__(cond, msg)))
+ #define __clang_error_if(cond, msg) __attribute__((__diagnose_if__(cond, msg, "error")))
+ #define __clang_warning_if(cond, msg) __attribute__((__diagnose_if__(cond, msg, "warning")))
 +#else
 +#  define __errorattr(msg) __attribute__((__error__(msg)))
 +#  define __warnattr(msg) __attribute__((__warning__(msg)))
@@ -65,82 +59,60 @@ diff -uNr a/sys/cdefs.h b/sys/cdefs.h
 
  #if defined(ANDROID_STRICT)
  /*
-@@ -281,19 +317,20 @@
+@@ -251,6 +287,7 @@
 
  #if defined(__BIONIC_FORTIFY)
  #  define __bos0(s) __bosn((s), 0)
--#  define __pass_object_size_n(n) __attribute__((pass_object_size(n)))
-+#  if defined(__clang__)
-+#    define __pass_object_size_n(n) __attribute__((pass_object_size(n)))
++#if defined(__clang__)
+ #  define __pass_object_size_n(n) __attribute__((__pass_object_size__(n)))
  /*
   * FORTIFY'ed functions all have either enable_if or pass_object_size, which
-  * makes taking their address impossible. Saying (&read)(foo, bar, baz); will
-  * therefore call the unFORTIFYed version of read.
-  */
--#  define __call_bypassing_fortify(fn) (&fn)
-+#    define __call_bypassing_fortify(fn) (&fn)
- /*
-  * Because clang-FORTIFY uses overloads, we can't mark functions as `extern inline` without making
-  * them available externally. FORTIFY'ed functions try to be as close to possible as 'invisible';
-  * having stack protectors detracts from that (b/182948263).
-  */
--#  define __BIONIC_FORTIFY_INLINE static __inline__ __attribute__((no_stack_protector)) \
-+#    define __BIONIC_FORTIFY_INLINE static __inline__ __attribute__((no_stack_protector)) \
-       __always_inline __VERSIONER_FORTIFY_INLINE
- /*
-  * We should use __BIONIC_FORTIFY_VARIADIC instead of __BIONIC_FORTIFY_INLINE
-@@ -301,9 +338,21 @@
-  * The __always_inline attribute is useless, misleading, and could trigger
-  * clang compiler bug to incorrectly inline variadic functions.
-  */
--#  define __BIONIC_FORTIFY_VARIADIC static __inline__
-+#    define __BIONIC_FORTIFY_VARIADIC static __inline__
+@@ -275,6 +312,18 @@
  /* Error functions don't have bodies, so they can just be static. */
--#  define __BIONIC_ERROR_FUNCTION_VISIBILITY static __attribute__((unused))
-+#    define __BIONIC_ERROR_FUNCTION_VISIBILITY static __attribute__((unused))
-+#  else
+ #  define __BIONIC_ERROR_FUNCTION_VISIBILITY static __unused
+ #else
 +/*
 + * Where they can, GCC and clang-style FORTIFY share implementations.
 + * So, make these nops in GCC.
 + */
-+#    define __pass_object_size_n(n)
-+#    define __call_bypassing_fortify(fn) (fn)
++#  define __pass_object_size_n(n)
++#  define __call_bypassing_fortify(fn) (fn)
 +/* __BIONIC_FORTIFY_NONSTATIC_INLINE is pointless in GCC's FORTIFY */
-+#    define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline)) __attribute__((__artificial__))
++#  define __BIONIC_FORTIFY_INLINE extern __inline__ __always_inline __attribute__((gnu_inline)) __attribute__((__artificial__))
 +/* __always_inline is probably okay and ignored by gcc in __BIONIC_FORTIFY_VARIADIC */
-+#    define __BIONIC_FORTIFY_VARIADIC __BIONIC_FORTIFY_INLINE
-+#  endif
- #else
++#  define __BIONIC_FORTIFY_VARIADIC __BIONIC_FORTIFY_INLINE
++#endif
++#else
  /* Further increase sharing for some inline functions */
  #  define __pass_object_size_n(n)
-@@ -333,7 +382,16 @@
+ #endif
+@@ -303,7 +352,16 @@
  #  define __BIONIC_INCLUDE_FORTIFY_HEADERS 1
  #endif
 
--#define __overloadable __attribute__((overloadable))
 +#if !defined(__clang__) && defined(__BIONIC_INCLUDE_FORTIFY_HEADERS)
 +#undef __BIONIC_INCLUDE_FORTIFY_HEADERS
 +#warning "Fortify headers are not supported and will not used without clang."
 +#endif
 +
 +#if defined(__clang__)
-+#  define __overloadable __attribute__((overloadable))
+ #define __overloadable __attribute__((__overloadable__))
 +#else
-+#  define __overloadable
++#define __overloadable
 +#endif
 
- #define __diagnose_as_builtin(...) __attribute__((diagnose_as_builtin(__VA_ARGS__)))
+ #define __diagnose_as_builtin(...) __attribute__((__diagnose_as_builtin__(__VA_ARGS__)))
 
-@@ -368,6 +426,7 @@
- }
- #endif
+@@ -323,6 +381,7 @@
+ /* Used to rename functions so that the compiler emits a call to 'x' rather than the function this was applied to. */
+ #define __RENAME(x) __asm__(#x)
 
 +#if defined(__clang__)
  /*
   * Used when we need to check for overflow when multiplying x and y. This
-  * should only be used where __size_mul_overflow can not work, because it makes
-@@ -376,6 +435,7 @@
-  * __size_mul_overflow.
+  * should only be used where __builtin_umull_overflow can not work, because it makes
+@@ -331,6 +390,7 @@
+  * __builtin_umull_overflow.
   */
  #define __unsafe_check_mul_overflow(x, y) ((__SIZE_TYPE__)-1 / (x) < (y))
 +#endif

tur/ndk-sysroot-gcc-compact/0003-sys-cdefs.h.patch

@@ -0,0 +1,32 @@
+--- a/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/bits/bionic_multibyte_result.h
++++ b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/bits/bionic_multibyte_result.h
+@@ -45,6 +45,7 @@
+  * Refer to C23 7.30.1 Restartable multibyte/wide character conversion functions
+  * for more details.
+  */
++#ifdef __clang__
+ enum : size_t {
+   /// @brief An encoding error occurred. The bytes read are not a valid unicode
+   /// character, nor are they a partially valid character.
+@@ -64,5 +65,21 @@
+   BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED = -3UL,
+ #define BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED
+ };
++#else
++/// @brief An encoding error occurred. The bytes read are not a valid unicode
++/// character, nor are they a partially valid character.
++#define BIONIC_MULTIBYTE_RESULT_ILLEGAL_SEQUENCE (size_t(-1UL))
++
++/// @brief The bytes read may produce a valid unicode character, but the
++/// sequence is incomplete. Future calls may complete the character.
++#define BIONIC_MULTIBYTE_RESULT_INCOMPLETE_SEQUENCE (size_t(-2UL))
++
++/// @brief The output of the call was the result of a previous successful
++/// decoding. No new bytes were consumed.
++///
++/// The common case for this return value is when mbrtoc16 returns the low
++/// surrogate of a pair.
++#define BIONIC_MULTIBYTE_RESULT_NO_BYTES_CONSUMED (size_t(-3UL))
++#endif
+ 
+ __END_DECLS

tur/ndk-sysroot-gcc-compact/0004-do-not-use-c23-style-enum.patch

@@ -0,0 +1,11 @@
+--- a/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__config
++++ b/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__config
+@@ -41,7 +41,7 @@
+ #      warning "Libc++ only supports AppleClang 15 and later"
+ #    endif
+ #  elif defined(_LIBCPP_GCC_VER)
+-#    if _LIBCPP_GCC_VER < 1300
++#    if _LIBCPP_GCC_VER < 1300 && !defined(__TERMUX__)
+ #      warning "Libc++ only supports GCC 13 and later"
+ #    endif
+ #  endif