Skip to content

Commit

Permalink
devel/llvm-devel: update to a new snapshot
Browse files Browse the repository at this point in the history
Remove no longer needed workaround for flang build and float128.
  • Loading branch information
brooksdavis committed Nov 9, 2022
1 parent 1324daf commit 1b29ddc
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 56 deletions.
3 changes: 2 additions & 1 deletion devel/llvm-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,11 @@ post-install-EXTRAS-on:
post-install-FLANG-on:
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CodeGen/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Dialect/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/HLFIR/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles
.if ${SNAPDATE} == 20220928
.if ${SNAPDATE} == 20221107
# expected to be temporary
${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
${STAGEDIR}${LLVM_PREFIX}/bin/flang
Expand Down
2 changes: 2 additions & 0 deletions devel/llvm-devel/Makefile.COMMANDS
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LLVM_COMMANDS= \
llvm-cov \
llvm-cvtres \
llvm-cxxmap \
llvm-debuginfo-analyzer \
llvm-debuginfod \
llvm-debuginfod-find \
llvm-diff \
Expand Down Expand Up @@ -94,6 +95,7 @@ EXTRAS_COMMANDS= \
clang-apply-replacements \
clang-change-namespace \
clang-doc \
clang-include-cleaner \
clang-include-fixer \
clang-move \
clang-pseudo \
Expand Down
1 change: 1 addition & 0 deletions devel/llvm-devel/Makefile.MAN1SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ LLVM_MAN1SRCS= \
llvm-cov.1 \
llvm-cxxfilt.1 \
llvm-cxxmap.1 \
llvm-debuginfo-analyzer.1 \
llvm-diff.1 \
llvm-dis.1 \
llvm-dwarfdump.1 \
Expand Down
4 changes: 2 additions & 2 deletions devel/llvm-devel/Makefile.snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#
LLVM_MAJOR= 16
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
SNAPDATE= 20220928
SNAPDATE= 20221107

LLVM_PROJECT_COMMIT= 60727d856927383daf304fcf8f19fcc8ade828ad
LLVM_PROJECT_COMMIT= fdf22598862a072fe6136bc0484b5747e68da20d
6 changes: 3 additions & 3 deletions devel/llvm-devel/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1664386770
SHA256 (llvm-llvm-project-16.0.d20220928-60727d856927383daf304fcf8f19fcc8ade828ad_GH0.tar.gz) = 71ffc52c9040df69b59f74ed336f5b104b38f6c1f2dbb20f7fbf3f4d1063a5e5
SIZE (llvm-llvm-project-16.0.d20220928-60727d856927383daf304fcf8f19fcc8ade828ad_GH0.tar.gz) = 168890962
TIMESTAMP = 1667848724
SHA256 (llvm-llvm-project-16.0.d20221107-fdf22598862a072fe6136bc0484b5747e68da20d_GH0.tar.gz) = 88c0e965a975eb54dae1f1574c95538f7b10e155f7014a832c1e096b244f22b0
SIZE (llvm-llvm-project-16.0.d20221107-fdf22598862a072fe6136bc0484b5747e68da20d_GH0.tar.gz) = 170383624

This file was deleted.

20 changes: 20 additions & 0 deletions devel/llvm-devel/files/patch-openmp_runtime_src_z__Linux__util.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- openmp/runtime/src/z_Linux_util.cpp.orig
+++ openmp/runtime/src/z_Linux_util.cpp
@@ -130,14 +130,14 @@
#elif KMP_OS_FREEBSD
#define KMP_CPU_SET_SIZE_LIMIT (sizeof(cpuset_t))
#endif
+ int verbose = __kmp_affinity.flags.verbose;
+ int warnings = __kmp_affinity.flags.warnings;
+ enum affinity_type type = __kmp_affinity.type;

#if KMP_OS_LINUX
long gCode;
unsigned char *buf;
buf = (unsigned char *)KMP_INTERNAL_MALLOC(KMP_CPU_SET_SIZE_LIMIT);
- int verbose = __kmp_affinity.flags.verbose;
- int warnings = __kmp_affinity.flags.warnings;
- enum affinity_type type = __kmp_affinity.type;

// If the syscall returns a suggestion for the size,
// then we don't have to search for an appropriate size.
235 changes: 196 additions & 39 deletions devel/llvm-devel/pkg-plist

Large diffs are not rendered by default.

0 comments on commit 1b29ddc

Please sign in to comment.