i386: Remove CET support bits

1. Remove _dl_runtime_resolve_shstk and _dl_runtime_profile_shstk.
2. Move CET offsets from x86 cpu-features-offsets.sym to x86-64
features-offsets.sym.
3. Rename x86 cet-control.h to x86-64 feature-control.h since it is only
for x86-64 and also used for PLT rewrite.
4. Add x86-64 ldsodefs.h to include feature-control.h.
5. Change TUNABLE_CALLBACK (set_plt_rewrite) to x86-64 only.
6. Move x86 dl-procruntime.c to x86-64.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

5 files changed, 3 insertions, 135 deletions

diff --git a/sysdeps/x86/cet-control.h b/sysdeps/x86/cet-control.h
deleted file mode 100644
index f09f193e9b..0000000000
--- a/sysdeps/x86/cet-control.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* x86 CET tuning.
-   This file is part of the GNU C Library.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _CET_CONTROL_H
-#define _CET_CONTROL_H
-
-/* For each CET feature, IBT and SHSTK, valid control values.  */
-enum dl_x86_cet_control
-{
-  /* Enable CET features based on ELF property note.  */
-  cet_elf_property = 0,
-  /* Always enable CET features.  */
-  cet_always_on,
-  /* Always disable CET features.  */
-  cet_always_off,
-  /* Enable CET features permissively.  */
-  cet_permissive
-};
-
-/* PLT rewrite control.  */
-enum dl_plt_rewrite_control
-{
-  /* No PLT rewrite.  */
-  plt_rewrite_none,
-  /* Rewrite PLT with JMP at run-time.  */
-  plt_rewrite_jmp,
-  /* Rewrite PLT with JMP and JMPABS at run-time.  */
-  plt_rewrite_jmpabs
-};
-
-struct dl_x86_feature_control
-{
-  enum dl_x86_cet_control ibt : 2;
-  enum dl_x86_cet_control shstk : 2;
-  enum dl_plt_rewrite_control plt_rewrite : 2;
-};
-
-#endif /* cet-control.h */
diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym
index 5429f60632..6a8fd29813 100644
--- a/sysdeps/x86/cpu-features-offsets.sym
+++ b/sysdeps/x86/cpu-features-offsets.sym
@@ -2,6 +2,4 @@
 
 #include <ldsodefs.h>
 
-RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features)
 XSAVE_STATE_SIZE_OFFSET	offsetof (struct cpu_features, xsave_state_size)
-RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1)
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 9ca307f521..46bdaffbc2 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -27,7 +27,7 @@
 extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *)
   attribute_hidden;
 
-#ifdef SHARED
+#if defined SHARED && defined __x86_64__
 static void
 TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp)
 {
@@ -1125,8 +1125,10 @@ no_cpuid:
 #endif
 
 #ifdef SHARED
+# ifdef __x86_64__
   TUNABLE_GET (plt_rewrite, tunable_val_t *,
 	       TUNABLE_CALLBACK (set_plt_rewrite));
+# endif
 #else
   /* NB: In libc.a, call init_cacheinfo.  */
   init_cacheinfo ();
diff --git a/sysdeps/x86/dl-procruntime.c b/sysdeps/x86/dl-procruntime.c
deleted file mode 100644
index 15b3d0d878..0000000000
--- a/sysdeps/x86/dl-procruntime.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Data for processor runtime information.  x86 version.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-/* This information must be kept in sync with the _DL_HWCAP_COUNT,
-   HWCAP_PLATFORMS_START and HWCAP_PLATFORMS_COUNT definitions in
-   dl-hwcap.h.
-
-   If anything should be added here check whether the size of each string
-   is still ok with the given array size.
-
-   All the #ifdefs in the definitions are quite irritating but
-   necessary if we want to avoid duplicating the information.  There
-   are three different modes:
-
-   - PROCINFO_DECL is defined.  This means we are only interested in
-     declarations.
-
-   - PROCINFO_DECL is not defined:
-
-     + if SHARED is defined the file is included in an array
-       initializer.  The .element = { ... } syntax is needed.
-
-     + if SHARED is not defined a normal array initialization is
-       needed.
-  */
-
-#ifndef PROCINFO_CLASS
-# define PROCINFO_CLASS
-#endif
-
-#if !IS_IN (ldconfig)
-# if !defined PROCINFO_DECL && defined SHARED
-  ._dl_x86_feature_1
-# else
-PROCINFO_CLASS unsigned int _dl_x86_feature_1
-# endif
-# ifndef PROCINFO_DECL
-= 0
-# endif
-# if !defined SHARED || defined PROCINFO_DECL
-;
-# else
-,
-# endif
-
-# if !defined PROCINFO_DECL && defined SHARED
-  ._dl_x86_feature_control
-# else
-PROCINFO_CLASS struct dl_x86_feature_control _dl_x86_feature_control
-# endif
-# ifndef PROCINFO_DECL
-= {
-    .ibt = DEFAULT_DL_X86_CET_CONTROL,
-    .shstk = DEFAULT_DL_X86_CET_CONTROL,
-    .plt_rewrite = plt_rewrite_none,
-  }
-# endif
-# if !defined SHARED || defined PROCINFO_DECL
-;
-# else
-,
-# endif
-#endif
diff --git a/sysdeps/x86/ldsodefs.h b/sysdeps/x86/ldsodefs.h
index b2a6d71513..50dc81c022 100644
--- a/sysdeps/x86/ldsodefs.h
+++ b/sysdeps/x86/ldsodefs.h
@@ -61,7 +61,6 @@ struct La_x32_retval;
 				     struct La_x86_64_retval *,		\
 				     const char *)
 
-#include <cet-control.h>
 #include_next <ldsodefs.h>
 
 #endif