From e77f8568f67b6dc265a620f7506a6f931c3a002e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 14 Feb 2017 04:10:52 +0000
Subject: [PATCH 1/2] Add a test that -fPIC is applied

---
 src/test/run-make/fpic/Makefile |  9 +++++++++
 src/test/run-make/fpic/hello.rs | 11 +++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/test/run-make/fpic/Makefile
 create mode 100644 src/test/run-make/fpic/hello.rs

diff --git a/src/test/run-make/fpic/Makefile b/src/test/run-make/fpic/Makefile
new file mode 100644
index 00000000000..da69c83eb37
--- /dev/null
+++ b/src/test/run-make/fpic/Makefile
@@ -0,0 +1,9 @@
+-include ../tools.mk
+
+# Test for #39529. 
+# `-z text` causes ld to error if there are any non-PIC sections
+
+all:
+ifndef IS_WINDOWS
+	$(RUSTC) hello.rs -C link-args=-Wl,-z,text
+endif
diff --git a/src/test/run-make/fpic/hello.rs b/src/test/run-make/fpic/hello.rs
new file mode 100644
index 00000000000..a9e231b0ea8
--- /dev/null
+++ b/src/test/run-make/fpic/hello.rs
@@ -0,0 +1,11 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() { }

From 55dab70f7af6af31616165554e2f4b6c5679f381 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 1 Mar 2017 08:08:53 -0800
Subject: [PATCH 2/2] Don't run test on darwin

---
 src/test/run-make/fpic/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/run-make/fpic/Makefile b/src/test/run-make/fpic/Makefile
index da69c83eb37..6de58c2db18 100644
--- a/src/test/run-make/fpic/Makefile
+++ b/src/test/run-make/fpic/Makefile
@@ -1,9 +1,13 @@
 -include ../tools.mk
 
-# Test for #39529. 
+# Test for #39529.
 # `-z text` causes ld to error if there are any non-PIC sections
 
+ifeq ($(UNAME),Darwin)
+all:
+else ifdef IS_WINDOWS
+all:
+else
 all:
-ifndef IS_WINDOWS
 	$(RUSTC) hello.rs -C link-args=-Wl,-z,text
 endif