From patchwork Mon Jun 26 19:52:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1800174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=rOUSBTM1; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qqdmm4B3dz20ZP for ; Tue, 27 Jun 2023 05:52:56 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A114385840D for ; Mon, 26 Jun 2023 19:52:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A114385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687809174; bh=a3WH/dEv0Dnd+dPlJVKiGKZOBU49ajE8Gz9zDQXoJ94=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rOUSBTM1WWkDgGf47wOYvCF4dsx9VIjZXJJGrC7oUIGvcZwPNK7CLE7QsU3KhYS6V 7eb0u+eRGjDhYFq0orGvLjkeX2kG2Gza0ACXzscTG9Kc47MNBVn3ZAB5X0ib9q4mw7 sOMP4UeXsS1qeKWANuMRqtIUZXW7r85xwXF/2noM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by sourceware.org (Postfix) with ESMTPS id 9CC963858D1E for ; Mon, 26 Jun 2023 19:52:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9CC963858D1E Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-1a991886254so3695818fac.2 for ; Mon, 26 Jun 2023 12:52:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687809159; x=1690401159; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a3WH/dEv0Dnd+dPlJVKiGKZOBU49ajE8Gz9zDQXoJ94=; b=NkQtA6Q3LxHiTeh/UGpsfOfX8uPmFL5joi6d/OOUiymBppdltGUJsFDRdHbbtKCV2K j67U0J5ynzKvVcI9bRXLwpdLNFcEvtqxHcggiU8rGxU5VyXcIBDYva9Z8bzkI5l79IqB kv61aHgC5fJ8DU+cYTnhLPwYAS0m+XiMwiNoTbIRuzwYOURXc0c8SMnzBjlAS0X5C5BH vjAJES4G7ftua3vUI55C9btXRR6s8rJcuc/YwUBPqIaBhEIUsRLeRCvWDJy9eYuUJ/9F xSmQfjZPgYci9Mddw/dAmvXxHhnL4mmvXUF5CFl9zO/ulhHQTnMfhxVb9/9cRWfj3+WH zNtQ== X-Gm-Message-State: AC+VfDwEayjr12r+TnW23xdVBmuCtQ5zeASCq2ovPevLgYqOHwFhtyiK cx775LpStsl5jJIr3HJMYhcNIAooStheuUmVw46WZw== X-Google-Smtp-Source: ACHHUZ4/UKXu7+Ko1Si+Wvvok1ctEJ+NsqHaWRikvEbmL4JaShrJRsPqWoRzGvmf5LhfcKIfEHn53A== X-Received: by 2002:a54:4e89:0:b0:3a1:cb5c:44fd with SMTP id c9-20020a544e89000000b003a1cb5c44fdmr5358117oiy.57.1687809159448; Mon, 26 Jun 2023 12:52:39 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:1ddb:8881:2119:f512:521d]) by smtp.gmail.com with ESMTPSA id z10-20020a54458a000000b0039ecef77873sm2869425oib.32.2023.06.26.12.52.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 12:52:38 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] x86: Adjust Linux x32 dl-cache inclusion path Date: Mon, 26 Jun 2023 16:52:35 -0300 Message-Id: <20230626195235.1622526-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" It fixes the x32 build failure introduced by 45e2483a6c. Checked on a x86_64-linux-gnu-x32 build. --- sysdeps/unix/sysv/linux/x86_64/x32/dl-cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/dl-cache.h b/sysdeps/unix/sysv/linux/x86_64/x32/dl-cache.h index 9ee58dd541..0cc04046fe 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/dl-cache.h +++ b/sysdeps/unix/sysv/linux/x86_64/x32/dl-cache.h @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include /* Defined as (FLAG_ELF_LIBC6 | FLAG_X8664_LIBX32). */ #undef _DL_CACHE_DEFAULT_ID