From: ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 10 Dec 2018 09:49:02 +0000 (+0000)
Subject: Don't try to use libgcc-unwind.map with --disable-shared (PR bootstrap/65725)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dda7755db7fd50cc6cfdc6394c32e747c793ce29;p=thirdparty%2Fgcc.git

Don't try to use libgcc-unwind.map with --disable-shared (PR bootstrap/65725)

2018-12-10  Fredrik Nyström  <fredrik@lysator.liu.se>

	PR bootstrap/65725
	* config/sol2.h: Only use libgcc-unwind.map if
	ENABLE_SHARED_LIBGCC.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266946 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bffa8e295919..69f7da68f612 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-10  Fredrik Nyström  <fredrik@lysator.liu.se>
+
+	PR bootstrap/65725
+	* config/sol2.h: Only use libgcc-unwind.map if
+	ENABLE_SHARED_LIBGCC.
+
 2018-12-10  Bin Cheng  <bin.cheng@linux.alibaba.com>
 
 	* auto-profile.c (afdo_calculate_branch_prob): Convert profile_count
diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index 197acfbd0fe4..a6746c4b7fbc 100644
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -397,7 +397,7 @@ along with GCC; see the file COPYING3.  If not see
 #define SYSROOT_SPEC "-z sysroot=%R"
 #endif
 
-#ifndef USE_GLD
+#if !defined(USE_GLD) && defined(ENABLE_SHARED_LIBGCC)
 /* With Sun ld, use mapfile to enforce direct binding to libgcc_s unwinder.  */
 #define LINK_LIBGCC_MAPFILE_SPEC \
   "%{shared|shared-libgcc:-M %slibgcc-unwind.map}"