Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (a08e17829b5f9281f4d593e6146dbdb3a8c03773)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (a08e17829b5f9281f4d593e6146dbdb3a8c03773)
  • Date: Thu, 20 Jun 2013 16:11:51 -0500

GIT changes to devel-xorg-modular grimoire by Pol Vinogradov
<vin.public AT gmail.com>:

devel/llvm/HISTORY | 4 ++
devel/llvm/PRE_BUILD | 5 ++-
devel/llvm/Tools.cpp.patch | 62
+++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)

New commits:
commit a08e17829b5f9281f4d593e6146dbdb3a8c03773
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

devel/llvm: corrected previous errors

diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index f0e25b0..412bf7e 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2013-06-20 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, Tools.cpp.patch: corrected clang directory, readded
+ slightly modified Tools.cpp patch
+
2013-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add PYTHON, zlib
* PRE_BUILD: fix build with python3
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 714b5d3..e75277d 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -2,8 +2,9 @@ default_pre_build &&
if [[ "$LLVM_WITH_CLANG" == y ]]; then
cd ${SOURCE_DIRECTORY}/tools &&
unpack_file 3 &&
- mv cfe-${VERSION}.src cfe &&
- cd ${SOURCE_DIRECTORY}
+ mv cfe-${VERSION}.src clang &&
+ cd ${SOURCE_DIRECTORY} &&
+ patch -p1 < $SPELL_DIRECTORY/Tools.cpp.patch
fi &&
# small cmake related fix for libffi
cd ${SOURCE_DIRECTORY} &&
diff --git a/devel/llvm/Tools.cpp.patch b/devel/llvm/Tools.cpp.patch
new file mode 100644
index 0000000..6f021c8
--- /dev/null
+++ b/devel/llvm/Tools.cpp.patch
@@ -0,0 +1,62 @@
+diff -Naupr a/tools/clang/lib/Driver/Tools.cpp
b/tools/clang/lib/Driver/Tools.cpp
+--- a/tools/clang/lib/Driver/Tools.cpp 2013-06-20 16:07:00.963603781 -0400
++++ b/tools/clang/lib/Driver/Tools.cpp 2013-06-20 16:21:21.170717583 -0400
+@@ -2038,8 +2038,8 @@ void Clang::ConstructJob(Compilation &C,
+ CheckCodeGenerationOptions(D, Args);
+
+ bool PIE = getToolChain().isPIEDefault();
+- bool PIC = PIE || getToolChain().isPICDefault();
+- bool IsPICLevelTwo = PIC;
++ bool pic = PIE || getToolChain().isPICDefault();
++ bool IsPICLevelTwo = pic;
+
+ // For the PIC and PIE flag options, this logic is different from the
+ // legacy logic in very old versions of GCC, as that logic was just
+@@ -2061,12 +2061,12 @@ void Clang::ConstructJob(Compilation &C,
+ 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);
+- PIC = PIE || O.matches(options::OPT_fPIC) ||
++ pic = PIE || O.matches(options::OPT_fPIC) ||
+ O.matches(options::OPT_fpic);
+ IsPICLevelTwo = O.matches(options::OPT_fPIE) ||
+ O.matches(options::OPT_fPIC);
+ } else {
+- PIE = PIC = false;
++ PIE = pic = false;
+ }
+ }
+ }
+@@ -2075,7 +2075,7 @@ void Clang::ConstructJob(Compilation &C,
+ // specified while enabling PIC enabled level 1 PIC, just force it back to
+ // level 2 PIC instead. This matches the behavior of Darwin GCC (based on
my
+ // informal testing).
+- if (PIC && getToolChain().getTriple().isOSDarwin())
++ if (pic && getToolChain().getTriple().isOSDarwin())
+ IsPICLevelTwo |= getToolChain().isPICDefault();
+
+ // Note that these flags are trump-cards. Regardless of the order w.r.t.
the
+@@ -2084,9 +2084,9 @@ void Clang::ConstructJob(Compilation &C,
+ if (KernelOrKext &&
+ (Triple.getOS() != llvm::Triple::IOS ||
+ Triple.isOSVersionLT(6)))
+- PIC = PIE = false;
++ pic = PIE = false;
+ if (Args.hasArg(options::OPT_static))
+- PIC = PIE = false;
++ pic = PIE = false;
+
+ if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {
+ // This is a very special mode. It trumps the other modes, almost no one
+@@ -2111,9 +2111,9 @@ void Clang::ConstructJob(Compilation &C,
+ // Currently, LLVM only knows about PIC vs. static; the PIE differences
are
+ // handled in Clang's IRGen by the -pie-level flag.
+ CmdArgs.push_back("-mrelocation-model");
+- CmdArgs.push_back(PIC ? "pic" : "static");
++ CmdArgs.push_back(pic ? "pic" : "static");
+
+- if (PIC) {
++ if (pic) {
+ CmdArgs.push_back("-pic-level");
+ CmdArgs.push_back(IsPICLevelTwo ? "2" : "1");
+ if (PIE) {



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (a08e17829b5f9281f4d593e6146dbdb3a8c03773), Pol Vinogradov, 06/20/2013

Archive powered by MHonArc 2.6.24.

Top of Page