diff options
| author | Richard Henderson <rth@redhat.com> | 2016-03-02 17:40:29 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2016-03-02 17:40:29 -0800 |
| commit | 5147e0e84ef1daf08576c2ebc477b8941f54578f (patch) | |
| tree | 1b70274ec41ac71ca49f129a0d1c0168a372b4de /libffi/Makefile.am | |
| parent | 72c5cfd2052df06d369be2e1ef2688fecce9652f (diff) | |
| download | gcc-5147e0e84ef1daf08576c2ebc477b8941f54578f.tar.gz | |
re PR libffi/70024 (libffi ABI change w/o SONAME bump)
PR libffi/70024
* Makefile.am (libffi_version_script): Look in cwd for libffi.map.
(libffi_version_dep, libffi.map-sun): Likewise.
(libffi.map): New target.
* libffi.map.in: Rename from libffi.map. Add required defines,
includes, and conditionals.
From-SVN: r233926
Diffstat (limited to 'libffi/Makefile.am')
| -rw-r--r-- | libffi/Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 4710f7f9fd9..dd10cb1ebb8 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -206,17 +206,15 @@ endif if LIBAT_BUILD_VERSIONED_SHLIB if LIBAT_BUILD_VERSIONED_SHLIB_GNU -libffi_version_script = -Wl,--version-script,$(top_srcdir)/libffi.map -libffi_version_dep = $(top_srcdir)/libffi.map +libffi_version_script = -Wl,--version-script,libffi.map +libffi_version_dep = libffi.map endif if LIBAT_BUILD_VERSIONED_SHLIB_SUN libffi_version_script = -Wl,-M,libffi.map-sun libffi_version_dep = libffi.map-sun -libffi.map-sun : $(top_srcdir)/libffi.map \ - $(top_srcdir)/../contrib/make_sunver.pl \ +libffi.map-sun : libffi.map $(top_srcdir)/../contrib/make_sunver.pl \ $(libffi_la_OBJECTS) $(libffi_la_LIBADD) - perl $(top_srcdir)/../contrib/make_sunver.pl \ - $(top_srcdir)/libffi.map \ + perl $(top_srcdir)/../contrib/make_sunver.pl libffi.map \ $(libffi_la_OBJECTS:%.lo=.libs/%.o) \ `echo $(libffi_la_LIBADD) | \ sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \ @@ -228,6 +226,9 @@ libffi_version_dep = endif libffi_version_info = -version-info `grep -v '^\#' $(srcdir)/libtool-version` +libffi.map: $(top_srcdir)/libffi.map.in + $(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $< + libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep) |