[libcxx-commits] [libcxxabi] [libc++abi] Fix test on Android (PR #74753)

[Maksim Panchenko via libcxx-commits]

https://github.com/maksfb updated https://github.com/llvm/llvm-project/pull/74753

>From 67807c2e35d4669099a69361ab3362ecdc6f07a9 Mon Sep 17 00:00:00 2001
From: Maksim Panchenko <maks at fb.com>
Date: Thu, 7 Dec 2023 11:38:42 -0800
Subject: [PATCH 1/3] [libc++abi] Fix test on Android

Follow up to #72727. The added test could not be executed on Android.
---
 libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
index ea9dd0104c086b..249d243d921ea4 100644
--- a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
+++ b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
@@ -2,7 +2,7 @@
 # RUN: %t.exe
 
 # REQUIRES: linux && target={{x86_64-.+}}
-# UNSUPPORTED: no-exceptions
+# UNSUPPORTED: no-exceptions || android
 
 ## Check that libc++abi works correctly when LPStart address is explicitly set
 ## to zero.

>From f0e578504e1ed9e836f9eb520e0883ecbb103f2f Mon Sep 17 00:00:00 2001
From: Maksim Panchenko <maks at fb.com>
Date: Tue, 12 Dec 2023 11:26:52 -0800
Subject: [PATCH 2/3] fixup! [libc++abi] Fix test on Android

---
 libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
index 249d243d921ea4..964cc9cfcced3f 100644
--- a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
+++ b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
@@ -1,5 +1,5 @@
 # RUN: %{cxx} %{flags} %s %{link_flags} -no-pie -o %t.exe
-# RUN: %t.exe
+# RUN: %{exec} %t.exe
 
 # REQUIRES: linux && target={{x86_64-.+}}
 # UNSUPPORTED: no-exceptions || android
@@ -82,7 +82,7 @@ GCC_except_table0:
 	.byte	155                             # @TType Encoding = indirect pcrel sdata4
 	.uleb128 .Lttbase0-.Lttbaseref0
 .Lttbaseref0:
-	.byte	11                              # Call site Encoding = udata4
+	.byte	11                              # Call site Encoding = sdata4
 	.uleb128 .Lcst_end0-.Lcst_begin0
 .Lcst_begin0:
 	.long .Lfunc_begin0-.Lfunc_begin0    # >> Call Site 1 <<

>From 0f0ea34db0e757dd3f625064f2f46c79dddd788a Mon Sep 17 00:00:00 2001
From: Maksim Panchenko <maks at fb.com>
Date: Tue, 12 Dec 2023 17:33:34 -0800
Subject: [PATCH 3/3] fixup! fixup! [libc++abi] Fix test on Android

---
 libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
index 964cc9cfcced3f..e18134cf886391 100644
--- a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
+++ b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
@@ -2,7 +2,8 @@
 # RUN: %{exec} %t.exe
 
 # REQUIRES: linux && target={{x86_64-.+}}
-# UNSUPPORTED: no-exceptions || android
+# UNSUPPORTED: target={{.+-android.*}}
+# UNSUPPORTED: no-exceptions
 
 ## Check that libc++abi works correctly when LPStart address is explicitly set
 ## to zero.