Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (9175ec5f29179c6e45a9350febf26060577edbeb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (9175ec5f29179c6e45a9350febf26060577edbeb)
  • Date: Sat, 23 Mar 2013 18:56:44 -0500

GIT changes to devel-xorg-modular grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/llvm/HISTORY | 4 ++
devel/llvm/PRE_BUILD | 3 +
devel/llvm/Tools.cpp.patch | 70
+++++++++++++++++++++++++++++++++++++++++++++
devel/llvm/gcc-4.7.patch | 10 ------
4 files changed, 76 insertions(+), 11 deletions(-)

New commits:
commit 9175ec5f29179c6e45a9350febf26060577edbeb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/llvm: fix compile error

commit ef5c0a1b7e0cd50d583136afd329a66a47840728
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/llvm: remove unused patch

diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 26ed6c1..619d512 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2013-02-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * gcc-4.7.patch: remove unused patch
+ * Tools.cpp.patch, PRE_BUILD: fix compile error if clang is enabled
+
2012-12-24 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.2
* E95C63DC.gpg: removed
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 60693bd..9e7d49e 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -11,5 +11,6 @@ if spell_ok libffi;then
FFI=${FFI//-I/} &&
FFI=${FFI//\ */} &&
sed -i "/FFI_I/s|\"\"|\"$FFI\"|" CMakeLists.txt
-fi
+fi &&
+patch -p1 < $SPELL_DIRECTORY/Tools.cpp.patch

diff --git a/devel/llvm/Tools.cpp.patch b/devel/llvm/Tools.cpp.patch
new file mode 100644
index 0000000..45e119c
--- /dev/null
+++ b/devel/llvm/Tools.cpp.patch
@@ -0,0 +1,70 @@
+diff -Naupr a/tools/clang/lib/Driver/Tools.cpp
b/tools/clang/lib/Driver/Tools.cpp
+--- a/tools/clang/lib/Driver/Tools.cpp 2012-11-21 08:56:23.000000000 +0100
++++ b/tools/clang/lib/Driver/Tools.cpp 2013-03-23 23:56:54.002059797 +0100
+@@ -1777,8 +1777,8 @@ void Clang::ConstructJob(Compilation &C,
+ // any flavor of the '-fno-...' arguments, both PIC and PIE are disabled.
Any
+ // PIE option implicitly enables PIC at the same level.
+ bool PIE = false;
+- bool PIC = getToolChain().isPICDefault();
+- bool IsPICLevelTwo = PIC;
++ bool pic = getToolChain().isPICDefault();
++ bool IsPICLevelTwo = pic;
+ if (Arg *A = Args.getLastArg(options::OPT_fPIC, options::OPT_fno_PIC,
+ options::OPT_fpic, options::OPT_fno_pic,
+ options::OPT_fPIE, options::OPT_fno_PIE,
+@@ -1787,26 +1787,26 @@ 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) ||
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;
+ }
+ }
+ // Check whether the tool chain trumps the PIC-ness decision. If the
PIC-ness
+ // is forced, then neither PIC nor PIE flags will have no effect.
+ if (getToolChain().isPICDefaultForced()) {
+ PIE = false;
+- PIC = getToolChain().isPICDefault();
+- IsPICLevelTwo = PIC;
++ pic = getToolChain().isPICDefault();
++ IsPICLevelTwo = pic;
+ }
+
+ // Inroduce a Darwin-specific hack. If the default is PIC but the flags
+ // 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
+@@ -1816,9 +1816,9 @@ void Clang::ConstructJob(Compilation &C,
+ Args.hasArg(options::OPT_fapple_kext)) &&
+ (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
+@@ -1843,9 +1843,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) {
diff --git a/devel/llvm/gcc-4.7.patch b/devel/llvm/gcc-4.7.patch
deleted file mode 100644
index 8989b7e..0000000
--- a/devel/llvm/gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:11:46.956180361
+0200
-+++ b/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:14:35.256184996
+0200
-@@ -52,6 +52,7 @@
- #include <sys/stat.h>
- #endif
- #include <fcntl.h>
-+#include <unistd.h>
- /* stat functions are redirecting to __xstat with a version number. On
x86-64
- * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make
'stat'
- * available as an exported symbol, so we have to add it explicitly.



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Florian Franzmann (9175ec5f29179c6e45a9350febf26060577edbeb), Florian Franzmann, 03/23/2013

Archive powered by MHonArc 2.6.24.

Top of Page