From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id 887953858CDA for ; Tue, 26 Jul 2022 07:45:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 887953858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=none smtp.mailfrom=cebitec.uni-bielefeld.de Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id D5EC2B16B9; Tue, 26 Jul 2022 09:45:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HFJu95jKtSDq; Tue, 26 Jul 2022 09:45:40 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p508547b6.dip0.t-ipconnect.de [80.133.71.182]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 7C06BB16B8; Tue, 26 Jul 2022 09:45:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=CeBiTec.Uni-Bielefeld.DE; s=20200306; t=1658821540; bh=f5aDL3LnV3hghUOfWgqM5JUESLja5GtsXjAdemgJHL8=; h=From:To:Cc:Subject:References:Date:From; b=U5dxx/KciWRiROQjSCUnz1eD4C69yh9NlkrFBE7EJbcDDCjt7XvnOsTnYoJEfC67N 1E25x6oPshdrwtsJOJC8AnvLiuANFnwv1Jh3RQXWlSa9gY/KQswvGFljnotIhWh9Mc MBXcdfJKbNy7NfG/JR+8gmYovgQUXOr8NyfCUS0jCpWYDe7ycsqsjVXj2FF0tpZ/PT MhzZ4DcinoShSLcvtvjOlrFD//fZRCnTkYvjm4RF6eplMZm4v4I1mn627EoBK3sZUW +vWH6x8vOeL5q2zdjGYPB0yiKxtR3a1WiF8zq55fzohcqk/0NhDq8B5KZ91+y8zgC8 TEhfje5tkChQQ== From: Rainer Orth To: Gaius Mulley Cc: Gaius Mulley via Gcc-patches Subject: Re: Modula-2: merge followup (brief update on the progress of the new linking implementation) References: <87h73qy3vb.fsf@debian> <87o7xv4rjg.fsf@debian> <87r12qqzpb.fsf@debian> <87wnc1bkab.fsf@debian> Date: Tue, 26 Jul 2022 09:45:34 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Status: No, score=-3794.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_ASCII_DIVIDERS, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2022 07:45:50 -0000 --=-=-= Content-Type: text/plain Hi Gaius, > Rainer Orth writes: > >>> I think this just leaves: >>> >>>> * While this lets the build finish on all of i386-pc-solaris2.11, >>>> sparcv9-sun-solaris2.11, and x86_64-pc-linux-gnu, I get thousands of >>>> testsuite failures, all of the same kind: >>>> >>>> Undefined first referenced >>>> symbol in file >>>> RTco_signal /var/gcc/modula-2/11.4-gcc-modula-2/i386-pc-solaris2.11/./libgm2/libm2pim/.libs/libm2pim.so >>>> RTco_select /var/gcc/modula-2/11.4-gcc-modula-2/i386-pc-solaris2.11/./libgm2/libm2pim/.libs/libm2pim.so >>>> RTco_initSemaphore /var/gcc/modula-2/11.4-gcc-modula-2/i386-pc-solaris2.11/./libgm2/libm2pim/.libs/libm2pim.so >>>> RTco_wait /var/gcc/modula-2/11.4-gcc-modula-2/i386-pc-solaris2.11/./libgm2/libm2pim/.libs/libm2pim.so >>>> ld: fatal: symbol referencing errors >>>> collect2: error: ld returned 1 exit status >>>> compiler exited with status 1 >>>> FAIL: gm2/exceptions/run/pass/libexcept.mod compilation, -g >>>> >>>> I haven't yet tried to fix those. >>> >>> which I'll try and reproduce, >> >> Excellent. I've also seen this one on Linux/x86_64, so this isn't a >> Solaris-specific issue. > > Hi Rainer, > > I think these are now fixed indeed, thanks. However, there are still a couple of issues with the branch: * There's an unresolved merge conflict in toplevel Makefile.in. * Bootstrap on i386-pc-solaris2.11 initially fails with /vol/gcc/src/hg/master/modula-2/gcc/gcc.cc: In function 'void print_option(const char*, unsigned int, cl_decoded_option*)': /vol/gcc/src/hg/master/modula-2/gcc/gcc.cc:4805:46: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'std::size_t' {aka 'unsigned int'} [-Werror=format=] 4805 | printf (" canonical_option_num_elements [%ld]\n", | ~~^ | | | long int | %d 4806 | in_decoded_options[i].canonical_option_num_elements); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | std::size_t {aka unsigned int} Fixed by the attached patch. * The libgm2 build fails with make[5]: *** No rule to make target 'KeyBoardLEDs.c', needed by 'KeyBoardLEDs.lo'. Stop. While libgm2/libm2cor/Makefile.am had been updated for the rename, the corresponding Makefile.in hasn't. Besides, the Makefile.in's are still generated with a distribution-patched automake (which supports runstatedir). This makes it unnecessarily hard to check if everything's ok if you have to update Makefile.am's and run automake locally afterwards. That said, results are pretty good: * i386-pc-solaris2.11: === gm2 Summary for unix === # of expected passes 11650 # of unexpected failures 14 === gm2 Summary for unix/-m64 === # of expected passes 11647 # of unexpected failures 17 === gm2 Summary === # of expected passes 23297 # of unexpected failures 31 * amd64-pc-solaris2.11: === gm2 Summary for unix === # of expected passes 11658 # of unexpected failures 6 === gm2 Summary for unix/-m32 === # of expected passes 11650 # of unexpected failures 14 === gm2 Summary === # of expected passes 23308 # of unexpected failures 20 * sparcv9-sun-solaris2.11: === gm2 Summary for unix === # of expected passes 11653 # of unexpected failures 9 # of unresolved testcases 1 === gm2 Summary for unix/-m32 === # of expected passes 7390 # of unexpected failures 2131 # of unresolved testcases 2029 === gm2 Summary === # of expected passes 19043 # of unexpected failures 2140 # of unresolved testcases 2030 The 32-bit failures are mostly (all?) of the same type. I've filed PR modula2/106443 for that * sparc-sun-solaris2.11: Still fails with a cc1gm2 SEGV in stage2: PR modula2/101392. And just for completeness' sake: * x86_64-pc-linux-gnu: === gm2 Summary for unix === # of expected passes 11662 # of unexpected failures 2 === gm2 Summary for unix/-m32 === # of expected passes 11657 # of unexpected failures 7 === gm2 Summary === # of expected passes 23319 # of unexpected failures 9 * i686-pc-linux-gnu: === gm2 Summary for unix === # of expected passes 11663 # of unexpected failures 1 === gm2 Summary for unix/-m64 === # of expected passes 11657 # of unexpected failures 7 === gm2 Summary === # of expected passes 23320 # of unexpected failures 8 Rainer -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=gm2.patch diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -1065,10 +1065,6 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_P # cross-building scheme. EXTRA_GCC_FLAGS = \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET) $$TFLAGS" \ -<<<<<<< HEAD - "GM2_FOR_TARGET=$(GM2_FOR_TARGET) $$TFLAGS" \ -======= ->>>>>>> master "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" diff --git a/gcc/gcc.cc b/gcc/gcc.cc --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -4802,8 +4802,8 @@ print_option (const char *desc, unsigned /* On some hosts value is declared as a long long int. */ printf (" value [%ld]", (long int)in_decoded_options[i].value); printf (" error [%d]", in_decoded_options[i].errors); - printf (" canonical_option_num_elements [%ld]\n", - in_decoded_options[i].canonical_option_num_elements); + printf (" canonical_option_num_elements [%lu]\n", + (unsigned long) in_decoded_options[i].canonical_option_num_elements); } /* print_options display all options with a leading string desc. */ diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -287,7 +287,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ slibdir = @slibdir@ diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -175,12 +175,12 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ @@ -197,6 +197,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libm2cor_la_SOURCES) $(nodist_EXTRA_libm2cor_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -345,7 +363,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. @@ -364,7 +381,7 @@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUFFIXES = .c .mod .def .o .obj .lo .a .la +SUFFIXES = .c .cc .mod .def .o .obj .lo .a .la ACLOCAL_AMFLAGS = -I . -I .. -I ../config # Multilib support. @@ -441,10 +458,11 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_CORLIB_TRUE@ SYSTEM.mod TimerHandler.mod @BUILD_CORLIB_TRUE@toolexeclib_LTLIBRARIES = libm2cor.la -@BUILD_CORLIB_TRUE@libm2cor_la_SOURCES = $(M2MODS) KeyBoardLEDs.c +@BUILD_CORLIB_TRUE@libm2cor_la_SOURCES = $(M2MODS) KeyBoardLEDs.cc @BUILD_CORLIB_TRUE@nodist_EXTRA_libm2cor_la_SOURCES = dummy.c ## forces automake to generate the LINK definition @BUILD_CORLIB_TRUE@libm2cordir = libm2cor @BUILD_CORLIB_TRUE@libm2cor_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2cor_la_SOURCES))) +@BUILD_CORLIB_TRUE@libm2cor_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -DBUILD_GM2_LIBS -I@srcdir@/../ -I@srcdir@/../libm2iso @BUILD_CORLIB_TRUE@libm2cor_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-coroutines -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g @BUILD_CORLIB_TRUE@libm2cor_la_LINK = $(LINK) -version-info $(libtool_VERSION) @BUILD_CORLIB_TRUE@BUILT_SOURCES = SYSTEM.def @@ -454,7 +472,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .mod .def .o .obj .lo .a .la +.SUFFIXES: .c .cc .mod .def .o .obj .lo .a .la $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -530,7 +548,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeyBoardLEDs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2cor_la-dummy.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -553,6 +571,34 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libm2cor_la-dummy.lo: dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libm2cor_la_CFLAGS) $(CFLAGS) -MT libm2cor_la-dummy.lo -MD -MP -MF $(DEPDIR)/libm2cor_la-dummy.Tpo -c -o libm2cor_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2cor_la-dummy.Tpo $(DEPDIR)/libm2cor_la-dummy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dummy.c' object='libm2cor_la-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libm2cor_la_CFLAGS) $(CFLAGS) -c -o libm2cor_la-dummy.lo `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +@BUILD_CORLIB_FALSE@.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo @@ -753,6 +799,9 @@ uninstall-am: uninstall-toolexeclibLTLIB @BUILD_CORLIB_TRUE@.mod.lo: @BUILD_CORLIB_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2cor_la_M2FLAGS) $< -o $@ +@BUILD_CORLIB_TRUE@.cc.lo: +@BUILD_CORLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2cor_la_CFLAGS) $< -o $@ + @BUILD_CORLIB_TRUE@install-data-local: force @BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) @BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -387,7 +387,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. @@ -568,6 +567,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@CLEANFILES = SYSTEM.def @BUILD_ISOLIB_TRUE@BUILT_SOURCES = SYSTEM.def @BUILD_ISOLIB_TRUE@M2LIBDIR = /m2/m2iso/ +@BUILD_ISOLIB_TRUE@M2HEADER_FILES = m2rts.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -931,6 +931,14 @@ uninstall-am: uninstall-toolexeclibLTLIB @BUILD_ISOLIB_TRUE@ fi ; \ @BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ @BUILD_ISOLIB_TRUE@ done +@BUILD_ISOLIB_TRUE@ for i in $(M2HEADER_FILES) ; do \ +@BUILD_ISOLIB_TRUE@ if [ -f @srcdir@/$$i ] ; then \ +@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) @srcdir@/$$i '$(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)'; \ +@BUILD_ISOLIB_TRUE@ else \ +@BUILD_ISOLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ +@BUILD_ISOLIB_TRUE@ fi ; \ +@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)$$i ; \ +@BUILD_ISOLIB_TRUE@ done @BUILD_ISOLIB_TRUE@force: diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -352,7 +352,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -342,7 +342,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -164,14 +164,13 @@ libm2pim_la_LIBADD = @BUILD_PIMLIB_TRUE@ StringConvert.lo FormatStrings.lo \ @BUILD_PIMLIB_TRUE@ Builtins.lo MathLib0.lo M2EXCEPTION.lo \ @BUILD_PIMLIB_TRUE@ RTExceptions.lo SMathLib0.lo RTint.lo \ -@BUILD_PIMLIB_TRUE@ COROUTINES.lo Indexing.lo LMathLib0.lo \ -@BUILD_PIMLIB_TRUE@ LegacyReal.lo MemUtils.lo gdbif.lo \ -@BUILD_PIMLIB_TRUE@ GetOpt.lo OptLib.lo +@BUILD_PIMLIB_TRUE@ Indexing.lo LMathLib0.lo LegacyReal.lo \ +@BUILD_PIMLIB_TRUE@ MemUtils.lo gdbif.lo GetOpt.lo OptLib.lo @BUILD_PIMLIB_TRUE@am_libm2pim_la_OBJECTS = $(am__objects_1) \ @BUILD_PIMLIB_TRUE@ UnixArgs.lo Selective.lo sckt.lo errno.lo \ @BUILD_PIMLIB_TRUE@ dtoa.lo ldtoa.lo termios.lo \ @BUILD_PIMLIB_TRUE@ SysExceptions.lo libm2pim_la-target.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-wrapc.lo libm2pim_la-cgetopt.lo +@BUILD_PIMLIB_TRUE@ libm2pim_la-wrapc.lo cgetopt.lo libm2pim_la_OBJECTS = $(am_libm2pim_la_OBJECTS) @BUILD_PIMLIB_TRUE@am_libm2pim_la_rpath = -rpath $(toolexeclibdir) AM_V_P = $(am__v_P_@AM_V@) @@ -378,7 +377,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ # Used to install the shared libgcc. @@ -486,15 +484,17 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@ Builtins.mod MathLib0.mod \ @BUILD_PIMLIB_TRUE@ M2EXCEPTION.mod RTExceptions.mod \ @BUILD_PIMLIB_TRUE@ SMathLib0.mod RTint.mod \ -@BUILD_PIMLIB_TRUE@ COROUTINES.mod Indexing.mod \ +@BUILD_PIMLIB_TRUE@ Indexing.mod \ @BUILD_PIMLIB_TRUE@ LMathLib0.mod LegacyReal.mod \ @BUILD_PIMLIB_TRUE@ MemUtils.mod gdbif.mod \ @BUILD_PIMLIB_TRUE@ GetOpt.mod OptLib.mod + +# COROUTINES.mod has been removed as it is implemented in ../libm2iso. @BUILD_PIMLIB_TRUE@M2DEFS = Args.def ASCII.def \ @BUILD_PIMLIB_TRUE@ Assertion.def Break.def \ @BUILD_PIMLIB_TRUE@ Builtins.def cbuiltin.def \ -@BUILD_PIMLIB_TRUE@ CmdArgs.def COROUTINES.def \ +@BUILD_PIMLIB_TRUE@ CmdArgs.def COROUTINES.def \ @BUILD_PIMLIB_TRUE@ cxxabi.def Debug.def \ @BUILD_PIMLIB_TRUE@ dtoa.def DynamicStrings.def \ @BUILD_PIMLIB_TRUE@ Environment.def errno.def \ @@ -530,7 +530,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@ errno.cc dtoa.cc \ @BUILD_PIMLIB_TRUE@ ldtoa.cc termios.cc \ @BUILD_PIMLIB_TRUE@ SysExceptions.cc target.c \ -@BUILD_PIMLIB_TRUE@ wrapc.c cgetopt.c +@BUILD_PIMLIB_TRUE@ wrapc.c cgetopt.cc @BUILD_PIMLIB_TRUE@libm2pimdir = libm2pim @BUILD_PIMLIB_TRUE@libm2pim_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2pim_la_SOURCES))) @@ -622,10 +622,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Selective.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SysExceptions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnixArgs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgetopt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtoa.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldtoa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-cgetopt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-target.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-wrapc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sckt.Plo@am__quote@ @@ -666,13 +666,6 @@ libm2pim_la-wrapc.lo: wrapc.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libm2pim_la_CFLAGS) $(CFLAGS) -c -o libm2pim_la-wrapc.lo `test -f 'wrapc.c' || echo '$(srcdir)/'`wrapc.c -libm2pim_la-cgetopt.lo: cgetopt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libm2pim_la_CFLAGS) $(CFLAGS) -MT libm2pim_la-cgetopt.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-cgetopt.Tpo -c -o libm2pim_la-cgetopt.lo `test -f 'cgetopt.c' || echo '$(srcdir)/'`cgetopt.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-cgetopt.Tpo $(DEPDIR)/libm2pim_la-cgetopt.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cgetopt.c' object='libm2pim_la-cgetopt.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libm2pim_la_CFLAGS) $(CFLAGS) -c -o libm2pim_la-cgetopt.lo `test -f 'cgetopt.c' || echo '$(srcdir)/'`cgetopt.c - .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po --=-=-=--