public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/azanella/clang] riscv: Do not use cfi_label when building with clang
Date: Mon, 29 Jan 2024 17:58:24 +0000 (GMT)	[thread overview]
Message-ID: <20240129175824.1B1B73858433@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f2c1c4e8cc6b7652f0c8711328b18c0430da983b

commit f2c1c4e8cc6b7652f0c8711328b18c0430da983b
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu Sep 28 14:17:54 2023 -0300

    riscv: Do not use cfi_label when building with clang
    
    The .cfi_label is a gas extension not supported by clang.  From a
    ziglang discussion [1], it seems that it is not really required.
    
    [1] https://github.com/ziglang/zig/issues/3340

Diff:
---
 sysdeps/generic/sysdep.h               | 6 ++++++
 sysdeps/riscv/start.S                  | 2 +-
 sysdeps/unix/sysv/linux/riscv/clone.S  | 2 +-
 sysdeps/unix/sysv/linux/riscv/clone3.S | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h
index c47e53d3d8..c663912b8e 100644
--- a/sysdeps/generic/sysdep.h
+++ b/sysdeps/generic/sysdep.h
@@ -55,6 +55,12 @@
 # define cfi_window_save		.cfi_window_save
 # define cfi_personality(enc, exp)	.cfi_personality enc, exp
 # define cfi_lsda(enc, exp)		.cfi_lsda enc, exp
+/* .cfi_label is a gas extension not supported by clang.  */
+# ifndef __clang__
+#  define cfi_label(label)		.cfi_label label
+# else
+#  define cfi_label(label)
+# endif
 
 #else /* ! ASSEMBLER */
 
diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S
index ede186ef23..bff535be9d 100644
--- a/sysdeps/riscv/start.S
+++ b/sysdeps/riscv/start.S
@@ -45,7 +45,7 @@
 ENTRY (ENTRY_POINT)
 	/* Terminate call stack by noting ra is undefined.  Use a dummy
 	   .cfi_label to force starting the FDE.  */
-	.cfi_label .Ldummy
+	cfi_label (.Ldummy)
 	cfi_undefined (ra)
 	call  load_gp
 	mv    a5, a0  /* rtld_fini.  */
diff --git a/sysdeps/unix/sysv/linux/riscv/clone.S b/sysdeps/unix/sysv/linux/riscv/clone.S
index b9c843eb1d..f815fd6160 100644
--- a/sysdeps/unix/sysv/linux/riscv/clone.S
+++ b/sysdeps/unix/sysv/linux/riscv/clone.S
@@ -74,7 +74,7 @@ ENTRY (__thread_start)
 L (thread_start):
 	/* Terminate call stack by noting ra is undefined.  Use a dummy
 	   .cfi_label to force starting the FDE.  */
-	.cfi_label .Ldummy
+	cfi_label (.Ldummy)
 	cfi_undefined (ra)
 
 	/* Restore the arg for user's function.  */
diff --git a/sysdeps/unix/sysv/linux/riscv/clone3.S b/sysdeps/unix/sysv/linux/riscv/clone3.S
index 29264be054..6a81a56519 100644
--- a/sysdeps/unix/sysv/linux/riscv/clone3.S
+++ b/sysdeps/unix/sysv/linux/riscv/clone3.S
@@ -62,7 +62,7 @@ ENTRY(__thread_start_clone3)
 L(thread_start):
 	/* Terminate call stack by noting ra is undefined.  Use a dummy
 	   .cfi_label to force starting the FDE.  */
-	.cfi_label .Ldummy
+	cfi_label (.Ldummy)
 	cfi_undefined (ra)
 
 	/* Restore the arg for user's function and call the user's

             reply	other threads:[~2024-01-29 17:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-29 17:58 Adhemerval Zanella [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-17 20:08 Adhemerval Zanella
2024-04-02 15:54 Adhemerval Zanella
2024-02-09 17:32 Adhemerval Zanella
2024-02-07 14:08 Adhemerval Zanella
2023-12-21 18:54 Adhemerval Zanella
2023-09-28 17:53 Adhemerval Zanella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240129175824.1B1B73858433@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).