From f80f23a4df0f8d0b25a52fc92d40f9692e16b50c Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Tue, 21 Aug 2018 21:19:34 +0000 Subject: [PATCH] Changelog-caf: New file. 2018-08-21 Thomas Koenig * Changelog-caf: New file. * Merged branch from r263319 to r263752. 2018-08-21 Thomas Koenig * libgfortran/Makefile.am: Added handling of multi.c library. * libgfortran/Makefile.in: Regenerated. * libgfortran/caf/multi.c: New file (for now, just copied over from single.c). From-SVN: r263754 --- ChangeLog-caf | 9 ++++++++- libgfortran/Makefile.am | 6 +++++- libgfortran/Makefile.in | 22 ++++++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ChangeLog-caf b/ChangeLog-caf index 87020d2d48cc..85af8c59fc33 100644 --- a/ChangeLog-caf +++ b/ChangeLog-caf @@ -1,4 +1,11 @@ 2018-08-21 Thomas Koenig * Changelog-caf: New file. - * Merged branch from r263319 to r263750. + * Merged branch from r263319 to r263752. + +2018-08-21 Thomas Koenig + + * libgfortran/Makefile.am: Added handling of multi.c library. + * libgfortran/Makefile.in: Regenerated. + * libgfortran/caf/multi.c: New file (for now, just + copied over from single.c). diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 4ffc6cea780d..bcaf8d1ab402 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -43,12 +43,16 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -Wc,-shared-libgcc libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) -cafexeclib_LTLIBRARIES = libcaf_single.la +cafexeclib_LTLIBRARIES = libcaf_single.la libcaf_multi.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c libcaf_single_la_LDFLAGS = -static libcaf_single_la_DEPENDENCIES = caf/libcaf.h libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS) +libcaf_multi_la_SOURCES = caf/multi.c +libcaf_multi_la_LDFLAGS = -static +libcaf_multi_la_DEPENDENCIES = caf/libcaf.h +libcaf_multi_la_LINK = $(LINK) $(libcaf_multi_la_LDFLAGS) if IEEE_SUPPORT fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 94c3524ffb94..4d947b2e5169 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -182,6 +182,9 @@ am__installdirs = "$(DESTDIR)$(cafexeclibdir)" \ "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" \ "$(DESTDIR)$(fincludedir)" LTLIBRARIES = $(cafexeclib_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) +libcaf_multi_la_LIBADD = +am_libcaf_multi_la_OBJECTS = multi.lo +libcaf_multi_la_OBJECTS = $(am_libcaf_multi_la_OBJECTS) libcaf_single_la_LIBADD = am_libcaf_single_la_OBJECTS = single.lo libcaf_single_la_OBJECTS = $(am_libcaf_single_la_OBJECTS) @@ -441,7 +444,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS) LTFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -SOURCES = $(libcaf_single_la_SOURCES) $(libgfortran_la_SOURCES) +SOURCES = $(libcaf_multi_la_SOURCES) $(libcaf_single_la_SOURCES) \ + $(libgfortran_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = @@ -629,12 +633,16 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -Wc,-shared-libgcc libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) -cafexeclib_LTLIBRARIES = libcaf_single.la +cafexeclib_LTLIBRARIES = libcaf_single.la libcaf_multi.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c libcaf_single_la_LDFLAGS = -static libcaf_single_la_DEPENDENCIES = caf/libcaf.h libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS) +libcaf_multi_la_SOURCES = caf/multi.c +libcaf_multi_la_LDFLAGS = -static +libcaf_multi_la_DEPENDENCIES = caf/libcaf.h +libcaf_multi_la_LINK = $(LINK) $(libcaf_multi_la_LDFLAGS) @IEEE_SUPPORT_TRUE@fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude @IEEE_SUPPORT_TRUE@nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ @@ -1528,6 +1536,8 @@ clean-toolexeclibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +libcaf_multi.la: $(libcaf_multi_la_OBJECTS) $(libcaf_multi_la_DEPENDENCIES) $(EXTRA_libcaf_multi_la_DEPENDENCIES) + $(libcaf_multi_la_LINK) -rpath $(cafexeclibdir) $(libcaf_multi_la_OBJECTS) $(libcaf_multi_la_LIBADD) $(LIBS) libcaf_single.la: $(libcaf_single_la_OBJECTS) $(libcaf_single_la_DEPENDENCIES) $(EXTRA_libcaf_single_la_DEPENDENCIES) $(libcaf_single_la_LINK) -rpath $(cafexeclibdir) $(libcaf_single_la_OBJECTS) $(libcaf_single_la_LIBADD) $(LIBS) libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) $(EXTRA_libgfortran_la_DEPENDENCIES) @@ -1914,6 +1924,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minval_r4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minval_r8.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/move_alloc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvbits.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/norm2_r10.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/norm2_r16.Plo@am__quote@ @@ -2520,6 +2531,13 @@ f2c_specifics.lo: intrinsics/f2c_specifics.F90 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +multi.lo: caf/multi.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT multi.lo -MD -MP -MF $(DEPDIR)/multi.Tpo -c -o multi.lo `test -f 'caf/multi.c' || echo '$(srcdir)/'`caf/multi.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/multi.Tpo $(DEPDIR)/multi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='caf/multi.c' object='multi.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o multi.lo `test -f 'caf/multi.c' || echo '$(srcdir)/'`caf/multi.c + single.lo: caf/single.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT single.lo -MD -MP -MF $(DEPDIR)/single.Tpo -c -o single.lo `test -f 'caf/single.c' || echo '$(srcdir)/'`caf/single.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/single.Tpo $(DEPDIR)/single.Plo -- 2.47.2