From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id 4792C3857419; Thu, 23 Jun 2022 18:14:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4792C3857419 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc] x86: Remove faulty sanity tests for RTLD build with no multiarch X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/master X-Git-Oldrev: 220b83d83d32aa9e6f5659e2fa2a63a0024c3e4a X-Git-Newrev: bd42891bb38d43878d0a9e204a183dbae4a2c6d0 Message-Id: <20220623181425.4792C3857419@sourceware.org> Date: Thu, 23 Jun 2022 18:14:25 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2022 18:14:25 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bd42891bb38d43878d0a9e204a183dbae4a2c6d0 commit bd42891bb38d43878d0a9e204a183dbae4a2c6d0 Author: Noah Goldstein Date: Thu Jun 23 10:49:19 2022 -0700 x86: Remove faulty sanity tests for RTLD build with no multiarch 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. Diff: --- 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