mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

riscv: Build with -mno-relax if linker does not support R_RISCV_ALIGN

Browse Source 
It allows build both glibc and tests with lld (Since lld does not
support R_RISCV_ALIGN linker relaxation).

Checked with a build for riscv32-linux-gnu-rv32imafdc-ilp32d and
riscv64-linux-gnu-rv64imafdc-lp64d.

Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Fangrui Song <maskray@google.com>
This commit is contained in:
Adhemerval Zanella 2021-11-02 16:51:39 -03:00
parent 6720d36b66
commit 09f214528c
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/riscv/Makefile
View File

@ -5,3 +5,9 @@ endif
# RISC-V's assembler also needs to know about PIC as it changes the definition # RISC-V's assembler also needs to know about PIC as it changes the definition
# of some assembler macros. # of some assembler macros.
ASFLAGS-.os += $(pic-ccflag) ASFLAGS-.os += $(pic-ccflag)
ifeq (no,$(riscv-r-align))
ASFLAGS-.os += -Wa,-mno-relax
ASFLAGS-.o += -Wa,-mno-relax
sysdep-CFLAGS += -mno-relax
endif

30
sysdeps/riscv/configure vendored
View File

@ -2,3 +2,33 @@
# Local configure fragment for sysdeps/riscv/elf. # Local configure fragment for sysdeps/riscv/elf.
$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
# Check if static linker supports R_RISCV_ALIGN
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for R_RISCV_ALIGN linker relaxation support" >&5
$as_echo_n "checking for R_RISCV_ALIGN linker relaxation support... " >&6; }
if ${libc_cv_riscv_r_align+:} false; then :
$as_echo_n "(cached) " >&6
else
cat > conftest.S <<EOF
.align 3
foo:
li a0,42
ret
EOF
libc_cv_riscv_r_align=no
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles $no_ssp -shared -fPIC -o contests.o conftest.S'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }
then
libc_cv_riscv_r_align=yes
fi
rm -rf conftest.*
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_riscv_r_align" >&5
$as_echo "$libc_cv_riscv_r_align" >&6; }
config_vars="$config_vars
riscv-r-align = $libc_cv_riscv_r_align"

16
sysdeps/riscv/configure.ac
View File

@ -2,3 +2,19 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/riscv/elf. # Local configure fragment for sysdeps/riscv/elf.
AC_DEFINE(PI_STATIC_AND_HIDDEN) AC_DEFINE(PI_STATIC_AND_HIDDEN)
# Check if static linker supports R_RISCV_ALIGN
AC_CACHE_CHECK([for R_RISCV_ALIGN linker relaxation support], [libc_cv_riscv_r_align],[dnl
cat > conftest.S <<EOF
.align 3
foo:
li a0,42
ret
EOF
libc_cv_riscv_r_align=no
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles $no_ssp -shared -fPIC -o contests.o conftest.S])
then
libc_cv_riscv_r_align=yes
fi
rm -rf conftest.*])
LIBC_CONFIG_VAR([riscv-r-align], [$libc_cv_riscv_r_align])