diff options
| author | Jonathan Yong <10walls@gmail.com> | 2020-09-10 11:48:41 +0000 |
|---|---|---|
| committer | Jonathan Yong <10walls@gmail.com> | 2020-09-10 11:54:28 +0000 |
| commit | ae6cf62861b5e9acb518b016ddbe7f783206f65f (patch) | |
| tree | 9240d2dfec216e235e6e055594cbe5857dc1fc62 | |
| parent | f96b6328fa7162111e4440c5901ef313ed3e6c9a (diff) | |
| download | gcc-ae6cf62861b5e9acb518b016ddbe7f783206f65f.zip gcc-ae6cf62861b5e9acb518b016ddbe7f783206f65f.tar.gz gcc-ae6cf62861b5e9acb518b016ddbe7f783206f65f.tar.bz2 | |
Cygwin/MinGW: Do not version lto plugins
GCC on Linux already uses liblto_plugin.so directly without
the libtool version suffix, adjust windows GCC to do the same.
gcc/ChangeLog:
* config.host: Adjust plugin name for Windows.
lto-plugin/ChangeLog:
* Makefile.am: drop versioning from libtool completely.
* Makefile.in: regenerate.
| -rw-r--r-- | gcc/config.host | 6 | ||||
| -rw-r--r-- | lto-plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | lto-plugin/Makefile.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gcc/config.host b/gcc/config.host index 84f0433..373d5ef 100644 --- a/gcc/config.host +++ b/gcc/config.host @@ -232,7 +232,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 @@ -240,7 +240,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 @@ -249,7 +249,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 ba5882d..204b25f 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 7da7cd2..834699b 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -350,7 +350,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))) |