From patchwork Thu Oct 21 20:28:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 46510 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 6399B385780F for ; Thu, 21 Oct 2021 20:29:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6399B385780F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634848144; bh=4K41dkFMXBjJvtsAHrEIYUBoZOZs86zM6KgkyPYPO/Y=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rEtuEKRo5btHHal9VJ1X0R9ehk8u3IBBV9mLOQy+fxJVlAwb46+szG+ACnZBWgX50 d1QzI/MWVY/jOBHTpiJfhgcoYTfxJyoV5GWR1y8Qo92FnZ2GnU0MQqSSCnmYhkJzld BNnRJArLhSeTl4qrL+lTx1TJa6oy6D7rMUsoXj1c= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by sourceware.org (Postfix) with ESMTPS id 5770D3858416 for ; Thu, 21 Oct 2021 20:28:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5770D3858416 Received: by mail-qv1-xf2c.google.com with SMTP id a16so1210435qvm.2 for ; Thu, 21 Oct 2021 13:28:42 -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:mime-version :content-transfer-encoding; bh=4K41dkFMXBjJvtsAHrEIYUBoZOZs86zM6KgkyPYPO/Y=; b=B1ERD94oMOGYtju++FJznca2b7fF+nINYNZpLOd/9OYEuyAtZg4l2xE8mvjWMhddOo 6x234RAtNAbgpsIeY0vLDFp625W6ZKa9UTC0VlTBuLMzhKpkMp++CwtVtezSwfb/HE3S SZkGPc/ncC8LPrPJni2NSRSao1Q3YEwcrN1aGvondotqbHdq0Hvac/pPxXZ3I14lsnTG uEdgrnqTvk6L8NovB5M/K/F/Xsg7YLoRa69ouFoqVIzMPHV3m2w+ii5kgvAhzkEwOeab JNPbDuUBeWMJ8DJX3/yUQwVEWJmkSNOMfP0YzyXpuTrvsa+K+mKjWSDlS+8UOY5GYGoK 6/LA== X-Gm-Message-State: AOAM533PXOAkOBwGyRBnmy6V/Ugsk8XzdCbG2HLcXOjpQl+w1ZjFvxgH 3hnTZhmq5Y4ApkV9zTNGTp+bTF6nK+pH2Q== X-Google-Smtp-Source: ABdhPJzw7eVjMYEovDjsZxLcT4sIcnxVXm2nsZtibZuWWTxvNitTnFZxD/J4Ih8zQW0csrIYun/3lw== X-Received: by 2002:a0c:fa0b:: with SMTP id q11mr756561qvn.48.1634848121889; Thu, 21 Oct 2021 13:28:41 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:2654:4963:d466:e6c9:ddbb]) by smtp.gmail.com with ESMTPSA id l12sm2987462qtq.57.2021.10.21.13.28.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 13:28:41 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] elf: Fix e6fd79f379 build with --enable-tunables=no Date: Thu, 21 Oct 2021 17:28:38 -0300 Message-Id: <20211021202838.3707560-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" The _dl_sort_maps_init() is not defined when tunables is not enabled. Checked on x86_64-linux-gnu. --- sysdeps/generic/ldsodefs.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 65a6a51633..1318c36dce 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1245,7 +1245,16 @@ extern struct link_map * _dl_get_dl_main_map (void) #endif /* Initialize the DSO sort algorithm to use. */ +#if !HAVE_TUNABLES +static inline void +__always_inline +_dl_sort_maps_init (void) +{ + /* This is optimized out if tunables are not enabled. */ +} +#else extern void _dl_sort_maps_init (void) attribute_hidden; +#endif /* Initialization of libpthread for statically linked applications. If libpthread is not linked in, this is an empty function. */