From patchwork Mon Mar 27 21:04:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Flavio Cruz X-Patchwork-Id: 66972 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 336EA3858C62 for ; Mon, 27 Mar 2023 21:04:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 336EA3858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679951096; bh=mKiYGZaxCGGqWAaHVs5s3ceDFL1FoFP40d8+ipKifUk=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=XpcPr64sExzSoKWsW+7IrTdvPoVCORTYFSiYxjb3Sg3JwBj6QtCBDsGrnr00+YF5v 3chHvMlo9If9fkMM75K9+8ADgkvhGJhmNVOJErYTvatAZ/W3L6dUm2TfZvgOWaPz2l FwVNTSB0D5AfR6JJi8t3TjjShzYH7KVfuR5wuNnk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb2a.google.com (mail-yb1-xb2a.google.com [IPv6:2607:f8b0:4864:20::b2a]) by sourceware.org (Postfix) with ESMTPS id CBEE53858C5F for ; Mon, 27 Mar 2023 21:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBEE53858C5F Received: by mail-yb1-xb2a.google.com with SMTP id y5so12493900ybu.3 for ; Mon, 27 Mar 2023 14:04:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679951073; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mKiYGZaxCGGqWAaHVs5s3ceDFL1FoFP40d8+ipKifUk=; b=K1UzmW0OWM/2J1yDC2im6+FIifEIpGTTopQmDAkE/Gv826NwAgQn+xymgZtWTHEV5U NTyplWwDVwfOzBXotuExpB1ANKuvinjbSFPakHcm58WXEkCtmq9eOwYbRUtkZjAel933 iwzPx+0P18mnDVIIPvidWfbRSWkR+NEqR3lqELWxg60Jhl9S+CS/LhD7nMnmTcWh1V+i 2DDWG9s/1siKyRCa2uzvz6W0/3z9nR0x6jU+E+EdnBJJ1tRwVuhcrnN4A/wENHCHJ7FV kpDvuuIm321SmbZ0LwuL6R8ocBogC3bMoxotC93rK8mEwTtkqckYCSpvKKzkSlcB+Ru2 fquA== X-Gm-Message-State: AAQBX9f1oyEBmkhIFaSxiRvXOqVJfSxBwADY32Zll4QcRS8aJdrKHRaA OSYMVlQBWcB2/aWVpZ7p3ltzH2OVrQ== X-Google-Smtp-Source: AKy350YTTHCQS9l4ATP/DiPfiI56Uuif5mLZCfCiqxFGTZzJa9zW60t2D1XgUVJ5ctZFie2Jn5uJsw== X-Received: by 2002:a25:ce42:0:b0:b67:38f7:9c4b with SMTP id x63-20020a25ce42000000b00b6738f79c4bmr15132625ybe.23.1679951072729; Mon, 27 Mar 2023 14:04:32 -0700 (PDT) Received: from jupiter.tail36e24.ts.net (dynamic-acs-24-154-253-225.zoominternet.net. [24.154.253.225]) by smtp.gmail.com with ESMTPSA id c129-20020a251c87000000b00b7767ca7494sm2523857ybc.49.2023.03.27.14.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 14:04:32 -0700 (PDT) Date: Mon, 27 Mar 2023 17:04:30 -0400 To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org Subject: [PATCH glibc] Allow building with --disable-nscd again. Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.4 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 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: Flavio Cruz via Libc-alpha From: Flavio Cruz Reply-To: Flavio Cruz Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The change 88677348b4de breaks the build with undefiend references to the NSCD functions. Reviewed-by: Adhemerval Zanella --- malloc/set-freeres.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c index f452ff838b..42d70d3971 100644 --- a/malloc/set-freeres.c +++ b/malloc/set-freeres.c @@ -37,11 +37,13 @@ # pragma weak __intl_freemem # pragma weak __libio_freemem # pragma weak __libc_fstab_freemem +#ifdef USE_NSCD # pragma weak __nscd_gr_map_freemem # pragma weak __nscd_hst_map_freemem # pragma weak __nscd_pw_map_freemem # pragma weak __nscd_serv_map_freemem # pragma weak __nscd_group_map_freemem +#endif # pragma weak __libc_regcomp_freemem # pragma weak __libc_atfork_freemem # pragma weak __res_thread_freeres @@ -95,11 +97,15 @@ __libc_freeres (void) call_function_static_weak (__intl_freemem); call_function_static_weak (__libio_freemem); call_function_static_weak (__libc_fstab_freemem); + +#ifdef USE_NSCD call_function_static_weak (__nscd_gr_map_freemem); call_function_static_weak (__nscd_hst_map_freemem); call_function_static_weak (__nscd_pw_map_freemem); call_function_static_weak (__nscd_serv_map_freemem); call_function_static_weak (__nscd_group_map_freemem); +#endif + call_function_static_weak (__libc_regcomp_freemem); call_function_static_weak (__libc_atfork_freemem); /* __res_thread_freeres deallocates the per-thread resolv_context);