pkgs/development/libraries/glibc/2.39-revert-cet-default-disable.patch

   1 Revert 55d63e731253de82e96ed4ddca2e294076cd0bc5
   2
   3 --- b/sysdeps/x86/cpu-features.c
   4 +++ a/sysdeps/x86/cpu-features.c
   5 @@ -110,7 +110,7 @@
   6    if (!CPU_FEATURES_CPU_P (cpu_features, RTM_ALWAYS_ABORT))
   7      CPU_FEATURE_SET_ACTIVE (cpu_features, RTM);
   8
   9 +#if CET_ENABLED
  10 -#if CET_ENABLED && 0
  11    CPU_FEATURE_SET_ACTIVE (cpu_features, IBT);
  12    CPU_FEATURE_SET_ACTIVE (cpu_features, SHSTK);
  13  #endif
  14 reverted:
  15 --- b/sysdeps/x86/cpu-tunables.c
  16 +++ a/sysdeps/x86/cpu-tunables.c
  17 @@ -35,17 +35,6 @@
  18        break;                                                           \
  19      }
  20
  21 -#define CHECK_GLIBC_IFUNC_CPU_BOTH(f, cpu_features, name, len)         \
  22 -  _Static_assert (sizeof (#name) - 1 == len, #name " != " #len);       \
  23 -  if (tunable_str_comma_strcmp_cte (&f, #name))                                \
  24 -    {                                                                  \
  25 -      if (f.disable)                                                   \
  26 -       CPU_FEATURE_UNSET (cpu_features, name)                          \
  27 -      else                                                             \
  28 -       CPU_FEATURE_SET_ACTIVE (cpu_features, name)                     \
  29 -      break;                                                           \
  30 -    }
  31 -
  32  /* Disable a preferred feature NAME.  We don't enable a preferred feature
  33     which isn't available.  */
  34  #define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len)    \
  35 @@ -142,13 +131,11 @@
  36             }
  37           break;
  38         case 5:
  39 -         {
  40 -           CHECK_GLIBC_IFUNC_CPU_BOTH (n, cpu_features, SHSTK, 5);
  41 -         }
  42           if (n.disable)
  43             {
  44               CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, LZCNT, 5);
  45               CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, MOVBE, 5);
  46 +             CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SHSTK, 5);
  47               CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSSE3, 5);
  48               CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, XSAVE, 5);
  49             }