diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2022-02-07 07:04:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 13:04:37 +0100 |
| commit | efc35c2ffc8887ced3dc0a5c56a68cd70ab87fe1 (patch) | |
| tree | 62e3c96c372ac71d58074a7d3e010d469c75274d /var/spack/repos/builtin/packages/gcc | |
| parent | 37ae4c0fdbf54194538ca9903a3149bd12a7e45f (diff) | |
| download | spack-efc35c2ffc8887ced3dc0a5c56a68cd70ab87fe1.tar.gz spack-efc35c2ffc8887ced3dc0a5c56a68cd70ab87fe1.tar.bz2 spack-efc35c2ffc8887ced3dc0a5c56a68cd70ab87fe1.tar.xz spack-efc35c2ffc8887ced3dc0a5c56a68cd70ab87fe1.zip | |
gcc: fix build on apple-clang@13 (#28801)
Diffstat (limited to 'var/spack/repos/builtin/packages/gcc')
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/darwin/clang13.patch | 32 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/package.py | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/darwin/clang13.patch b/var/spack/repos/builtin/packages/gcc/darwin/clang13.patch new file mode 100644 index 0000000000..ac3bfcbe24 --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc/darwin/clang13.patch @@ -0,0 +1,32 @@ +--- a/gcc/genconditions.c 2019-01-01 12:37:19.064943662 +0100 ++++ b/gcc/genconditions.c 2019-10-11 10:57:11.464595789 +0200 +@@ -57,8 +57,9 @@ write_header (void) + \n\ + /* It is necessary, but not entirely safe, to include the headers below\n\ + in a generator program. As a defensive measure, don't do so when the\n\ +- table isn't going to have anything in it. */\n\ +-#if GCC_VERSION >= 3001\n\ ++ table isn't going to have anything in it.\n\ ++ Clang 9 is buggy and doesn't handle __builtin_constant_p correctly. */\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + \n\ + /* Do not allow checking to confuse the issue. */\n\ + #undef CHECKING_P\n\ +@@ -170,7 +171,7 @@ struct c_test\n\ + vary at run time. It works in 3.0.1 and later; 3.0 only when not\n\ + optimizing. */\n\ + \n\ +-#if GCC_VERSION >= 3001\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + static const struct c_test insn_conditions[] = {\n"); + + traverse_c_tests (write_one_condition, 0); +@@ -191,7 +192,7 @@ write_writer (void) + " unsigned int i;\n" + " const char *p;\n" + " puts (\"(define_conditions [\");\n" +- "#if GCC_VERSION >= 3001\n" ++ "#if GCC_VERSION >= 3001 && __clang_major__ < 9\n" + " for (i = 0; i < ARRAY_SIZE (insn_conditions); i++)\n" + " {\n" + " printf (\" (%d \\\"\", insn_conditions[i].value);\n" diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index ae7012db0d..487c6d9517 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -277,6 +277,9 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3') patch('darwin/gcc-4.9.patch2', when='@4.9.0:4.9.3') + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92061 + patch('darwin/clang13.patch', when='@:11.1 %apple-clang@13') + patch('piclibs.patch', when='+piclibs') patch('gcc-backport.patch', when='@4.7:4.9.3,5:5.3') |