diff options
| author | Fredrik Nyström <fredrik@lysator.liu.se> | 2018-12-10 10:49:02 +0100 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2018-12-10 09:49:02 +0000 |
| commit | c0fff1d0e70da9dcd70c099b22fdb2f1344b633b (patch) | |
| tree | 3b4641c6ffad55fea2a63d34f755ef89abf68079 /gcc | |
| parent | 1dc7836cdda611e476f2c4f82317662f7f85f101 (diff) | |
| download | gcc-c0fff1d0e70da9dcd70c099b22fdb2f1344b633b.zip gcc-c0fff1d0e70da9dcd70c099b22fdb2f1344b633b.tar.gz gcc-c0fff1d0e70da9dcd70c099b22fdb2f1344b633b.tar.bz2 | |
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.
From-SVN: r266946
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/sol2.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bffa8e2..69f7da6 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 197acfb..a6746c4 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}" |