commit 3ebc7bbf61dfd9b0fa2bc65d6484ea9a44adb3e4 · pyrox.dev/nixpkgs

+49

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

···

       1
       1
       +
       Revert 55d63e731253de82e96ed4ddca2e294076cd0bc5

     

       2
       2
       +
       

     

       3
       3
       +
       --- b/sysdeps/x86/cpu-features.c

     

       4
       4
       +
       +++ a/sysdeps/x86/cpu-features.c

     

       5
       5
       +
       @@ -110,7 +110,7 @@

     

       6
       6
       +
          if (!CPU_FEATURES_CPU_P (cpu_features, RTM_ALWAYS_ABORT))

     

       7
       7
       +
            CPU_FEATURE_SET_ACTIVE (cpu_features, RTM);

     

       8
       8
       +
        

     

       9
       9
       +
       +#if CET_ENABLED

     

       10
       10
       +
       -#if CET_ENABLED && 0

     

       11
       11
       +
          CPU_FEATURE_SET_ACTIVE (cpu_features, IBT);

     

       12
       12
       +
          CPU_FEATURE_SET_ACTIVE (cpu_features, SHSTK);

     

       13
       13
       +
        #endif

     

       14
       14
       +
       reverted:

     

       15
       15
       +
       --- b/sysdeps/x86/cpu-tunables.c

     

       16
       16
       +
       +++ a/sysdeps/x86/cpu-tunables.c

     

       17
       17
       +
       @@ -35,17 +35,6 @@

     

       18
       18
       +
              break;								\

     

       19
       19
       +
            }

     

       20
       20
       +
        

     

       21
       21
       +
       -#define CHECK_GLIBC_IFUNC_CPU_BOTH(f, cpu_features, name, len)		\

     

       22
       22
       +
       -  _Static_assert (sizeof (#name) - 1 == len, #name " != " #len);	\

     

       23
       23
       +
       -  if (tunable_str_comma_strcmp_cte (&f, #name))				\

     

       24
       24
       +
       -    {									\

     

       25
       25
       +
       -      if (f.disable)							\

     

       26
       26
       +
       -	CPU_FEATURE_UNSET (cpu_features, name)				\

     

       27
       27
       +
       -      else								\

     

       28
       28
       +
       -	CPU_FEATURE_SET_ACTIVE (cpu_features, name)			\

     

       29
       29
       +
       -      break;								\

     

       30
       30
       +
       -    }

     

       31
       31
       +
       -

     

       32
       32
       +
        /* Disable a preferred feature NAME.  We don't enable a preferred feature

     

       33
       33
       +
           which isn't available.  */

     

       34
       34
       +
        #define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len)	\

     

       35
       35
       +
       @@ -142,13 +131,11 @@

     

       36
       36
       +
        	    }

     

       37
       37
       +
        	  break;

     

       38
       38
       +
        	case 5:

     

       39
       39
       +
       -	  {

     

       40
       40
       +
       -	    CHECK_GLIBC_IFUNC_CPU_BOTH (n, cpu_features, SHSTK, 5);

     

       41
       41
       +
       -	  }

     

       42
       42
       +
        	  if (n.disable)

     

       43
       43
       +
        	    {

     

       44
       44
       +
        	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, LZCNT, 5);

     

       45
       45
       +
        	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, MOVBE, 5);

     

       46
       46
       +
       +	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SHSTK, 5);

     

       47
       47
       +
        	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSSE3, 5);

     

       48
       48
       +
        	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, XSAVE, 5);

     

       49
       49
       +
        	    }

+4 -1

pkgs/development/libraries/glibc/common.nix

···

       37
       37
        
       , profilingLibraries ? false

     

       38
       38
        
       , withGd ? false

     

       39
       39
        
       , enableCET ? false

     

       40
       40
       +
       , enableCETRuntimeDefault ? false

     

       40
       41
        
       , extraBuildInputs ? []

     

       41
       42
        
       , extraNativeBuildInputs ? []

     

       42
       43
        
       , ...

     
···

       50
       51
        
       

     

       51
       52
        
       assert withLinuxHeaders -> linuxHeaders != null;

     

       52
       53
        
       assert withGd -> gd != null && libpng != null;

     

       54
       54
       +
       assert enableCET == false -> !enableCETRuntimeDefault;

     

       53
       55
        
       

     

       54
       56
        
       stdenv.mkDerivation ({

     

       55
       57
        
         version = version + patchSuffix;

     
···

       114
       116
        
             lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch

     

       115
       117
        
           )

     

       116
       118
        
           ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch

     

       117
       117
       -
           ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;

     

       119
       119
       +
           ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch

     

       120
       120
       +
           ++ lib.optional enableCETRuntimeDefault ./2.39-revert-cet-default-disable.patch;

     

       118
       121
        
       

     

       119
       122
        
         postPatch =

     

       120
       123
        
           ''

+2 -1

pkgs/development/libraries/glibc/default.nix

···

       3
       3
        
       , profilingLibraries ? false

     

       4
       4
        
       , withGd ? false

     

       5
       5
        
       , enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false

     

       6
       6
       +
       , enableCETRuntimeDefault ? false

     

       6
       7
        
       , pkgsBuildBuild

     

       7
       8
        
       , libgcc

     

       8
       9
        
       }:

     
···

       16
       17
        
       in

     

       17
       18
        
       

     

       18
       19
        
       (callPackage ./common.nix { inherit stdenv; } {

     

       19
       19
       -
         inherit withLinuxHeaders withGd profilingLibraries enableCET;

     

       20
       20
       +
         inherit withLinuxHeaders withGd profilingLibraries enableCET enableCETRuntimeDefault;

     

       20
       21
        
         pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc";

     

       21
       22
        
       }).overrideAttrs(previousAttrs: {

     

       22
       23