diff mbox series

[v1] x86: Remove faulty sanity tests for RTLD build with no multiarch

Message ID 20220623174919.564236-1-goldstein.w.n@gmail.com
State Committed
Commit bd42891bb38d43878d0a9e204a183dbae4a2c6d0
Headers
Series [v1] x86: Remove faulty sanity tests for RTLD build with no multiarch |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Noah Goldstein June 23, 2022, 5:49 p.m. UTC 
  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(-)

Comments

H.J. Lu June 23, 2022, 5:53 p.m. UTC | #1 
On Thu, Jun 23, 2022 at 10:49 AM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
>
> 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
> --
> 2.34.1
>

LGTM.

Thanks.
diff mbox series

Patch

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