From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7891) id 8338D385483A; Fri, 7 Jul 2023 01:02:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8338D385483A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688691749; bh=lcaOo/EJRx6tCYGNraIwVJGizinVFSeXBUH/NH24bvI=; h=From:To:Subject:Date:From; b=vk2JCVycYgXOCeNeb/5rCZ6daoysWm3nd96Ttw6iy4+Iqeliw/gtPvUAYa/n0KsY8 lg8JWcre+kHo6q8onFRe2gdc+ZaxDA3Puuz3uvBkEYyM3hvWaVRMibueOth+xr8ldG YRsjrTWyD1gsp7zA8dw1hcf0wa2D7GLmunYZoWQ0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Yinyu Cai To: glibc-cvs@sourceware.org Subject: [glibc] LoongArch: config: Rewrite check on static PIE. X-Act-Checkin: glibc X-Git-Author: caiyinyu X-Git-Refname: refs/heads/master X-Git-Oldrev: 500054974667be3153ed760152ea0153df33c3d0 X-Git-Newrev: 0567edf1b2def04840e38e3610452c51a3f440a3 Message-Id: <20230707010229.8338D385483A@sourceware.org> Date: Fri, 7 Jul 2023 01:02:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0567edf1b2def04840e38e3610452c51a3f440a3 commit 0567edf1b2def04840e38e3610452c51a3f440a3 Author: caiyinyu Date: Thu Jul 6 17:25:43 2023 +0800 LoongArch: config: Rewrite check on static PIE. It's better to add "\" before "EOF" and remove "\" before "$". Diff: --- sysdeps/loongarch/configure | 14 +++++++------- sysdeps/loongarch/configure.ac | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure index b3c203ba4b..52bd08a91e 100644 --- a/sysdeps/loongarch/configure +++ b/sysdeps/loongarch/configure @@ -10,14 +10,14 @@ if ${libc_cv_static_pie_on_loongarch+:} false; then : $as_echo_n "(cached) " >&6 else - cat > conftest1.S << EOF + cat > conftest1.S <<\EOF .global _start .type _start, @function _start: - li.w \$a7, 93 + li.w $a7, 93 /* This ensures the assembler supports explicit reloc. */ - pcalau12i \$a0, %pc_hi20(x) - ld.w \$a0, \$a0, %pc_lo12(x) + pcalau12i $a0, %pc_hi20(x) + ld.w $a0, $a0, %pc_lo12(x) syscall 0 .data @@ -26,13 +26,13 @@ x: /* This should produce an R_LARCH_RELATIVE in the static PIE. */ .dword _start EOF - cat > conftest2.S << EOF + cat > conftest2.S <<\EOF .global f .type f, @function f: /* The linker should be able to handle this and produce a PLT entry. */ - la.pcrel \$t0, \$t0, external_func - jirl \$zero, \$t0, 0 + la.pcrel $t0, $t0, external_func + jirl $zero, $t0, 0 EOF libc_cv_static_pie_on_loongarch=no diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac index c45f6b815e..cdd95fa512 100644 --- a/sysdeps/loongarch/configure.ac +++ b/sysdeps/loongarch/configure.ac @@ -13,14 +13,14 @@ dnl satisfy the requirement, but a distro may backport static PIE support into dnl earlier GCC or Binutils releases as well. AC_CACHE_CHECK([if the toolchain is sufficient to build static PIE on LoongArch], libc_cv_static_pie_on_loongarch, [ - cat > conftest1.S << EOF + cat > conftest1.S <<\EOF .global _start .type _start, @function _start: - li.w \$a7, 93 + li.w $a7, 93 /* This ensures the assembler supports explicit reloc. */ - pcalau12i \$a0, %pc_hi20(x) - ld.w \$a0, \$a0, %pc_lo12(x) + pcalau12i $a0, %pc_hi20(x) + ld.w $a0, $a0, %pc_lo12(x) syscall 0 .data @@ -29,13 +29,13 @@ x: /* This should produce an R_LARCH_RELATIVE in the static PIE. */ .dword _start EOF - cat > conftest2.S << EOF + cat > conftest2.S <<\EOF .global f .type f, @function f: /* The linker should be able to handle this and produce a PLT entry. */ - la.pcrel \$t0, \$t0, external_func - jirl \$zero, \$t0, 0 + la.pcrel $t0, $t0, external_func + jirl $zero, $t0, 0 EOF libc_cv_static_pie_on_loongarch=no