glibc: add changes to make riscv64-linux-gnu works

ziglang · Feb 4, 2024 · f3d9547 · f3d9547
1 parent 5b803ae
commit f3d9547
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/lib/libc/glibc/csu/elf-init-2.33.c b/lib/libc/glibc/csu/elf-init-2.33.c
@@ -34,6 +34,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <stddef.h>
+#include <elf-initfini.h>
 
 
 /* These magic symbols are provided by the linker.  */

diff --git a/lib/libc/glibc/sysdeps/generic/elf-initfini.h b/lib/libc/glibc/sysdeps/generic/elf-initfini.h
@@ -0,0 +1 @@
+#define NO_INITFINI 1
diff --git a/lib/libc/glibc/sysdeps/generic/sysdep.h b/lib/libc/glibc/sysdeps/generic/sysdep.h
@@ -56,6 +56,12 @@
 # define cfi_personality(enc, exp)	.cfi_personality enc, exp
 # define cfi_lsda(enc, exp)		.cfi_lsda enc, exp
 
+# ifndef __clang__
+#  define cfi_label(label)		.cfi_label label
+# else
+#  define cfi_label(label)
+# endif
+
 #else /* ! ASSEMBLER */
 
 # define CFI_STRINGIFY(Name) CFI_STRINGIFY2 (Name)

diff --git a/lib/libc/glibc/sysdeps/riscv/start-2.33.S b/lib/libc/glibc/sysdeps/riscv/start-2.33.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/lib/libc/glibc/sysdeps/riscv/start.S b/lib/libc/glibc/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/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h