From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 18 Oct 2015 18:33:05 +0000 (+0000)
Subject: Revise Darwin's sysroot handling to be compatible with the clang toolchain.
X-Git-Tag: basepoints/gcc-7~3882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d42becb9d876f54d0ee0b6c7a5ebfd30851b4e1d;p=thirdparty%2Fgcc.git

Revise Darwin's sysroot handling to be compatible with the clang toolchain.

gcc/
	* config/darwin.h (TARGET_SYSTEM_ROOT): Remove this from here,
	(HAVE_LD_SYSROOT): New.  (SYSROOT_SPEC): New.
	(LINK_SYSROOT_SPEC): Revise to remove the default for target sysroot.
	(STANDARD_STARTFILE_PREFIX_1): New.
	(STANDARD_STARTFILE_PREFIX_2): New.

From-SVN: r228950
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc21d7df5cc5..46cff7ba6c90 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-18  Iain Sandoe  <iain@codesourcery.com>
+
+	* config/darwin.h (TARGET_SYSTEM_ROOT): Remove this from here,
+	(HAVE_LD_SYSROOT): New.  (SYSROOT_SPEC): New. 
+	(LINK_SYSROOT_SPEC): Revise to remove the default for target sysroot.
+	(STANDARD_STARTFILE_PREFIX_1): New.
+	(STANDARD_STARTFILE_PREFIX_2): New.
+
 2015-10-18  Iain Sandoe  <iain@codesourcery.com>
 
 	* config/darwin-driver.c (darwin_default_min_version): Refactor code.
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index bb4451aa4412..7d093c9077af 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -207,12 +207,21 @@ extern GTY(()) int darwin_ms_struct;
 #undef  LINK_GCC_C_SEQUENCE_SPEC
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %L"
 
-#ifdef TARGET_SYSTEM_ROOT
-#define LINK_SYSROOT_SPEC \
-  "%{isysroot*:-syslibroot %*;:-syslibroot " TARGET_SYSTEM_ROOT "}"
-#else
+/* ld64 supports a sysroot, it just has a different name and there's no easy
+   way to check for it at config time.  */
+#undef HAVE_LD_SYSROOT
+#define HAVE_LD_SYSROOT 1
+/* It seems the only (working) way to get a space after %R is to append a
+   dangling '/'.  */
+#define SYSROOT_SPEC "%{!isysroot*:-syslibroot %R/ }"
+
+/* Do the same as clang, for now, and insert the sysroot for ld when an
+   isysroot is specified.  */
 #define LINK_SYSROOT_SPEC "%{isysroot*:-syslibroot %*}"
-#endif
+
+/* Suppress the addition of extra prefix paths when a sysroot is in use.  */
+#define STANDARD_STARTFILE_PREFIX_1 ""
+#define STANDARD_STARTFILE_PREFIX_2 ""
 
 #define DARWIN_PIE_SPEC "%{fpie|pie|fPIE:}"