From bd42891bb38d43878d0a9e204a183dbae4a2c6d0 Mon Sep 17 00:00:00 2001 From: Noah Goldstein Date: Thu, 23 Jun 2022 10:49:19 -0700 Subject: [PATCH] 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. --- 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