From patchwork Wed Dec 20 14:56:57 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: 82588 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 5E28D386186D for ; Wed, 20 Dec 2023 14:57:18 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id C97593858CD1 for ; Wed, 20 Dec 2023 14:57:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C97593858CD1 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 C97593858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703084226; cv=none; b=rA5wa1cPcXBkG+qkymcbTp1YEtVA8xVz/Esz2/J2WYgOpZp3SjAc/8GCirNBmX3uIL0bWumzydMDgncdVSks00f6aJOos02MOm8uSNShzNEI1riLNf3Nsz/k4/34zXtpwBJlgkJXdWPvYjCKOum5twUOk12uFxykuDBoCojSkwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703084226; c=relaxed/simple; bh=A1+fHusyoFA5MDej/XYdek+uGkHZyKKGCEBcDtlbUlM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bGdw23IFGPfzwnx1gaBkNwaIF6bIhlQGb+Mxc50xlX0fKdlmeZj1VXZS6x3Xv803fFLNlkdFGITqnWyeqoMAJqQNY/1M+9rMK8bDQkRQEyOMrYXDzE7pqb7ci7YNgTgIEb9G6TQFWwRJ/5R33tYgoQdqx7nyCMVPs50lRNQRZi0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6d7395ab92cso2195105b3a.2 for ; Wed, 20 Dec 2023 06:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703084224; x=1703689024; 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=hrZZ7Rv8ToEOXYTXK1FGcHe259DXKqAySQJxn5SHUA3s3X7k296B9QPsWh6gU+EwxL 5ON1gx+IcEW1ORw0Zza71Jhy2YELSh7fGw3fgwMZ/vSs23hVDBX9lzUG/eWyiaTLRrm4 9zOQT0he9ldcoNDq9MQFqz8mWCnIJXc0jRDY26vJEide9fBLcieW/RDqF5+UIH3Hpq41 0sX/KgYeR1Q3+0h3yiIIDPvneFp5VHWBpCIVSAN9u/50dwr2msx9qquRp66MU5QaI71M x7UJh8kEXpKo+M2+QsSntAkX8enjcls7DsWfhY0fEzLteudGpFmYFy7BQXJVlSZ1a1jF 70MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703084224; x=1703689024; 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=XK0noJd9XhypVLdXW/kiJ+C1PgJ+XY1Da6txzLyei/X+wpDVppNNx8vBxLxsU9muff DAC12DJ/TszKw9GIA29yNbxofQhkwOoJhG8E42goevTBWmMST0n4uQK/ku142t1vlExm 3TsUZHP2qbB2HpkA/vHO6wFpQhYcw0q6pYTYI+XX3f9LJmVscvrw/dlXUU8z1UKnRPQR w9TOsYQ71kvEbplPIDgukuWdx+JAZPO4r2LqgCBa8pPnOsyy12mGJmpZes5zMQzoC1QB B1gC+ckrIBS1BKbaHn4PP/xR5ZkslbjG8PK07yuIh6VPmfa0PUPyy3GBJ23Ji4SjlXAF WbDw== X-Gm-Message-State: AOJu0YwgCmI7cv/au9TDiElfiYCJSCp1Gay4RboFXP6f1C0XvR3MYGvj bU9RIfRQs3ck5A5YoUmiYXoNg1hRhRE= X-Google-Smtp-Source: AGHT+IEB6/KzJHYXNXhxgZV756iR5xGaUEhGVvOqimcwTsgvt/AAHKhy2D5Sc3q91sTPLinpmcUCkQ== X-Received: by 2002:a05:6a20:e112:b0:194:ee15:4b65 with SMTP id kr18-20020a056a20e11200b00194ee154b65mr289873pzb.25.1703084223652; Wed, 20 Dec 2023 06:57:03 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id fb7-20020a056a002d8700b006ce7e75cfa7sm5507646pfb.57.2023.12.20.06.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 06:57:03 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 878EE740633; Wed, 20 Dec 2023 06:57:01 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: rick.p.edgecombe@intel.com, goldstein.w.n@gmail.com Subject: [PATCH v4 2/6] elf: Always provide _dl_get_dl_main_map in libc.a Date: Wed, 20 Dec 2023 06:56:57 -0800 Message-ID: <20231220145701.740912-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231220145701.740912-1-hjl.tools@gmail.com> References: <20231220145701.740912-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3024.7 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;