[pushed] libsanitizer, darwin: Unsupport Darwin >= 22 for now.

Message ID 20230418063041.2615-1-iain@sandoe.co.uk
State Repeat Merge
Headers
Series [pushed] libsanitizer, darwin: Unsupport Darwin >= 22 for now. |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Iain Sandoe April 18, 2023, 6:30 a.m. UTC
  Tested on x86_64-darwin21,22, pushed to trunk, needed on 13.1,
thanks
Iain

--- 8< ---

The mechanism for location dyld has altered from Darwin22 since dyld is now
in the shared cache.  The implemented mechanism for walking the cache uses
Apple Blocks which GCC does not yet support, and the fallback to the original
mechanism does not work there.

Until a suitable work-around can be found, unsupport Darwin22+.

	Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

libsanitizer/ChangeLog:

	* configure.tgt: Unsupport Darwin22+ until a mechanism can be found
	to locate dyld in the shared cache.
---
 libsanitizer/configure.tgt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Richard Biener April 18, 2023, 8:04 a.m. UTC | #1
On Tue, Apr 18, 2023 at 8:31 AM Iain Sandoe via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> Tested on x86_64-darwin21,22, pushed to trunk, needed on 13.1,

OK for branch.

> thanks
> Iain
>
> --- 8< ---
>
> The mechanism for location dyld has altered from Darwin22 since dyld is now
> in the shared cache.  The implemented mechanism for walking the cache uses
> Apple Blocks which GCC does not yet support, and the fallback to the original
> mechanism does not work there.
>
> Until a suitable work-around can be found, unsupport Darwin22+.
>
>         Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
>
> libsanitizer/ChangeLog:
>
>         * configure.tgt: Unsupport Darwin22+ until a mechanism can be found
>         to locate dyld in the shared cache.
> ---
>  libsanitizer/configure.tgt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt
> index 90b5eaffc48..d24566a2343 100644
> --- a/libsanitizer/configure.tgt
> +++ b/libsanitizer/configure.tgt
> @@ -65,7 +65,7 @@ case "${target}" in
>                 HWASAN_SUPPORTED=yes
>         fi
>         ;;
> -  x86_64-*-darwin2* | x86_64-*-darwin1[6-9]* | i?86-*-darwin1[6-8]*)
> +  x86_64-*-darwin2[01]* | x86_64-*-darwin1[6-9]* | i?86-*-darwin1[6-8]*)
>         TSAN_SUPPORTED=no
>         EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -Wl,-undefined,dynamic_lookup"
>         ;;
> --
> 2.37.1 (Apple Git-137.1)
>
  

Patch

diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt
index 90b5eaffc48..d24566a2343 100644
--- a/libsanitizer/configure.tgt
+++ b/libsanitizer/configure.tgt
@@ -65,7 +65,7 @@  case "${target}" in
 		HWASAN_SUPPORTED=yes
 	fi
 	;;
-  x86_64-*-darwin2* | x86_64-*-darwin1[6-9]* | i?86-*-darwin1[6-8]*)
+  x86_64-*-darwin2[01]* | x86_64-*-darwin1[6-9]* | i?86-*-darwin1[6-8]*)
 	TSAN_SUPPORTED=no
 	EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -Wl,-undefined,dynamic_lookup"
 	;;