From 7de85a260324e7085a409d767e045458bcddb1bf Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 21 Jan 2020 14:37:47 +0100 Subject: [PATCH] 10.0.1-0.4 --- gcc.spec | 2 ++ gcc10-libcpp-lex-workaround.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 gcc10-libcpp-lex-workaround.patch diff --git a/gcc.spec b/gcc.spec index 346eef5..29b2779 100644 --- a/gcc.spec +++ b/gcc.spec @@ -259,6 +259,7 @@ Patch8: gcc10-foffload-default.patch Patch9: gcc10-Wno-format-security.patch Patch10: gcc10-rh1574936.patch Patch11: gcc10-d-shared-libphobos.patch +Patch12: gcc10-libcpp-lex-workaround.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -770,6 +771,7 @@ to NVidia PTX capable devices if available. %patch10 -p0 -b .rh1574936~ %endif %patch11 -p0 -b .d-shared-libphobos~ +%patch12 -p0 -b .libcpp-lex-workaround~ echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE diff --git a/gcc10-libcpp-lex-workaround.patch b/gcc10-libcpp-lex-workaround.patch new file mode 100644 index 0000000..bcf5a33 --- /dev/null +++ b/gcc10-libcpp-lex-workaround.patch @@ -0,0 +1,20 @@ +--- libcpp/lex.c 2020-01-12 11:54:38.565380941 +0100 ++++ libcpp/lex.c 2020-01-21 14:35:36.182794214 +0100 +@@ -752,7 +752,7 @@ search_line_fast (const uchar *s, const + } + } + +-#elif defined (__ARM_NEON) && defined (__ARM_64BIT_STATE) ++#elif defined (__ARM_NEON) && defined (__ARM_64BIT_STATE) && __has_include("arm_bf16.h") + #include "arm_neon.h" + + /* This doesn't have to be the exact page size, but no system may use +@@ -847,7 +847,7 @@ done: + + __builtin_ctz (found)); + } + +-#elif defined (__ARM_NEON) ++#elif defined (__ARM_NEON) && __has_include("arm_bf16.h") + #include "arm_neon.h" + + static const uchar *