From 54b10f3c538946cdfa3880bea7aee0a70b42346d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 11 Nov 2017 20:38:37 +0100
Subject: [PATCH] llvm: clang now defaults to PIC.

---
 sys-devel/llvm/llvm-5.0.0.recipe            |  2 +-
 sys-devel/llvm/patches/clang-5.0.0.patchset | 35 +++++++++++++++++----
 sys-devel/llvm/patches/llvm-5.0.0.patchset  |  8 ++---
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/sys-devel/llvm/llvm-5.0.0.recipe b/sys-devel/llvm/llvm-5.0.0.recipe
index da09480dd..33fe0f1d1 100644
--- a/sys-devel/llvm/llvm-5.0.0.recipe
+++ b/sys-devel/llvm/llvm-5.0.0.recipe
@@ -31,7 +31,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://releases.llvm.org/${portVersion}/llvm-${portVersion}.src.tar.xz"
 SOURCE_URI_2="https://releases.llvm.org/${portVersion}/cfe-${portVersion}.src.tar.xz"
 SOURCE_URI_3="https://releases.llvm.org/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz"
diff --git a/sys-devel/llvm/patches/clang-5.0.0.patchset b/sys-devel/llvm/patches/clang-5.0.0.patchset
index 18fbe10fe..395728af1 100644
--- a/sys-devel/llvm/patches/clang-5.0.0.patchset
+++ b/sys-devel/llvm/patches/clang-5.0.0.patchset
@@ -1,4 +1,4 @@
-From f3aba21f79aa95600a610d1696e0de4365c0b0e9 Mon Sep 17 00:00:00 2001
+From c4c6ca93bb942b351dba3492420251d0a95b3e1f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
 Date: Mon, 18 Jul 2016 14:13:19 +0200
 Subject: support for secondary arch.
@@ -104,10 +104,10 @@ index 1d7c8a0..e8ccd4e 100644
      break;
    case llvm::Triple::RTEMS:
 -- 
-2.13.1
+2.14.2
 
 
-From afaba88ced274075fa40c718930addb236b09f2e Mon Sep 17 00:00:00 2001
+From 0d61fcd6b1c27258753303a630b3cc99c126b969 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 7 Apr 2016 18:30:52 +0000
 Subject: add a test for haiku driver.
@@ -133,10 +133,10 @@ index 0000000..9591739
 +// CHECK-X86: gcc{{.*}}" "-o" "a.out" "{{.*}}.o"
 +
 -- 
-2.13.1
+2.14.2
 
 
-From 5dc6804d033f1fee82f6cad0521f4bea93297201 Mon Sep 17 00:00:00 2001
+From 901fbf16d7c1281f3104574853622b7e3e01f6b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
 Date: Mon, 18 Jul 2016 14:13:19 +0200
 Subject: Enable thread-local storage and disable PIE by default
@@ -171,5 +171,28 @@ index 8b5b48e..ccd851f 100644
    std::string findLibCxxIncludePath() const override;
    void addLibStdCxxIncludePaths(
 -- 
-2.13.1
+2.14.2
+
+
+From aad43660c2aee5827862e63518c9d40b33a0f4fa Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 11 Nov 2017 14:32:45 +0100
+Subject: Haiku: default to PIC
+
+
+diff --git a/lib/Driver/ToolChains/Haiku.h b/lib/Driver/ToolChains/Haiku.h
+index ccd851f..df98cd6 100644
+--- a/lib/Driver/ToolChains/Haiku.h
++++ b/lib/Driver/ToolChains/Haiku.h
+@@ -25,6 +25,8 @@ public:
+ 
+   bool isPIEDefault() const override { return false; }
+ 
++  bool isPICDefault() const override { return true; }
++
+   std::string findLibCxxIncludePath() const override;
+   void addLibStdCxxIncludePaths(
+       const llvm::opt::ArgList &DriverArgs,
+-- 
+2.14.2
 
diff --git a/sys-devel/llvm/patches/llvm-5.0.0.patchset b/sys-devel/llvm/patches/llvm-5.0.0.patchset
index aee4d426a..076e5d9e8 100644
--- a/sys-devel/llvm/patches/llvm-5.0.0.patchset
+++ b/sys-devel/llvm/patches/llvm-5.0.0.patchset
@@ -1,4 +1,4 @@
-From 2f505fd9a05b0476cd0f4d2f9a5b4e1c97c9056e Mon Sep 17 00:00:00 2001
+From 3825ccfacb0e6db06ac955d58bb9d20dc43b52a8 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 20 Jan 2016 21:13:28 +0000
 Subject: llvm-config: use /develop/headers instead of /include
@@ -49,10 +49,10 @@ index 08b096a..739213c 100644
          LinkDyLib = false;
          LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
 -- 
-2.13.1
+2.14.2
 
 
-From e271c2cb8b8941c4b04160362ecf90867d0cfa60 Mon Sep 17 00:00:00 2001
+From 23ce807b3b13948116864f588a401c191b630b20 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 16 Sep 2017 15:02:46 +0200
 Subject: Haiku doesn't expose whether a FS is local or remote.
@@ -73,5 +73,5 @@ index 45097eb..1790a0a 100644
    // statvfs::f_basetype contains a null-terminated FSType name of the mounted target
    StringRef fstype(Vfs.f_basetype);
 -- 
-2.13.1
+2.14.2