From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:52606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN2kK-0005rg-K9 for guix-patches@gnu.org; Sat, 04 May 2019 18:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN2kJ-0001Bo-3T for guix-patches@gnu.org; Sat, 04 May 2019 18:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN2kJ-0001Bf-0H for guix-patches@gnu.org; Sat, 04 May 2019 18:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN2kI-0006fu-ON for guix-patches@gnu.org; Sat, 04 May 2019 18:03:02 -0400 Subject: [bug#35568] [PATCH] gnu: gcc: Add 9.1.0. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:52522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN2jg-0005qd-O4 for guix-patches@gnu.org; Sat, 04 May 2019 18:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN2jf-0000xm-9V for guix-patches@gnu.org; Sat, 04 May 2019 18:02:24 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:18960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN2je-0000wS-OB for guix-patches@gnu.org; Sat, 04 May 2019 18:02:23 -0400 Date: Sat, 04 May 2019 22:02:14 +0000 From: Carl Dong Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35568@debbugs.gnu.org * gnu/packages/gcc.scm (gcc-9): New variable. * gnu/packages/commencement.scm (gcc-toolchain-9): New variable. --- gnu/packages/commencement.scm | 3 + gnu/packages/gcc.scm | 14 +++ .../gcc-9-strmov-store-file-names.patch | 114 ++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 gnu/packages/patches/gcc-9-strmov-store-file-names.patc= h diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b07630a54d..a8ec677cee 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1085,4 +1085,7 @@ and binaries, plus debugging symbols in the @code{deb= ug} output), and Binutils." (define-public gcc-toolchain-8 (make-gcc-toolchain gcc-8)) +(define-public gcc-toolchain-9 + (make-gcc-toolchain gcc-9)) + ;;; commencement.scm ends here diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b9a9583410..eefce2737b 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -519,6 +519,20 @@ It also includes runtime support libraries for these l= anguages."))) (patches (search-patches "gcc-8-strmov-store-file-names.patc= h" "gcc-5.0-libvtv-runpath.patch")))))= ) +(define-public gcc-9 + (package + (inherit gcc-8) + (version "9.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.xz")) + (sha256 + (base32 + "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr")) + (patches (search-patches "gcc-9-strmov-store-file-names.patch" + "gcc-5.0-libvtv-runpath.patch")))))) + ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions and the gfortran definition ;; accordingly. diff --git a/gnu/packages/patches/gcc-9-strmov-store-file-names.patch b/gnu= /packages/patches/gcc-9-strmov-store-file-names.patch new file mode 100644 index 0000000000..0c5d70491a --- /dev/null +++ b/gnu/packages/patches/gcc-9-strmov-store-file-names.patch @@ -0,0 +1,114 @@ +Make sure that statements such as: + + strcpy (dst, "/gnu/store/=E2=80=A6"); + +or + + static const char str[] =3D "/gnu/store/=E2=80=A6"; + =E2=80=A6 + strcpy (dst, str); + +do not result in chunked /gnu/store strings that are undetectable by +Guix's GC and its grafting code. See +and . + +diff --git a/gcc/builtins.c b/gcc/builtins.c +index d37d73fc4a0..dac33d9d29a 100644 +--- a/gcc/builtins.c ++++ b/gcc/builtins.c +@@ -3282,6 +3282,58 @@ determine_block_size (tree len, rtx len_rtx, + =09=09=09 GET_MODE_MASK (GET_MODE (len_rtx))); + } + ++extern void debug_tree (tree); ++ ++/* Return true if STR contains the string "/gnu/store". */ ++ ++bool ++store_reference_p (tree str) ++{ ++ if (getenv ("GUIX_GCC_DEBUG") !=3D NULL) ++ debug_tree (str); ++ ++ if (TREE_CODE (str) =3D=3D ADDR_EXPR) ++ str =3D TREE_OPERAND (str, 0); ++ ++ if (TREE_CODE (str) =3D=3D VAR_DECL ++ && TREE_STATIC (str) ++ && TREE_READONLY (str)) ++ { ++ /* STR may be a 'static const' variable whose initial value ++ is a string constant. See . */ ++ str =3D DECL_INITIAL (str); ++ if (str =3D=3D NULL_TREE) ++ return false; ++ } ++ ++ if (TREE_CODE (str) !=3D STRING_CST) ++ return false; ++ ++ int len; ++ const char *store; ++ ++ store =3D getenv ("NIX_STORE") ? getenv ("NIX_STORE") : "/gnu/store"; ++ len =3D strlen (store); ++ ++ /* Size of the hash part of store file names, including leading slash a= nd ++ trailing hyphen. */ ++ const int hash_len =3D 34; ++ ++ if (TREE_STRING_LENGTH (str) < len + hash_len) ++ return false; ++ ++ /* We cannot use 'strstr' because 'TREE_STRING_POINTER' returns a strin= g ++ that is not necessarily NUL-terminated. */ ++ ++ for (int i =3D 0; i < TREE_STRING_LENGTH (str) - (len + hash_len); i++) ++ { ++ if (strncmp (TREE_STRING_POINTER (str) + i, store, len) =3D=3D 0) ++=09return true; ++ } ++ ++ return false; ++} ++ + /* Try to verify that the sizes and lengths of the arguments to a string + manipulation function given by EXP are within valid bounds and that + the operation does not lead to buffer overflow or read past the end. +@@ -3839,6 +3891,13 @@ expand_builtin_memory_copy_args (tree dest, tree sr= c, tree len, + unsigned HOST_WIDE_INT max_size; + unsigned HOST_WIDE_INT probable_max_size; + ++ /* Do not emit block moves, which translate to the 'movabs' instruction= on ++ x86_64, when SRC refers to store items. That way, store references ++ remain visible to the Guix GC and grafting code. See ++ . */ ++ if (store_reference_p (src)) ++ return NULL_RTX; ++ + /* If DEST is not a pointer type, call the normal function. */ + if (dest_align =3D=3D 0) + return NULL_RTX; +diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c +index f30818042ee..56b592f9335 100644 +--- a/gcc/gimple-fold.c ++++ b/gcc/gimple-fold.c +@@ -656,6 +656,8 @@ var_decl_component_p (tree var) + =09 && TREE_CODE (TREE_OPERAND (inner, 0)) =3D=3D ADDR_EXPR)); + } + ++extern bool store_reference_p (tree); ++ + /* Return TRUE if the SIZE argument, representing the size of an + object, is in a range of values of which exactly zero is valid. */ + +@@ -748,6 +750,9 @@ gimple_fold_builtin_memory_op (gimple_stmt_iterator *g= si, + off0 =3D build_int_cst (build_pointer_type_for_mode (char_type_node= , + =09=09=09=09=09=09=09 ptr_mode, true), 0); + ++ if (store_reference_p (src)) ++ return false; ++ + /* If we can perform the copy efficiently with first doing all load= s + and then all stores inline it that way. Currently efficiently + =09 means that we can load all the memory into a single integer -- 2.21.0