75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From 923ac76f3406cb3ce680436dd9d4755308295180 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Yong <10walls@gmail.com>
|
|
Date: Sat, 28 Jun 2014 09:35:02 +0800
|
|
Subject: [PATCH] Do not version lto plugin on cygwin/mingw
|
|
|
|
Conflicts:
|
|
lto-plugin/Makefile.am
|
|
lto-plugin/Makefile.in
|
|
---
|
|
gcc/config.host | 6 +++---
|
|
lto-plugin/Makefile.am | 2 +-
|
|
lto-plugin/Makefile.in | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/gcc/config.host b/gcc/config.host
|
|
index c65569d..59514ca 100644
|
|
--- a/gcc/config.host
|
|
+++ b/gcc/config.host
|
|
@@ -236,7 +236,7 @@ case ${host} in
|
|
out_host_hook_obj=host-cygwin.o
|
|
host_xmake_file="${host_xmake_file} i386/x-cygwin"
|
|
host_exeext=.exe
|
|
- host_lto_plugin_soname=cyglto_plugin-0.dll
|
|
+ host_lto_plugin_soname=cyglto_plugin.dll
|
|
;;
|
|
i[34567]86-*-mingw32*)
|
|
host_xm_file=i386/xm-mingw32.h
|
|
@@ -244,7 +244,7 @@ case ${host} in
|
|
host_exeext=.exe
|
|
out_host_hook_obj=host-mingw32.o
|
|
host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
|
|
- host_lto_plugin_soname=liblto_plugin-0.dll
|
|
+ host_lto_plugin_soname=liblto_plugin.dll
|
|
;;
|
|
x86_64-*-mingw*)
|
|
use_long_long_for_widest_fast_int=yes
|
|
@@ -253,7 +253,7 @@ case ${host} in
|
|
host_exeext=.exe
|
|
out_host_hook_obj=host-mingw32.o
|
|
host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
|
|
- host_lto_plugin_soname=liblto_plugin-0.dll
|
|
+ host_lto_plugin_soname=liblto_plugin.dll
|
|
;;
|
|
i[34567]86-*-darwin* | x86_64-*-darwin*)
|
|
out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
|
|
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
|
|
index 28dc210..2e51b32 100644
|
|
--- a/lto-plugin/Makefile.am
|
|
+++ b/lto-plugin/Makefile.am
|
|
@@ -21,7 +21,7 @@ in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
|
|
liblto_plugin_la_SOURCES = lto-plugin.c
|
|
# Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS.
|
|
liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) \
|
|
- $(lt_host_flags) -module -bindir $(libexecsubdir)
|
|
+ $(lt_host_flags) -module -avoid-version -bindir $(libexecsubdir)
|
|
# Can be simplified when libiberty becomes a normal convenience library.
|
|
libiberty = $(with_libiberty)/libiberty.a
|
|
libiberty_noasan = $(with_libiberty)/noasan/libiberty.a
|
|
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
|
|
index c69cc32..0a39289 100644
|
|
--- a/lto-plugin/Makefile.in
|
|
+++ b/lto-plugin/Makefile.in
|
|
@@ -265,7 +265,7 @@ libexecsub_LTLIBRARIES = liblto_plugin.la
|
|
in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
|
|
liblto_plugin_la_SOURCES = lto-plugin.c
|
|
# Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS.
|
|
-liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(lt_host_flags) -module \
|
|
+liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(lt_host_flags) -module -avoid-version \
|
|
-bindir $(libexecsubdir) $(if $(wildcard \
|
|
$(libiberty_noasan)),, $(if $(wildcard \
|
|
$(libiberty_pic)),,-Wc,$(libiberty)))
|
|
--
|
|
2.17.0
|
|
|