Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c37a43705114edab0b179ddb79e1f3f4bf101984)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c37a43705114edab0b179ddb79e1f3f4bf101984)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c37a43705114edab0b179ddb79e1f3f4bf101984)
  • Date: Thu, 20 Sep 2018 13:23:02 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/llvm/0001-fix-compile-error-clang.patch | 46
+++++++++++++++-----------
devel/llvm/0001-fix-compile-error.patch | 16 ++++-----
devel/llvm/DETAILS | 2 -
devel/llvm/HISTORY | 5 ++
4 files changed, 42 insertions(+), 27 deletions(-)

New commits:
commit c37a43705114edab0b179ddb79e1f3f4bf101984
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/llvm: version 7.0.0

diff --git a/devel/llvm/0001-fix-compile-error-clang.patch
b/devel/llvm/0001-fix-compile-error-clang.patch
index c453d42..9a47821 100644
--- a/devel/llvm/0001-fix-compile-error-clang.patch
+++ b/devel/llvm/0001-fix-compile-error-clang.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix compile error
diff -Naupr llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
llvm-5.0.1.src.backup/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
--- llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
2017-07-04 21:55:56.000000000 +0200
+++ llvm-5.0.1.src.backup/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
2017-12-22 14:16:54.892562370 +0100
-@@ -751,11 +751,11 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -865,11 +865,11 @@
const llvm::Triple &Triple = ToolChain.getTriple();

bool PIE = ToolChain.isPIEDefault();
@@ -21,7 +21,7 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm

bool KernelOrKext =
Args.hasArg(options::OPT_mkernel, options::OPT_fapple_kext);
-@@ -772,12 +772,12 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -886,12 +886,12 @@
case llvm::Triple::mipsel:
case llvm::Triple::mips64:
case llvm::Triple::mips64el:
@@ -36,7 +36,16 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm
IsPICLevelTwo = true;
break;

-@@ -837,17 +837,17 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -926,7 +926,7 @@
+
+ // AMDGPU-specific defaults for PIC.
+ if (Triple.getArch() == llvm::Triple::amdgcn)
+- PIC = true;
++ pic = true;
+
+ // The last argument relating to either PIC or PIE wins, and no
+ // other argument is used. If the last argument is any flavor of the
+@@ -955,17 +955,17 @@
if (O.matches(options::OPT_fPIC) || O.matches(options::OPT_fpic) ||
O.matches(options::OPT_fPIE) || O.matches(options::OPT_fpie)) {
PIE = O.matches(options::OPT_fPIE) || O.matches(options::OPT_fpie);
@@ -57,7 +66,7 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm
ToolChain.getDriver().Diag(diag::warn_drv_ps4_force_pic)
<< LastPICArg->getSpelling();
}
-@@ -859,7 +859,7 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -977,7 +977,7 @@
// Introduce a Darwin and PS4-specific hack. If the default is PIC, but
the
// PIC level would've been set to level 1, force it back to level 2 PIC
// instead.
@@ -66,7 +75,7 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm
IsPICLevelTwo |= ToolChain.isPICDefault();

// This kernel flags are a trump-card: they will disable PIC/PIE
-@@ -867,7 +867,7 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -985,7 +985,7 @@
if (KernelOrKext &&
((!EffectiveTriple.isiOS() || EffectiveTriple.isOSVersionLT(6)) &&
!EffectiveTriple.isWatchOS()))
@@ -75,7 +84,7 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm

if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {
// This is a very special mode. It trumps the other modes, almost no one
-@@ -881,9 +881,9 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -999,9 +999,9 @@
// Only a forced PIC mode can cause the actual compile to have PIC
defines
// etc., no flags are sufficient. This behavior was selected to closely
// match that of llvm-gcc and Apple GCC before that.
@@ -87,25 +96,26 @@ diff -Naupr
llvm-5.0.1.src/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp llvm
}

bool EmbeddedPISupported;
-@@ -916,7 +916,7 @@ tools::ParsePICArgs(const ToolChain &Too
+@@ -1045,7 +1045,7 @@
+ // when the -mno-abicalls option is used. In that case we exit
+ // at next check regardless of PIC being set below.
+ if (ABIName == "n64")
+- PIC = true;
++ pic = true;
+ // When targettng MIPS with -mno-abicalls, it's always static.
+ if(Args.hasArg(options::OPT_mno_abicalls))
+ return std::make_tuple(llvm::Reloc::Static, 0U, false);
+@@ -1054,7 +1054,7 @@
+ IsPICLevelTwo = false;
}

- // ROPI and RWPI are not comaptible with PIC or PIE.
-- if ((ROPI || RWPI) && (PIC || PIE))
-+ if ((ROPI || RWPI) && (pic || PIE))
-
ToolChain.getDriver().Diag(diag::err_drv_ropi_rwpi_incompatible_with_pic);
-
- // When targettng MIPS64 with N64, the default is PIC, unless
-mno-abicalls is
-@@ -926,7 +926,7 @@ tools::ParsePICArgs(const ToolChain &Too
- Args.hasArg(options::OPT_mno_abicalls))
- return std::make_tuple(llvm::Reloc::Static, 0U, false);
-
- if (PIC)
+ if (pic)
return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2U : 1U, PIE);

llvm::Reloc::Model RelocM = llvm::Reloc::Static;
-diff -Naupr llvm-5.0.1.src/tools/clang/tools/driver/cc1as_main.cpp
llvm-5.0.1.src.backup/tools/clang/tools/driver/cc1as_main.cpp
+diff -Naupr llvm-5.0.1.src/tools/clang/tools/driver/cc1as_main.cpp
+llvm-5.0.1.src.backup/tools/clang/tools/driver/cc1as_main.cpp
--- llvm-5.0.1.src/tools/clang/tools/driver/cc1as_main.cpp 2017-06-23
17:34:16.000000000 +0200
+++ llvm-5.0.1.src.backup/tools/clang/tools/driver/cc1as_main.cpp
2017-12-22 14:34:14.280013328 +0100
@@ -345,18 +345,18 @@ static bool ExecuteAssembler(AssemblerIn
diff --git a/devel/llvm/0001-fix-compile-error.patch
b/devel/llvm/0001-fix-compile-error.patch
index a89ad76..b98fa7c 100644
--- a/devel/llvm/0001-fix-compile-error.patch
+++ b/devel/llvm/0001-fix-compile-error.patch
@@ -108,10 +108,10 @@ diff --git a/lib/Transforms/Utils/PredicateInfo.cpp
b/lib/Transforms/Utils/Predi
index d4cdaed..5fcd5dd 100644
--- a/lib/Transforms/Utils/PredicateInfo.cpp
+++ b/lib/Transforms/Utils/PredicateInfo.cpp
-@@ -508,10 +508,10 @@ Value *PredicateInfo::materializeStack(unsigned int
&Counter,
- IRBuilder<> B(getBranchTerminator(ValInfo));
- Function *IF = Intrinsic::getDeclaration(
- F.getParent(), Intrinsic::ssa_copy, Op->getType());
+@@ -525,10 +525,10 @@
+ Function *IF = getCopyDeclaration(F.getParent(), Op->getType());
+ if (IF->user_begin() == IF->user_end())
+ CreatedDeclarations.insert(IF);
- CallInst *PIC =
+ CallInst *pic =
B.CreateCall(IF, Op, Op->getName() + "." + Twine(Counter++));
@@ -122,10 +122,10 @@ index d4cdaed..5fcd5dd 100644
} else {
auto *PAssume = dyn_cast<PredicateAssume>(ValInfo);
assert(PAssume &&
-@@ -519,9 +519,9 @@ Value *PredicateInfo::materializeStack(unsigned int
&Counter,
- IRBuilder<> B(PAssume->AssumeInst);
- Function *IF = Intrinsic::getDeclaration(
- F.getParent(), Intrinsic::ssa_copy, Op->getType());
+@@ -537,9 +537,9 @@
+ Function *IF = getCopyDeclaration(F.getParent(), Op->getType());
+ if (IF->user_begin() == IF->user_end())
+ CreatedDeclarations.insert(IF);
- CallInst *PIC = B.CreateCall(IF, Op);
- PredicateMap.insert({PIC, ValInfo});
- Result.Def = PIC;
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 02f06ab..1d550f8 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=llvm
- VERSION="6.0.1"
+ VERSION="7.0.0"
SOURCE="${SPELL}-${VERSION}.src.tar.xz"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://${SPELL}.org/releases/${VERSION}/${SOURCE}
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 2046b31..fd610e9 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,8 @@
+2018-09-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 7.0.0
+ * 0001-fix-compile-error.patch, 0001-fix-compile-error-clang.patch:
+ updated the patches
+
2018-06-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 6.0.1



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c37a43705114edab0b179ddb79e1f3f4bf101984), Pavel Vinogradov, 09/20/2018

Archive powered by MHonArc 2.6.24.

Top of Page