From patchwork Thu Jun 23 17:49:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1647308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=SFNbpNi/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LTSST5qwsz9s5V for ; Fri, 24 Jun 2022 03:49:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A816B3856DCE for ; Thu, 23 Jun 2022 17:49:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A816B3856DCE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656006583; bh=4JGhH0aMfI2H6HhV7c+sFThfIolOCMYrVgHrmvkd5sU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=SFNbpNi/KSUXDsenZjZS7MG1uBs9Cq8VHfUCJDzkeHB2OZjfF5ZZsuvbDTLgbKS/g qjmBqYg0iz6ig88FL1Nt1VWTVG96vwXUA9qyRVNwsDiX0g8/CMrlMnjf/PkzINIuJM 2eHBJPA/R+xtqhuJQXetV0dE9A8ufOXsnpx1Y7Xo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 6C6BE3857025 for ; Thu, 23 Jun 2022 17:49:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6C6BE3857025 Received: by mail-pf1-x42a.google.com with SMTP id t21so289438pfq.1 for ; Thu, 23 Jun 2022 10:49:24 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4JGhH0aMfI2H6HhV7c+sFThfIolOCMYrVgHrmvkd5sU=; b=z7CK9vn9VfXJNwpFi4sdfSKVLVFpaw5AwGdV78UFTnWKgDNLyUyfL2DfeOEyx9Lrj7 SPcbyQiCGHVbEpoWH5rkAShkKwy7sjsoW1WV2LGjsb5rW7u6nUGZhJZMh+4t6P4Lvp32 25a6CLxqevLfTCWuun7DewyR5RrkVX4rBTdKiI+to9fcfhhH0NWyrhbHSEys730btGFG YiybqiQE/6asLEX1R5KIVAoa900yEcaZGAkUVVKkNkEKdhrqItm+CXiKjx5zrbpwziRJ 5FpTy4xj3C9Yu6OiyB3vrV9gjSJs+VQH7Sn0E83uSbn+pRfORqVbqKnDqTRZMh2/q3Lq r8ag== X-Gm-Message-State: AJIora8f0m3dFLWFI0h6yL0yaGbvvbkr4RRvW1yVb5U4mnZD12w3lXwC knvipLD+WZDmlD6IVu6Gl7s93jC6EgU= X-Google-Smtp-Source: AGRyM1s89ZuKZQIBLA0ayRw7KnuHw6tqA8TnMeCAOUnLM4GM5ztHtl+4pCL/Mw6T1L9/Zap1J7xHEw== X-Received: by 2002:a63:af5d:0:b0:40c:83d8:745e with SMTP id s29-20020a63af5d000000b0040c83d8745emr8558060pgo.583.1656006563375; Thu, 23 Jun 2022 10:49:23 -0700 (PDT) Received: from noah-tgl.. ([2600:1010:b051:c9b1:8581:9b98:7f75:2ad7]) by smtp.gmail.com with ESMTPSA id s6-20020a17090a2f0600b001eaae89de5fsm2258854pjd.1.2022.06.23.10.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 10:49:23 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1] x86: Remove faulty sanity tests for RTLD build with no multiarch Date: Thu, 23 Jun 2022 10:49:19 -0700 Message-Id: <20220623174919.564236-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 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, 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: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" The sanity tests where meant to ensure that the default implementation was only being built without multiarch with the exception of the multiarch/rtld-*.S files. The code used IS_IN (rtld) to check if the build for was for an multiarch/rtld-*.S file which is incorrect as IS_IN (rtld) is set for the non-multiarch build as well. --- sysdeps/x86_64/isa-default-impl.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sysdeps/x86_64/isa-default-impl.h b/sysdeps/x86_64/isa-default-impl.h index 7d7832b1f5..34634668e5 100644 --- a/sysdeps/x86_64/isa-default-impl.h +++ b/sysdeps/x86_64/isa-default-impl.h @@ -46,14 +46,4 @@ # error "Unsupported ISA Level!" #endif -#if IS_IN(rtld) -# if !defined USE_MULTIARCH -# error "RTLD version should only exist in multiarch build" -# endif -#else -# if defined USE_MULTIARCH -# error "Multiarch build should not use ISA_DEFAULT_IMPL without RTLD" -# endif -#endif - #include ISA_DEFAULT_IMPL