From f7839edcdaed8a56ce752fa0928159d64a012ef5 Mon Sep 17 00:00:00 2001 From: js Date: Mon, 17 Oct 2022 13:48:28 +0000 Subject: cross/ppc-morphos-gcc-11: Add patch to fix ObjC foreach --- cross/ppc-morphos-gcc-11/Makefile | 4 ++-- cross/ppc-morphos-gcc-11/distinfo | 3 ++- cross/ppc-morphos-gcc-11/patches/patch-gcc_c_c-typeck.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 cross/ppc-morphos-gcc-11/patches/patch-gcc_c_c-typeck.c (limited to 'cross') diff --git a/cross/ppc-morphos-gcc-11/Makefile b/cross/ppc-morphos-gcc-11/Makefile index 0b8e40de90c..68e6bfb87cc 100644 --- a/cross/ppc-morphos-gcc-11/Makefile +++ b/cross/ppc-morphos-gcc-11/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2022/10/17 13:25:31 js Exp $ +# $NetBSD: Makefile,v 1.2 2022/10/17 13:48:28 js Exp $ DISTNAME= sdk-source-20220302 PKGNAME= ppc-morphos-gcc-11-11.2.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= cross MASTER_SITES= https://morphos-team.net/files/src/sdk/ EXTRACT_SUFX= .tar.xz diff --git a/cross/ppc-morphos-gcc-11/distinfo b/cross/ppc-morphos-gcc-11/distinfo index e976563c0ed..cfb17ea4b9b 100644 --- a/cross/ppc-morphos-gcc-11/distinfo +++ b/cross/ppc-morphos-gcc-11/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.1 2022/10/17 13:25:31 js Exp $ +$NetBSD: distinfo,v 1.2 2022/10/17 13:48:28 js Exp $ BLAKE2s (sdk-source-20220302.tar.xz) = 7c55130c19db6253bc32882f5fa37fc8b2ac57a821e22e89d0cb2fd03a961a4b SHA512 (sdk-source-20220302.tar.xz) = 4f476eae9d70fbe6c184dbf6aa2613873830a1fe02fc2bf60f5becea5209429600d14f09ac3442ba3f6cfcd1de348383edb947692232161f5a46af3dd3173084 Size (sdk-source-20220302.tar.xz) = 553259612 bytes SHA1 (patch-config_override.m4) = 1ee0186b006a987dc57151a9d112654eabd24db9 +SHA1 (patch-gcc_c_c-typeck.c) = c2eb246b7cc7e03a535a71d642e7552f4d8d290f SHA1 (patch-gcc_config_host-darwin.c) = 62d75a4ce61a0ae42a756c9fd1476a329bb44600 SHA1 (patch-gcc_config_rs6000_morphos.h) = c788e480f3f510b61292f5b1ec5b84646b33ab93 SHA1 (patch-libcc1_configure.ac) = ca40be7af4a4ffc3a4fba1a0dbda76fcde1fa2d9 diff --git a/cross/ppc-morphos-gcc-11/patches/patch-gcc_c_c-typeck.c b/cross/ppc-morphos-gcc-11/patches/patch-gcc_c_c-typeck.c new file mode 100644 index 00000000000..2a362b00cb9 --- /dev/null +++ b/cross/ppc-morphos-gcc-11/patches/patch-gcc_c_c-typeck.c @@ -0,0 +1,16 @@ +$NetBSD: patch-gcc_c_c-typeck.c,v 1.1 2022/10/17 13:48:28 js Exp $ + +https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=222dbebefbbc07f78e51d82ba605988ef57e5fc9 + +--- gcc/c/c-typeck.c.orig 2021-07-28 06:55:06.988283174 +0000 ++++ gcc/c/c-typeck.c +@@ -11216,7 +11216,8 @@ c_finish_bc_stmt (location_t loc, tree l + + if (skip) + return NULL_TREE; +- else if (in_statement & IN_OBJC_FOREACH) ++ else if ((in_statement & IN_OBJC_FOREACH) ++ && !(is_break && (in_statement & IN_SWITCH_STMT))) + { + /* The foreach expander produces low-level code using gotos instead + of a structured loop construct. */ -- cgit v1.2.3