From c0fff1d0e70da9dcd70c099b22fdb2f1344b633b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Nystr=C3=B6m?= <fredrik@lysator.liu.se>
Date: Mon, 10 Dec 2018 10:49:02 +0100
Subject: [PATCH] Don't try to use libgcc-unwind.map with --disable-shared (PR
 bootstrap/65725)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

From-SVN: r266946
---
 gcc/ChangeLog     | 6 ++++++
 gcc/config/sol2.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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}"