From patchwork Tue Dec 19 16:07:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 82515 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0A6B03858282 for ; Tue, 19 Dec 2023 16:08:22 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id E89F6385840D for ; Tue, 19 Dec 2023 16:08:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E89F6385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E89F6385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703002088; cv=none; b=IaSj/UCOggyGp2GX+8khn2CmChan+twwDANTLu4MzSc3S2xar+t1+m39tQu+STh3tqofZQGssjf7HJp29AxJtJYqIHEKiYrJgmvLO6g/n30lcrclhOrYwQs9X540h2nMqHTvK9wvs7MJfS3F43p34g9HJolHQYxSVFopUv/vVWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703002088; c=relaxed/simple; bh=A1+fHusyoFA5MDej/XYdek+uGkHZyKKGCEBcDtlbUlM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=R3nquXbIwrZTNGO5a7ZW5KPgG2VqThpiOvoaHz7Qw82awkqshQZKOkFJ3EG1AibWUn1SJCczNzjhMTaa7JLHeQ8HWyp7Kk7DvulMeJtqSoYRAiiASO+EpDJU4zKsy0xXe+47iQx7viTskbCRxRFORhQaTvJLhmm0uOLx8UExsaM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5cd86e3a9afso2018812a12.1 for ; Tue, 19 Dec 2023 08:08:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703002086; x=1703606886; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VuRsd3PBVfXGnOWm4frtoz3pLiPQWXDOpUpz4C5moqM=; b=Wn2NlTgO6daJ2wv4N49S7hA09g9y8ah8W46ecJKLc1Y35btlPWk/Hb5MZmuMuWSDnB jnekmQ0Vm3KdKouPRxl6P8dQFKXQh/OmBZVewbAzKtd16Vf6mlHAaK5G4VzTib8gkaRj RhOM2/zE+FKFnfqna1SiYZadXm9AX9FKFl1wNXh9VDbkZmIjKtj8+ulDn1bbKzQS/SkW aK8PMTUn0Nk22fIYR3gc4P5NYkgklR/QVpoGEDTitX8/hAT+hw3ZLehynwe9x0uj9JZj 5TNkMy0Yx50EqHHO+6Ecf2rfjfzNgpsHYFGfjZvR8njxjTYG4nCOyZkZpDVcm/WOhk5d uDag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703002086; x=1703606886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VuRsd3PBVfXGnOWm4frtoz3pLiPQWXDOpUpz4C5moqM=; b=kgp7jm3UJMCYtcgJgM+g2yasRaOPrkNWqLLQ0fWfu7idcs165sog2WIdz4/6XZBLoJ Qc2eU/6KrFMYvxu5rXgvOvTalU5necBjZP7Wa5fX/CxV+0+ph9JH+0etf7sSqy7n2W+Q 6DT6YJ1q/WIJ1oVvxhUbmn2A8KuYrkqFi/d9A2ceoM7C+xa76IolytUMyBiWCCoDjhQj P8vZO4RRlSauvvKhOVduC1vmHbg+MzfpuO08evcSPAirY9riEsMQRD01Gij4VSNXxDlW kCTxhMRq1iZQOAS+IcLp/yZi4/SIm8KpRyB6Zsb6iV0dR6mD5Sumld79nek0BtTNPbqi ZjwA== X-Gm-Message-State: AOJu0YyXRtAb7a+2KUfmD8IIxbOlBVdY/W+jg9yczFIrx/1K6teoY6Td tMtPjSfCoFC3ZC3cbAdHw6QQ8HbFd+4= X-Google-Smtp-Source: AGHT+IFRuIjNhu50wqx6I9pcdcZ0UhWUGdHdFRc5K+HAyU7JTx+6F0q+bqss8Po3pw6Evf3O/NMdqg== X-Received: by 2002:a17:90b:350:b0:28b:4750:c85a with SMTP id fh16-20020a17090b035000b0028b4750c85amr1653011pjb.43.1703002085631; Tue, 19 Dec 2023 08:08:05 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id pw5-20020a17090b278500b0028593e9eaadsm1783303pjb.31.2023.12.19.08.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 08:07:55 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 410A474063A; Tue, 19 Dec 2023 08:07:41 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: goldstein.w.n@gmail.com, rick.p.edgecombe@intel.com Subject: [PATCH v3 4/9] elf: Always provide _dl_get_dl_main_map in libc.a Date: Tue, 19 Dec 2023 08:07:35 -0800 Message-ID: <20231219160740.3079330-5-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231219160740.3079330-1-hjl.tools@gmail.com> References: <20231219160740.3079330-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Always provide _dl_get_dl_main_map in libc.a. It will be used by x86 to process PT_GNU_PROPERTY segment. --- elf/dl-support.c | 2 -- sysdeps/generic/ldsodefs.h | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/elf/dl-support.c b/elf/dl-support.c index 837fa1c836..70c5b3599a 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -344,7 +344,6 @@ _dl_non_dynamic_init (void) DL_SYSINFO_IMPLEMENTATION #endif -#if ENABLE_STATIC_PIE /* Since relocation to hidden _dl_main_map causes relocation overflow on aarch64, a function is used to get the address of _dl_main_map. */ @@ -353,7 +352,6 @@ _dl_get_dl_main_map (void) { return &_dl_main_map; } -#endif /* This is used by _dl_runtime_profile, not used on static code. */ void diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9b50ddd09f..0e8a008a49 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1172,10 +1172,6 @@ void __libc_setup_tls (void); # if ENABLE_STATIC_PIE /* Relocate static executable with PIE. */ extern void _dl_relocate_static_pie (void) attribute_hidden; - -/* Get a pointer to _dl_main_map. */ -extern struct link_map * _dl_get_dl_main_map (void) - __attribute__ ((visibility ("hidden"))); # else # define _dl_relocate_static_pie() # endif @@ -1217,6 +1213,10 @@ rtld_hidden_proto (_dl_deallocate_tls) extern void _dl_nothread_init_static_tls (struct link_map *) attribute_hidden; +/* Get a pointer to _dl_main_map. */ +extern struct link_map * _dl_get_dl_main_map (void) + __attribute__ ((visibility ("hidden"))); + /* Find origin of the executable. */ extern const char *_dl_get_origin (void) attribute_hidden;