<div dir="ltr">I suspect this broke Win64:<div><a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/1410">http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/1410</a><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 26, 2016 at 6:20 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Mon Dec 26 20:20:35 2016<br>
New Revision: 290569<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=290569&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=290569&view=rev</a><br>
Log:<br>
Driver: switch Windows to static RelocModel<br>
<br>
Windows uses PE/COFF which is inherently position independent. The use<br>
of the PIC model is unnecessary. In fact, we would generate invalid<br>
code using the ELF PIC model when PIC was enabled previously. Now that<br>
we no longer accept -fPIC and -fpoc, this switches the internal<br>
representation to the static model to permit us to make PIC modules<br>
invalid when targeting Windows. This should not change the code<br>
generation, only the internal state management.<br>
<br>
Modified:<br>
cfe/trunk/lib/Driver/<wbr>MSVCToolChain.cpp<br>
cfe/trunk/lib/Driver/<wbr>ToolChains.cpp<br>
cfe/trunk/lib/Driver/<wbr>ToolChains.h<br>
cfe/trunk/test/Driver/pic.c<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>MSVCToolChain.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=290569&r1=290568&r2=290569&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>MSVCToolChain.cpp?rev=290569&<wbr>r1=290568&r2=290569&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>MSVCToolChain.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>MSVCToolChain.cpp Mon Dec 26 20:20:35 2016<br>
@@ -82,18 +82,6 @@ bool MSVCToolChain::<wbr>IsUnwindTablesDefaul<br>
return getArch() == llvm::Triple::x86_64;<br>
}<br>
<br>
-bool MSVCToolChain::isPICDefault() const {<br>
- return getArch() == llvm::Triple::x86_64;<br>
-}<br>
-<br>
-bool MSVCToolChain::isPIEDefault() const {<br>
- return false;<br>
-}<br>
-<br>
-bool MSVCToolChain::<wbr>isPICDefaultForced() const {<br>
- return getArch() == llvm::Triple::x86_64;<br>
-}<br>
-<br>
#ifdef USE_WIN32<br>
static bool readFullStringValue(HKEY hkey, const char *valueName,<br>
std::string &value) {<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>ToolChains.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=290569&r1=290568&r2=290569&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChains.cpp?rev=290569&r1=<wbr>290568&r2=290569&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>ToolChains.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>ToolChains.cpp Mon Dec 26 20:20:35 2016<br>
@@ -2880,22 +2880,13 @@ bool Generic_GCC::<wbr>IsUnwindTablesDefault(<br>
<br>
bool Generic_GCC::isPICDefault() const {<br>
switch (getArch()) {<br>
- case llvm::Triple::x86_64:<br>
- return getTriple().isOSWindows();<br>
+ default: return false;<br>
case llvm::Triple::ppc64:<br>
case llvm::Triple::ppc64le:<br>
return !getTriple().<wbr>isOSBinFormatMachO() && !getTriple().isMacOSX();<br>
- default:<br>
- return false;<br>
}<br>
}<br>
<br>
-bool Generic_GCC::isPIEDefault() const { return false; }<br>
-<br>
-bool Generic_GCC::<wbr>isPICDefaultForced() const {<br>
- return getArch() == llvm::Triple::x86_64 && getTriple().isOSWindows();<br>
-}<br>
-<br>
bool Generic_GCC::<wbr>IsIntegratedAssemblerDefault() const {<br>
switch (getTriple().getArch()) {<br>
case llvm::Triple::x86:<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>ToolChains.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.h?rev=290569&r1=290568&r2=290569&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChains.h?rev=290569&r1=<wbr>290568&r2=290569&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>ToolChains.h (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>ToolChains.h Mon Dec 26 20:20:35 2016<br>
@@ -232,8 +232,8 @@ public:<br>
<br>
bool IsUnwindTablesDefault() const override;<br>
bool isPICDefault() const override;<br>
- bool isPIEDefault() const override;<br>
- bool isPICDefaultForced() const override;<br>
+ bool isPIEDefault() const override { return false; }<br>
+ bool isPICDefaultForced() const override { return false; }<br>
bool IsIntegratedAssemblerDefault() const override;<br>
llvm::opt::DerivedArgList *<br>
TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,<br>
@@ -1136,9 +1136,9 @@ public:<br>
<br>
bool IsIntegratedAssemblerDefault() const override;<br>
bool IsUnwindTablesDefault() const override;<br>
- bool isPICDefault() const override;<br>
- bool isPIEDefault() const override;<br>
- bool isPICDefaultForced() const override;<br>
+ bool isPICDefault() const override { return false; }<br>
+ bool isPIEDefault() const override { return false; }<br>
+ bool isPICDefaultForced() const override { return false; }<br>
<br>
void<br>
AddClangSystemIncludeArgs(<wbr>const llvm::opt::ArgList &DriverArgs,<br>
<br>
Modified: cfe/trunk/test/Driver/pic.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/pic.c?rev=290569&r1=290568&r2=290569&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>pic.c?rev=290569&r1=290568&r2=<wbr>290569&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/pic.c (original)<br>
+++ cfe/trunk/test/Driver/pic.c Mon Dec 26 20:20:35 2016<br>
@@ -255,9 +255,4 @@<br>
// RUN: | FileCheck %s --check-prefix=CHECK-PIC1<br>
// RUN: %clang -c %s -target arm64-linux-android -### 2>&1 \<br>
// RUN: | FileCheck %s --check-prefix=CHECK-PIC1<br>
-//<br>
-// On Windows-X64 PIC is enabled by default<br>
-// RUN: %clang -c %s -target x86_64-pc-windows-msvc18.0.0 -### 2>&1 \<br>
-// RUN: | FileCheck %s --check-prefix=CHECK-PIC2<br>
-// RUN: %clang -c %s -target x86_64-pc-windows-gnu -### 2>&1 \<br>
-// RUN: | FileCheck %s --check-prefix=CHECK-PIC2<br>
+<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>