diff options
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/Makefile.am | 3 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 4 | ||||
| -rw-r--r-- | libgfortran/libgfortran.h | 7 |
4 files changed, 12 insertions, 9 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 846bdfb..fb65184 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2009-08-09 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR libfortran/40549 + * Makefile.in (LTLDFLAGS): Add -no-undefined. + * Makefile.am: Regenerate. + * libgfortran.h: Remove unused block of code. + 2009-08-02 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/40853 diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index aaecdb4..26565a2 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -13,7 +13,8 @@ else version_arg = endif -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ + -no-undefined toolexeclib_LTLIBRARIES = libgfortran.la libgfortran_la_LINK = $(LINK) diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 7ea32c6..b724ee3 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -957,7 +957,9 @@ ACLOCAL_AMFLAGS = -I .. -I ../config gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) @LIBGFOR_USE_SYMVER_FALSE@version_arg = @LIBGFOR_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/gfortran.map -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ + -no-undefined + toolexeclib_LTLIBRARIES = libgfortran.la libgfortran_la_LINK = $(LINK) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -lm $(extra_ldflags_libgfortran) $(version_arg) diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h index a2e2002..439c791 100644 --- a/libgfortran/libgfortran.h +++ b/libgfortran/libgfortran.h @@ -177,13 +177,6 @@ extern int __mingw_snprintf (char *, size_t, const char *, ...) # define iexport1(x,y) iexport2(x,y) # define iexport2(x,y) \ extern __typeof(x) PREFIX(x) __attribute__((__alias__(#y))) -/* ??? We're not currently building a dll, and it's wrong to add dllexport - to objects going into a static library archive. */ -#elif 0 && defined(HAVE_ATTRIBUTE_DLLEXPORT) -# define export_proto_np(x) extern __typeof(x) x __attribute__((dllexport)) -# define export_proto(x) sym_rename(x, PREFIX(x)) __attribute__((dllexport)) -# define iexport_proto(x) export_proto(x) -# define iexport(x) extern char swallow_semicolon #else # define export_proto(x) sym_rename(x, PREFIX(x)) # define export_proto_np(x) extern char swallow_semicolon |