From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by sourceware.org (Postfix) with ESMTPS id 17D253858D20 for ; Thu, 10 Aug 2023 23:35:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 17D253858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691710504; x=1723246504; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=z+F6KqnKu7X7H1FLPZH7U/JPXdAFR8R5y7IoZq6rulk=; b=m74J+BFO7KOegr0YO5obakm1C9KqaSu4tl+FQXjjGEzARFquPva4yu+5 H/gXQMeS+z+E0XvJBVpDsY1HtP2BZM/q8eTC4zOgeaHQELokpbkL/GBbH YQl+tL4MumQr6ERyrC4DQzI1nOHlWmWE0c3Lb4+BzcyFrAR0LWRFqou+i z/4/5ppjnq72sIQfstOVNq0ot5xj7f0uOZGgnFKa8pK+en3Hrh12Hgcex iXnE/hJ1ZIQbgzZXkxZfBbs+22BBQ+ad8ebirtjkJFv3xJ96c0f6JTUhy zjnSKBeJEdCPl7PkY95J6gJJnVWvm0+/Sh6McZZi8SgKT06nWU7+G1vo/ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10798"; a="402516740" X-IronPort-AV: E=Sophos;i="6.01,163,1684825200"; d="scan'208";a="402516740" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2023 16:34:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10798"; a="709329634" X-IronPort-AV: E=Sophos;i="6.01,163,1684825200"; d="scan'208";a="709329634" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by orsmga006.jf.intel.com with ESMTP; 10 Aug 2023 16:34:34 -0700 Received: from yanzhang-dev.sh.intel.com (yanzhang-dev.sh.intel.com [10.239.159.126]) by shvmail03.sh.intel.com (Postfix) with ESMTP id 3C927100519E; Fri, 11 Aug 2023 07:34:33 +0800 (CST) From: yanzhang.wang@intel.com To: libc-alpha@sourceware.org Cc: yanzhang.wang@intel.com Subject: [PATCH] RISC-V: Enable static-pie. Date: Fri, 11 Aug 2023 07:33:48 +0800 Message-ID: <20230810233348.1214955-1-yanzhang.wang@intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Yanzhang Wang This patch referents the commit 374cef3 to add static-pie support. And because the dummy link map is used when relocating ourselves, so need not to set __global_pointer$ at this time. --- sysdeps/riscv/configure | 2 ++ sysdeps/riscv/configure.ac | 3 +++ sysdeps/riscv/dl-machine.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sysdeps/riscv/configure b/sysdeps/riscv/configure index 2372225a26..340163779f 100644 --- a/sysdeps/riscv/configure +++ b/sysdeps/riscv/configure @@ -29,3 +29,5 @@ fi $as_echo "$libc_cv_riscv_r_align" >&6; } config_vars="$config_vars riscv-r-align = $libc_cv_riscv_r_align" + +$as_echo "#define SUPPORT_STATIC_PIE 1" >>confdefs.h diff --git a/sysdeps/riscv/configure.ac b/sysdeps/riscv/configure.ac index dbcc216689..36da2b5396 100644 --- a/sysdeps/riscv/configure.ac +++ b/sysdeps/riscv/configure.ac @@ -16,3 +16,6 @@ EOF fi rm -rf conftest.*]) LIBC_CONFIG_VAR([riscv-r-align], [$libc_cv_riscv_r_align]) + +dnl Static PIE is supported. +AC_DEFINE(SUPPORT_STATIC_PIE) diff --git a/sysdeps/riscv/dl-machine.h b/sysdeps/riscv/dl-machine.h index c0c9bd93ad..ad875c0828 100644 --- a/sysdeps/riscv/dl-machine.h +++ b/sysdeps/riscv/dl-machine.h @@ -323,7 +323,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], gotplt[1] = (ElfW(Addr)) l; } - if (l->l_type == lt_executable) + if (l->l_type == lt_executable && l->l_scope != NULL) { /* The __global_pointer$ may not be defined by the linker if the $gp register does not be used to access the global variable -- 2.41.0