commit be41f86a80f9d6e5910ce153057560cb672a2b83 · pyrox.dev/nixpkgs

+25 -23

pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch

···

       1
       -
       From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001

     

       2
        
       From: Sergei Trofimovich <siarheit@google.com>

     

       3
        
       Date: Fri, 22 Sep 2023 22:41:49 +0100

     

       4
        
       Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid

     
···

       14
        
       

     

       15
        
       For this reason we want to remove the occurrences of hashes in the

     

       16
        
       expansion of `__FILE__`. `nuke-references` does it by replacing hashes

     

       17
       -
       by `eeeeee...` but those paths are also used for debug symbols. It is

     

       18
       -
       handy to be able to invert the transformation to go back to the original

     

       19
       -
       store path for debuginfod servers. The chosen solution is to make the

     

       20
        
       hash uppercase:

     

       21
        
       - it does not trigger runtime references (except for all digit hashes,

     

       22
        
         which are unlikely enough)

     
···

       42
        
           ...

     

       43
        
       

     

       44
        
       Mangled successfully.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
       --- a/gcc/file-prefix-map.cc

     

       46
        
       +++ b/gcc/file-prefix-map.cc

     

       47
       -
       @@ -60,6 +60,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)

     

       48
       -
          maps = map;

     

       49
       -
        }

     

       50
       -
        

     

       51
       -
       +/* Forward declaration for a $NIX_STORE remap hack below. */

     

       52
       -
       +static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map  */

     

       53
       -
       +

     

       54
       -
        /* Perform user-specified mapping of filename prefixes.  Return the

     

       55
       -
           GC-allocated new name corresponding to FILENAME or FILENAME if no

     

       56
        
           remapping was performed.  */

     

       57
       -
       @@ -76,7 +79,31 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
            if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)

     

       59
        
              break;

     

       60
        
          if (!map)

     

       61
        
       -    return filename;

     

       62
        
       +    {

     

       63
       -
       +      if (maps == macro_prefix_maps)

     

       64
        
       +	{

     

       65
        
       +	  /* Remap the 32 characters after $NIX_STORE/ to uppercase

     

       66
        
       +	  *

     
···

       76
        
       +	    {

     

       77
        
       +	       s = (char *) ggc_alloc_atomic (name_len + 1);

     

       78
        
       +	       memcpy(s, name, name_len + 1);

     

       79
       -
       +	       for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {

     

       80
        
       +		 s[i] = TOUPPER(s[i]);

     

       81
        
       +	       }

     

       82
        
       +	       return s;

     
···

       87
        
          name = filename + map->old_len;

     

       88
        
          name_len = strlen (name) + 1;

     

       89
        
        

     

       90
       -
       @@ -90,7 +117,6 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       91
       -
           ignore it in DW_AT_producer (dwarf2out.cc).  */

     

       92
       -
        

     

       93
       -
        /* Linked lists of file_prefix_map structures.  */

     

       94
       -
       -static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map  */

     

       95
       -
        static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map  */

     

       96
       -
        static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map  */

     

       97
        
        

     

       0

···

       1
       +
       From 30908556fece379ffd7c0da96c774d8bd297e459 Mon Sep 17 00:00:00 2001

     

       2
        
       From: Sergei Trofimovich <siarheit@google.com>

     

       3
        
       Date: Fri, 22 Sep 2023 22:41:49 +0100

     

       4
        
       Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid

     
···

       14
        
       

     

       15
        
       For this reason we want to remove the occurrences of hashes in the

     

       16
        
       expansion of `__FILE__`. `nuke-references` does it by replacing hashes

     

       17
       +
       by `eeeeee...`. It is handy to be able to invert the transformation to

     

       18
       +
       go back to the original store path. The chosen solution is to make the

     

       0
        
       
     

       19
        
       hash uppercase:

     

       20
        
       - it does not trigger runtime references (except for all digit hashes,

     

       21
        
         which are unlikely enough)

     
···

       41
        
           ...

     

       42
        
       

     

       43
        
       Mangled successfully.

     

       44
       +
       

     

       45
       +
       To reverse the effect of the mangle use new `NIX_GCC_DONT_MANGLE_PREFIX_MAP`

     

       46
       +
       environment variable. It should not normally be needed.

     

       47
        
       --- a/gcc/file-prefix-map.cc

     

       48
        
       +++ b/gcc/file-prefix-map.cc

     

       49
       +
       @@ -65,7 +65,7 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
           remapping was performed.  */

     

       51
       +
        

     

       52
       +
        static const char *

     

       53
       +
       -remap_filename (file_prefix_map *maps, const char *filename)

     

       54
       +
       +remap_filename (file_prefix_map *maps, const char *filename, bool mangle_nix_store = false)

     

       55
       +
        {

     

       56
       +
          file_prefix_map *map;

     

       57
       +
          char *s;

     

       58
       +
       @@ -76,7 +76,31 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       59
        
            if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0)

     

       60
        
              break;

     

       61
        
          if (!map)

     

       62
        
       -    return filename;

     

       63
        
       +    {

     

       64
       +
       +      if (mangle_nix_store && getenv("NIX_GCC_DONT_MANGLE_PREFIX_MAP") == NULL)

     

       65
        
       +	{

     

       66
        
       +	  /* Remap the 32 characters after $NIX_STORE/ to uppercase

     

       67
        
       +	  *

     
···

       77
        
       +	    {

     

       78
        
       +	       s = (char *) ggc_alloc_atomic (name_len + 1);

     

       79
        
       +	       memcpy(s, name, name_len + 1);

     

       80
       +
       +	       for (size_t i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {

     

       81
        
       +		 s[i] = TOUPPER(s[i]);

     

       82
        
       +	       }

     

       83
        
       +	       return s;

     
···

       88
        
          name = filename + map->old_len;

     

       89
        
          name_len = strlen (name) + 1;

     

       90
        
        

     

       91
       +
       @@ -129,7 +153,7 @@ add_profile_prefix_map (const char *arg)

     

       92
       +
        const char *

     

       93
       +
        remap_macro_filename (const char *filename)

     

       94
       +
        {

     

       95
       +
       -  return remap_filename (macro_prefix_maps, filename);

     

       96
       +
       +  return remap_filename (macro_prefix_maps, filename, true);

     

       97
       +
        }

     

       98
        
        

     

       99
       +
        /* Remap using -fdebug-prefix-map.  Return the GC-allocated new name

+25 -23

pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch

···

       1
       -
       From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001

     

       2
        
       From: Sergei Trofimovich <siarheit@google.com>

     

       3
        
       Date: Fri, 22 Sep 2023 22:41:49 +0100

     

       4
        
       Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid

     
···

       14
        
       

     

       15
        
       For this reason we want to remove the occurrences of hashes in the

     

       16
        
       expansion of `__FILE__`. `nuke-references` does it by replacing hashes

     

       17
       -
       by `eeeeee...` but those paths are also used for debug symbols. It is

     

       18
       -
       handy to be able to invert the transformation to go back to the original

     

       19
       -
       store path for debuginfod servers. The chosen solution is to make the

     

       20
        
       hash uppercase:

     

       21
        
       - it does not trigger runtime references (except for all digit hashes,

     

       22
        
         which are unlikely enough)

     
···

       42
        
           ...

     

       43
        
       

     

       44
        
       Mangled successfully.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
       --- a/gcc/file-prefix-map.cc

     

       46
        
       +++ b/gcc/file-prefix-map.cc

     

       47
       -
       @@ -69,6 +69,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)

     

       48
       -
          maps = map;

     

       49
       -
        }

     

       50
       -
        

     

       51
       -
       +/* Forward declaration for a $NIX_STORE remap hack below. */

     

       52
       -
       +static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map  */

     

       53
       -
       +

     

       54
       -
        /* Perform user-specified mapping of filename prefixes.  Return the

     

       55
       -
           GC-allocated new name corresponding to FILENAME or FILENAME if no

     

       56
        
           remapping was performed.  */

     

       57
       -
       @@ -102,6 +105,30 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
              break;

     

       59
        
          if (!map)

     

       60
        
            {

     

       61
       -
       +      if (maps == macro_prefix_maps)

     

       62
        
       +	{

     

       63
        
       +	  /* Remap all fo $NIX_STORE/.{32} paths to uppercase

     

       64
        
       +	   *

     
···

       74
        
       +	     {

     

       75
        
       +		s = (char *) ggc_alloc_atomic (name_len + 1);

     

       76
        
       +		memcpy(s, name, name_len + 1);

     

       77
       -
       +		for (int i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {

     

       78
        
       +		  s[i] = TOUPPER(s[i]);

     

       79
        
       +		}

     

       80
        
       +		if (realname != filename)

     
···

       85
        
              if (realname != filename)

     

       86
        
        	free (const_cast <char *> (realname));

     

       87
        
              return filename;

     

       88
       -
       @@ -124,7 +151,6 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       89
       -
           ignore it in DW_AT_producer (gen_command_line_string in opts.cc).  */

     

       90
       -
        

     

       91
       -
        /* Linked lists of file_prefix_map structures.  */

     

       92
       -
       -static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map  */

     

       93
       -
        static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map  */

     

       94
       -
        static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map  */

     

       95
        
        

     

       0

···

       1
       +
       From e160a8cd4a704f4b7724df02b62394f677cc4198 Mon Sep 17 00:00:00 2001

     

       2
        
       From: Sergei Trofimovich <siarheit@google.com>

     

       3
        
       Date: Fri, 22 Sep 2023 22:41:49 +0100

     

       4
        
       Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid

     
···

       14
        
       

     

       15
        
       For this reason we want to remove the occurrences of hashes in the

     

       16
        
       expansion of `__FILE__`. `nuke-references` does it by replacing hashes

     

       17
       +
       by `eeeeee...`. It is handy to be able to invert the transformation to

     

       18
       +
       go back to the original store path. The chosen solution is to make the

     

       0
        
       
     

       19
        
       hash uppercase:

     

       20
        
       - it does not trigger runtime references (except for all digit hashes,

     

       21
        
         which are unlikely enough)

     
···

       41
        
           ...

     

       42
        
       

     

       43
        
       Mangled successfully.

     

       44
       +
       

     

       45
       +
       To reverse the effect of the mangle use new `NIX_GCC_DONT_MANGLE_PREFIX_MAP`

     

       46
       +
       environment variable. It should not normally be needed.

     

       47
        
       --- a/gcc/file-prefix-map.cc

     

       48
        
       +++ b/gcc/file-prefix-map.cc

     

       49
       +
       @@ -74,7 +74,7 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
           remapping was performed.  */

     

       51
       +
        

     

       52
       +
        static const char *

     

       53
       +
       -remap_filename (file_prefix_map *maps, const char *filename)

     

       54
       +
       +remap_filename (file_prefix_map *maps, const char *filename, bool mangle_nix_store = false)

     

       55
       +
        {

     

       56
       +
          file_prefix_map *map;

     

       57
       +
          char *s;

     

       58
       +
       @@ -102,6 +102,30 @@ remap_filename (file_prefix_map *maps, const char *filename)

     

       59
        
              break;

     

       60
        
          if (!map)

     

       61
        
            {

     

       62
       +
       +      if (mangle_nix_store && getenv("NIX_GCC_DONT_MANGLE_PREFIX_MAP") == NULL)

     

       63
        
       +	{

     

       64
        
       +	  /* Remap all fo $NIX_STORE/.{32} paths to uppercase

     

       65
        
       +	   *

     
···

       75
        
       +	     {

     

       76
        
       +		s = (char *) ggc_alloc_atomic (name_len + 1);

     

       77
        
       +		memcpy(s, name, name_len + 1);

     

       78
       +
       +		for (size_t i = nix_store_len + 1; i < nix_store_len + 1 + 32; i++) {

     

       79
        
       +		  s[i] = TOUPPER(s[i]);

     

       80
        
       +		}

     

       81
        
       +		if (realname != filename)

     
···

       86
        
              if (realname != filename)

     

       87
        
        	free (const_cast <char *> (realname));

     

       88
        
              return filename;

     

       89
       +
       @@ -163,7 +187,7 @@ add_profile_prefix_map (const char *arg)

     

       90
       +
        const char *

     

       91
       +
        remap_macro_filename (const char *filename)

     

       92
       +
        {

     

       93
       +
       -  return remap_filename (macro_prefix_maps, filename);

     

       94
       +
       +  return remap_filename (macro_prefix_maps, filename, true);

     

       95
       +
        }

     

       96
        
        

     

       97
       +
        /* Remap using -fdebug-prefix-map.  Return the GC-allocated new name