rpms/flang
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup, normalize and rename patch serie

Browse Source
This commit is contained in:
serge-sans-paille 2021-02-25 15:22:21 +01:00
parent db2dbee658
commit 442013aff1
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-flang-Disable-use-of-sphinx_markdown_tables.patch → 0001-PATCH-flang-Disable-use-of-sphinx_markdown_tables.patch
View File

@ -1,14 +1,14 @@
From 2e323ada8187a3148b17ffb4cac51596275d7583 Mon Sep 17 00:00:00 2001 From b577afbc012078da92c04b0e52b38c09a2f6fb51 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com> From: Tom Stellard <tstellar@redhat.com>
Date: Fri, 19 Feb 2021 19:49:41 -0800 Date: Fri, 19 Feb 2021 19:49:41 -0800
Subject: [PATCH] flang: Disable use of sphinx_markdown_tables Subject: [PATCH 1/2] [PATCH][flang] Disable use of sphinx_markdown_tables
--- ---
flang/docs/conf.py | 2 +- flang/docs/conf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flang/docs/conf.py b/flang/docs/conf.py diff --git a/flang/docs/conf.py b/flang/docs/conf.py
index 7ad291526b69..da72db5a0850 100644 index 7ad2915..da72db5 100644
--- a/flang/docs/conf.py --- a/flang/docs/conf.py
+++ b/flang/docs/conf.py +++ b/flang/docs/conf.py
@@ -54,7 +54,7 @@ else: @@ -54,7 +54,7 @@ else:
@ -21,5 +21,5 @@ index 7ad291526b69..da72db5a0850 100644
# Setup AutoStructify for inline .rst toctrees in index.md # Setup AutoStructify for inline .rst toctrees in index.md
from recommonmark.transform import AutoStructify from recommonmark.transform import AutoStructify
-- --
2.27.0 1.8.3.1

8
0001-flang-Fix-build-with-gcc-11.patch → 0002-PATCH-flang-Fix-build-with-gcc-11.patch
View File

@ -1,14 +1,14 @@
From 98ef88a707625d75101e7eae836ba2f4303da9c9 Mon Sep 17 00:00:00 2001 From 1f00502316d003f36a87ab25f51e1fc2d3274a5b Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com> From: Tom Stellard <tstellar@redhat.com>
Date: Fri, 19 Feb 2021 19:46:12 -0800 Date: Fri, 19 Feb 2021 19:46:12 -0800
Subject: [PATCH] flang: Fix build with gcc 11 Subject: [PATCH 2/2] [PATCH][flang] Fix build with gcc 11
--- ---
flang/runtime/unit.cpp | 1 + flang/runtime/unit.cpp | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/flang/runtime/unit.cpp b/flang/runtime/unit.cpp diff --git a/flang/runtime/unit.cpp b/flang/runtime/unit.cpp
index 85d83ec50bd9..dbd4b6b79311 100644 index 85d83ec..dbd4b6b 100644
--- a/flang/runtime/unit.cpp --- a/flang/runtime/unit.cpp
+++ b/flang/runtime/unit.cpp +++ b/flang/runtime/unit.cpp
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -20,5 +20,5 @@ index 85d83ec50bd9..dbd4b6b79311 100644
namespace Fortran::runtime::io { namespace Fortran::runtime::io {
-- --
2.27.0 1.8.3.1

4
flang.spec
View File

@ -17,8 +17,8 @@ Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{versio
Source2: tstellar-gpg-key.asc Source2: tstellar-gpg-key.asc
# Needed for documentation generation # Needed for documentation generation
Patch1: 0001-flang-Disable-use-of-sphinx_markdown_tables.patch Patch1: 0001-PATCH-flang-Disable-use-of-sphinx_markdown_tables.patch
Patch2: 0001-flang-Fix-build-with-gcc-11.patch Patch2: 0002-PATCH-flang-Fix-build-with-gcc-11.patch
# because mlir doesn't build on arm (yet) # because mlir doesn't build on arm (yet)
ExcludeArch: armv7hl ExcludeArch: armv7hl

13
token-sequence.patch
View File

@ -1,13 +0,0 @@
diff -Naur flang-11.0.0rc2.src.orig/lib/Parser/token-sequence.cpp flang-11.0.0rc2.src/lib/Parser/token-sequence.cpp
--- flang-11.0.0rc2.src.orig/lib/Parser/token-sequence.cpp 2020-09-03 12:01:15.278223312 +0000
+++ flang-11.0.0rc2.src/lib/Parser/token-sequence.cpp 2020-09-03 12:51:40.082870848 +0000
@@ -134,7 +134,8 @@
std::size_t atToken{0};
for (std::size_t j{0}; j < chars;) {
std::size_t nextStart{atToken + 1 < tokens ? start_[++atToken] : chars};
- char *p{&char_[j]}, *limit{&char_[nextStart]};
+ char *p{&char_[j]};
+ char const* limit{char_.data() + nextStart};
j = nextStart;
if (IsDecimalDigit(*p)) {
while (p < limit && IsDecimalDigit(*p)) {