From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id AC79D385840F; Wed, 17 Apr 2024 20:08:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC79D385840F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1713384503; bh=4hKFl71Y1rC/P66Eu9Iepsm7kmqxwbOeHwCn0YwlKV0=; h=From:To:Subject:Date:From; b=AGC8rBg9sbwsHrKydDR1kgebdJ7XtZur4/dUv+TVjEAIIV13jl3EhDSrf5AnvoVL0 AuoCSzBoHIWJbcKlYdsnG7QbQcozp6vM86OASgkdnfsp+H11ntUZL1vv8rziRl/+AP g9A6eOrKS4YpYXClIME5dSLNLGO02sHC26XtZNWk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] riscv: Do not use cfi_label when building with clang X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: f72cdbda8b5d3500c59e13bf1badc3e34a8cf192 X-Git-Newrev: 0add13af81134d959a3d95f5c4c6ccf067332100 Message-Id: <20240417200823.AC79D385840F@sourceware.org> Date: Wed, 17 Apr 2024 20:08:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0add13af81134d959a3d95f5c4c6ccf067332100 commit 0add13af81134d959a3d95f5c4c6ccf067332100 Author: Adhemerval Zanella 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