diff options
author | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
commit | 194451347dc60092132d06b84a83c5205d79299a (patch) | |
tree | 828475b685c349cdd7b74c09beb7336d38bdf6f0 /gnu/packages/patches/gcc-strmov-store-file-names.patch | |
parent | 37c6f11f8dfa1880db86a3510c9e50990304d76c (diff) | |
parent | 8cddb0d6363d13f74de5409ef29b7913228f49b9 (diff) | |
download | guix-194451347dc60092132d06b84a83c5205d79299a.tar guix-194451347dc60092132d06b84a83c5205d79299a.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/gcc-strmov-store-file-names.patch')
-rw-r--r-- | gnu/packages/patches/gcc-strmov-store-file-names.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/patches/gcc-strmov-store-file-names.patch b/gnu/packages/patches/gcc-strmov-store-file-names.patch index 9f9162855d..7358de3326 100644 --- a/gnu/packages/patches/gcc-strmov-store-file-names.patch +++ b/gnu/packages/patches/gcc-strmov-store-file-names.patch @@ -15,7 +15,7 @@ and <https://bugs.gnu.org/30395>. --- gcc-5.3.0/gcc/builtins.c 2016-10-18 10:50:46.080616285 +0200 +++ gcc-5.3.0/gcc/builtins.c 2016-11-09 15:26:43.693042737 +0100 -@@ -3192,6 +3192,54 @@ determine_block_size (tree len, rtx len_ +@@ -3192,6 +3192,58 @@ determine_block_size (tree len, rtx len_ GET_MODE_MASK (GET_MODE (len_rtx))); } @@ -35,9 +35,13 @@ and <https://bugs.gnu.org/30395>. + if (TREE_CODE (str) == VAR_DECL + && TREE_STATIC (str) + && TREE_READONLY (str)) -+ /* STR may be a 'static const' variable whose initial value -+ is a string constant. See <https://bugs.gnu.org/30395>. */ -+ str = DECL_INITIAL (str); ++ { ++ /* STR may be a 'static const' variable whose initial value ++ is a string constant. See <https://bugs.gnu.org/30395>. */ ++ str = DECL_INITIAL (str); ++ if (str == NULL_TREE) ++ return false; ++ } + + if (TREE_CODE (str) != STRING_CST) + return false; |