From patchwork Wed Nov 10 02:24:25 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: 47347 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 C73A6385801A for ; Wed, 10 Nov 2021 02:24:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C73A6385801A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636511091; bh=MwtzTS1wkn1opMKfk07xum9GPGsl1/+6ql6fBzx7gCg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=qp+QL1TjEIbc9ZBhGyFuhfV06VPexlm+2UlUhmEG+eNtNsERDZkK7hDx5EpnRREZ2 rqa+e52txbs4jUSWv86sXWWnJm4/P/ZmAHU2Jz/Pj46IVDfOgoUUBGnqTSpno8KsdE QlvjnFog7/M2h459FLVtrEZMObYKGsNhixv14TwA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 49768385801A for ; Wed, 10 Nov 2021 02:24:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 49768385801A Received: by mail-ot1-x336.google.com with SMTP id o15-20020a9d410f000000b0055c942cc7a0so1629118ote.8 for ; Tue, 09 Nov 2021 18:24:29 -0800 (PST) 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=MwtzTS1wkn1opMKfk07xum9GPGsl1/+6ql6fBzx7gCg=; b=fnfqy0Kwo39SWMMjRtVH+9iSaUC/UkBh+Eo4MTHfabVvxTL/u3qF35Om9/i7cX77Vn 5dEOgKRn9WXj/VmlllHE6d7clrMugMU/h3Hfb7HHqHFDdxIZVy93hQCqqHbRfuij6cvb 1kwo89tkjtiRROsl1RgWDBrZGPO6Gk/63bgAUe65bTQe1N8pCyUGubahG+gmzStPrACm Nv9owDh8WQSoUQMw7w8DZVCgd3OzJzf9gXWpSbS5JmzpExRs5pthDsLurS2V5HghEaL7 OrDxUZj/a9kNAuFrMIpyqCeGVpntsG7OrIISXgdACYNaF/y21np54Iwfz7X27cnA4FkW LP2w== X-Gm-Message-State: AOAM5311E5jWeE45Q9RbxxqN5biSWED4L4PaC68uENn31WPCuwzL7XHW 6brmjBhFpUr5agQNI0MhXRu8U//wbbnnxQ== X-Google-Smtp-Source: ABdhPJxEOIsHZ99bOw8/TDv/jXPdCghH1ivSM2d4vp2kw4mqNLxOGlF91DOk6gylaniMaKZ7nGr3Cg== X-Received: by 2002:a05:6830:2707:: with SMTP id j7mr10052996otu.258.1636511068323; Tue, 09 Nov 2021 18:24:28 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:94d0:2630:9b29:e621]) by smtp.gmail.com with ESMTPSA id u8sm5804327ote.17.2021.11.09.18.24.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 18:24:28 -0800 (PST) To: libc-alpha@sourceware.org Subject: [COMMITTED] Fix build a chec failures after b05fae4d8e34 Date: Tue, 9 Nov 2021 23:24:25 -0300 Message-Id: <20211110022425.2145128-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, KAM_NUMSUBJECT, 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 include cleanup on dl-minimal.c removed too much for some targets. Also for Hurd, __sbrk is removed from localplt.data now that tunables allocated memory through mmap. Checked with a build for all affected architectures. --- elf/dl-minimal.c | 2 ++ sysdeps/mach/hurd/i386/localplt.data | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 152192d451..04ac1557e8 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -23,6 +23,8 @@ #include #include <_itoa.h> #include +#include +#include /* The rtld startup code calls __rtld_malloc_init_stubs after the diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index 47fbe1e2a7..fdff008abd 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -35,7 +35,6 @@ ld.so: __access ld.so: __access_noerrno ld.so: __getpid ld.so: __getcwd -ld.so: __sbrk ld.so: _exit ? ld.so: abort ld.so: _hurd_intr_rpc_mach_msg