diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/gcc.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/gcc-hurd-split-stack.patch | 39 |
2 files changed, 41 insertions, 1 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1bdcce12369..9265bd1b8b3 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1065,7 +1065,8 @@ It also includes runtime support libraries for these languages.") (base32 "0knj4ph6y7r7yhnp1v4339af7mki5nkh7ni9b948433bhabdk3s3")) (patches (search-patches "gcc-12-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch")) + "gcc-5.0-libvtv-runpath.patch" + "gcc-hurd-split-stack.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments diff --git a/gnu/packages/patches/gcc-hurd-split-stack.patch b/gnu/packages/patches/gcc-hurd-split-stack.patch new file mode 100644 index 00000000000..b9184143845 --- /dev/null +++ b/gnu/packages/patches/gcc-hurd-split-stack.patch @@ -0,0 +1,39 @@ +Patch from https://gcc.gnu.org/cgit/gcc/commit/?id=29eacf043b6e8560c5c42d67f7f9b11e4e2cb156 + +See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104290 + +From 29eacf043b6e8560c5c42d67f7f9b11e4e2cb156 Mon Sep 17 00:00:00 2001 +From: Svante Signell <svante.signell@gmail.com> +Date: Sun, 6 Feb 2022 11:43:23 +0000 +Subject: hurd: Add OPTION_GLIBC_P and OPTION_GLIBC + +GNU/Hurd uses glibc just like GNU/Linux. + +This is needed for gcc to notice that glibc supports split stack in +finish_options. + + PR go/104290 +gcc/ChangeLog: + * config/gnu.h (OPTION_GLIBC_P, OPTION_GLIBC): Define. +--- + gcc/config/gnu.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gcc/config/gnu.h b/gcc/config/gnu.h +index 6b8f36bd3d2a..825e7434d404 100644 +--- a/gcc/config/gnu.h ++++ b/gcc/config/gnu.h +@@ -19,6 +19,10 @@ You should have received a copy of the GNU General Public License + along with GCC. If not, see <http://www.gnu.org/licenses/>. + */ + ++/* C libraries used on GNU/Hurd. */ ++#define OPTION_GLIBC_P(opts) (DEFAULT_LIBC == LIBC_GLIBC) ++#define OPTION_GLIBC OPTION_GLIBC_P (&global_options) ++ + #undef GNU_USER_TARGET_OS_CPP_BUILTINS + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ + do { \ +-- +cgit + |