From patchwork Thu May 26 16:50:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54426 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 B406B3838214 for ; Thu, 26 May 2022 17:02:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B406B3838214 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653584563; bh=4TklX3PK/gfIsoiQv+ZK50EPrvm8YAytyWdzI0nHihI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=AZighgX6h+QapdIz/Jk9SbP7Bj62K9EQ+/233h5VTPRPOHEYD/JQdWp2IWN59eYFl xuNiR2ibfnjcG17/uI3Jk/cj06tuQtwz0PA9OdC0WnnJJSsHaQR48/ff7VCdtvHpNx FRgDFMMAp1QFutwnNg/3Tfn/BcLydQa3OdNAFUXQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id B9AE63839C69 for ; Thu, 26 May 2022 16:50:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B9AE63839C69 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-f2c296d320so2833602fac.8 for ; Thu, 26 May 2022 09:50:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4TklX3PK/gfIsoiQv+ZK50EPrvm8YAytyWdzI0nHihI=; b=febA6csVJbFXkZtrtsHWhgToG2k1JhpGDoD7G82ZccFbKMwYN+Frq/6PcAPyYxF4Gr ES+w6facbg6RyD1rT5SkMv8pQfP3kWoGyDevBaFvO8DZ2YUSiUGsv7rLPhyX8ZAOvxVp JCZ0B/2KNdhZ3JbjIYFqjyoJFMW+3lm4tchPWqP8KF+0gHOHVBX61JQKwht2RWuAeIiA +TeQpKRDkNDGNW9oy+UzPcok8vLvN4dr7PeALeI8VaaVYP5EQ8VINx49izyc/Sm/IP+W NE7w2xhCvDLFfX+Wik80L6NBySrctEPU/gTTjLjMRV255MlERpMGwMJsXloCbUSrDx2Q /x4A== X-Gm-Message-State: AOAM531guo4BPCiMgMn+Wm5qt1v7mAReu7G59jLhQWUuRyRPjxnbnBA6 Maz2MARHa5nDotiCnXYDIygW3iPs7v/UKw== X-Google-Smtp-Source: ABdhPJwOJyW4Yv6r4cdkKx/rwkUxUTn9e/tT4sslyHXtaqI8F7PpDpwUhUT0y3U/sJL1HeVYyI+NpA== X-Received: by 2002:a05:6870:c38f:b0:e5:f2c4:acc9 with SMTP id g15-20020a056870c38f00b000e5f2c4acc9mr1740338oao.173.1653583832916; Thu, 26 May 2022 09:50:32 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:9f85:b1e1:5370:63bd:a2ac]) by smtp.gmail.com with ESMTPSA id y26-20020a9d461a000000b0060603221255sm802521ote.37.2022.05.26.09.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:50:32 -0700 (PDT) To: libc-alpha@sourceware.org, Szabolcs Nagy Subject: [PATCH 17/17] elf: Remove _dl_skip_args Date: Thu, 26 May 2022 13:50:03 -0300 Message-Id: <20220526165003.705355-18-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220526165003.705355-1-adhemerval.zanella@linaro.org> References: <20220526165003.705355-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Now that no architecture uses it anymore. --- elf/rtld.c | 2 -- sysdeps/generic/ldsodefs.h | 4 ---- sysdeps/mach/hurd/dl-sysdep.c | 1 - 3 files changed, 7 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 069940d73f..f5a3d1968f 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -158,8 +158,6 @@ static void process_envvars (struct dl_main_state *state); int _dl_argc attribute_relro attribute_hidden; char **_dl_argv attribute_relro = NULL; -/* Always 0, only kept for not-yet-updated target start code. */ -const unsigned int _dl_skip_args attribute_hidden; rtld_hidden_data_def (_dl_argv) #ifndef THREAD_SET_STACK_GUARD diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 6716e1f382..446d12a68c 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -755,10 +755,6 @@ rtld_hidden_proto (__libc_stack_end) extern int _dl_argc attribute_hidden attribute_relro; extern char **_dl_argv attribute_relro; rtld_hidden_proto (_dl_argv) -#if IS_IN (rtld) -/* Always 0, only kept for not-yet-updated target start code. */ -extern const unsigned int _dl_skip_args attribute_hidden; -#endif #define rtld_progname _dl_argv[0] /* Flag set at startup and cleared when the last initializer has run. */ diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 8373962e62..f23fdee058 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -139,7 +139,6 @@ _dl_sysdep_start (void **start_argptr, mach_port_t memobj; error_t err; - ++_dl_skip_args; --_dl_argc; p = _dl_argv++[1] + 1;