Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump libllvm and flang from 18.1.8 to 19.1.0 #21452

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+27 −13
Draft

Bump libllvm and flang from 18.1.8 to 19.1.0 #21452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e8b62
bump(libllvm): 18.1.8 to 19.1.0
finagolfin Sep 12, 2024
f7fb8f4
bump(flang): 18.1.8 to 19.1.0
finagolfin Sep 18, 2024
6a6d0c4
flang: fix-missing-CHECK_MSG-macro.patch
landfillbaby Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/flang/0003-fix-missing-CHECK_MSG-macro.patch
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... actually it might be an issue with include path priorities? we'll see if anything else is missing idioms.h stuff

Copy link
Member Author

@finagolfin finagolfin Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this patch doesn't work, no need to keep trying on this pull, as the CI has to keep building LLVM first. We can just open a separate flang pull later, once this is in.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -uNr a/flang/lib/Evaluate/constant.cpp b/flang/lib/Evaluate/constant.cpp
--- a/flang/lib/Evaluate/constant.cpp
+++ b/flang/lib/Evaluate/constant.cpp
@@ -10,6 +10,7 @@
#include "flang/Evaluate/expression.h"
#include "flang/Evaluate/shape.h"
#include "flang/Evaluate/type.h"
+#include "flang/Common/idioms.h"
#include <string>

namespace Fortran::evaluate {
6 changes: 3 additions & 3 deletions packages/flang/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="LLVM's Fortran frontend"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_LICENSE_FILE="flang/LICENSE.TXT"
TERMUX_PKG_MAINTAINER="@termux"
LLVM_MAJOR_VERSION=18
TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.8
LLVM_MAJOR_VERSION=19
TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.0
TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-$TERMUX_PKG_VERSION.src.tar.xz
TERMUX_PKG_SHA256=0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a
TERMUX_PKG_SHA256=5042522b49945bc560ff9206f25fb87980a9b89b914193ca00d961511ff0673c
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_HOSTBUILD=true
# `flang-new` should be rebuilt when libllvm bumps version.
Expand Down
6 changes: 3 additions & 3 deletions packages/libllvm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
TERMUX_PKG_LICENSE_FILE="llvm/LICENSE.TXT"
TERMUX_PKG_MAINTAINER="@finagolfin"
# Keep flang version and revision in sync when updating (enforced by check in termux_step_pre_configure).
LLVM_MAJOR_VERSION=18
TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.8
TERMUX_PKG_SHA256=0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a
LLVM_MAJOR_VERSION=19
TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.0
TERMUX_PKG_SHA256=5042522b49945bc560ff9206f25fb87980a9b89b914193ca00d961511ff0673c
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz
TERMUX_PKG_HOSTBUILD=true
Expand Down
10 changes: 5 additions & 5 deletions packages/libllvm/clang-include-clang-Driver-Options.td.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ index 59e1337599b2..656545555349 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -5370,6 +5370,12 @@
Flags<[NoArgumentUnused]>,
HelpText<"Do not add -rpath with architecture-specific resource directory to the linker flags. "
"When --hip-link is specified, do not add -rpath with HIP runtime library directory to the linker flags">;
Visibility<[ClangOption, FlangOption]>,
HelpText<"Add -rpath with architecture-specific resource directory to the linker flags. "
"When --hip-link is specified, also add -rpath with HIP runtime library directory to the linker flags">;
+defm openmp_implicit_rpath: BoolFOption<"openmp-implicit-rpath",
+ LangOpts<"OpenMP">,
+ DefaultTrue,
+ PosFlag<SetTrue, [], [ClangOption, CC1Option, FlangOption, FC1Option], "Useless option, for compatibility only">,
+ NegFlag<SetFalse>,
+ BothFlags<[NoArgumentUnused]>>;
def offload_add_rpath: Flag<["--"], "offload-add-rpath">,
def fno_rtlib_add_rpath: Flag<["-"], "fno-rtlib-add-rpath">,
Flags<[NoArgumentUnused]>,
Alias<frtlib_add_rpath>;
Visibility<[ClangOption, FlangOption]>,
@@ -4879,6 +4879,10 @@ defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_
defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
defm strength_reduce :
Expand Down
2 changes: 2 additions & 0 deletions packages/libllvm/clang.subpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ lib/clang/*/include/openmp_wrappers/
lib/clang/*/include/orc/
lib/clang/*/include/ppc_wrappers/
lib/clang/*/include/profile/
lib/clang/*/include/zos_wrappers/
lib/clang/latest
lib/cmake/clang
lib/cmake/openmp
Expand All @@ -37,6 +38,7 @@ lib/libomp.a
lib/libscanbuild/
libexec/
share/clang
share/clang-doc
share/man/man1/clang.1.gz
share/man/man1/diagtool.1.gz
share/man/man1/scan-build.1.gz
Expand Down
1 change: 1 addition & 0 deletions packages/libllvm/llvm.subpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ bin/llc
bin/lli
bin/llvm!(-jitlink-executor|-PerfectShuffle)
bin/opt
bin/reduce-chunk-list
bin/sancov
bin/sanstats
bin/split-file
Expand Down
4 changes: 2 additions & 2 deletions packages/libllvm/mlir.subpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ bin/tblgen-lsp-server
bin/tblgen-to-irdl
include/mlir*
lib/cmake/mlir/
lib/libMLIR.so
lib/libmlir*so
lib/libMLIR*.so
lib/libmlir*.so
"
TERMUX_SUBPKG_DESCRIPTION="A Multi-Level Intermediate Representation for compilers from LLVM"
TERMUX_SUBPKG_DEPENDS="libc++, ncurses"
Loading