From: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Thu, 23 Jun 2022 17:49:19 +0000 (-0700)
Subject: x86: Remove faulty sanity tests for RTLD build with no multiarch
X-Git-Tag: glibc-2.36~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd42891bb38d43878d0a9e204a183dbae4a2c6d0;p=thirdparty%2Fglibc.git

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 --git a/sysdeps/x86_64/isa-default-impl.h b/sysdeps/x86_64/isa-default-impl.h
index 7d7832b1f53..34634668e56 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