From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 0ED17389BB5E; Tue, 12 Jul 2022 12:32:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0ED17389BB5E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/modula-2] dtoa replace index, m2rts export fixes. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/devel/modula-2 X-Git-Oldrev: f55158f3ef8d5ac400806e20b7af86b879823c16 X-Git-Newrev: c9642b5a676374c290f8bcb4058e54639f5eb327 Message-Id: <20220712123218.0ED17389BB5E@sourceware.org> Date: Tue, 12 Jul 2022 12:32:18 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2022 12:32:18 -0000 https://gcc.gnu.org/g:c9642b5a676374c290f8bcb4058e54639f5eb327 commit c9642b5a676374c290f8bcb4058e54639f5eb327 Author: Gaius Mulley Date: Tue Jul 12 13:15:03 2022 +0100 dtoa replace index, m2rts export fixes. This patch replaces the libc index call with strchr. It also defines RegisterModule and RequestDependant in the definition module M2RTS.def for the minimal library. Finally it regenerates the Makefile.in's in the libgm2 directories and at the root. 2022-07-12 Gaius Mulley ChangeLog: * Makefile.in: Regenerated. gm2tools/ChangeLog: * Makefile.in: Regenerated. libgm2/ChangeLog: * Makefile.in: Regenerated. * libm2iso/Makefile.in: Regenerated. * libm2log/Makefile.in: Regenerated. * libm2min/Makefile.in: Regenerated. * libm2pim/Makefile.in: Regenerated. * libm2pim/dtoa.cc: Replace index with strchr. gcc/m2/ChangeLog: * gm2-libs-min/M2RTS.def (RegisterModule): Added. (RequestDependant) Added. (ArgCVEnvP) Added. Signed-off-by: Gaius Mulley Diff: --- gcc/m2/gm2-libs-min/M2RTS.def | 6 ++ gcc/m2/gm2-libs-min/M2RTS.mod | 6 ++ gm2tools/Makefile.in | 2 +- libgm2/Makefile.in | 2 +- libgm2/libm2cor/Makefile.in | 2 +- libgm2/libm2iso/Makefile.in | 71 +++++++++++++------ libgm2/libm2log/Makefile.in | 2 +- libgm2/libm2min/Makefile.in | 6 +- libgm2/libm2pim/Makefile.in | 157 +++++++++++++++++++----------------------- libgm2/libm2pim/dtoa.cc | 8 +-- 10 files changed, 144 insertions(+), 118 deletions(-) diff --git a/gcc/m2/gm2-libs-min/M2RTS.def b/gcc/m2/gm2-libs-min/M2RTS.def index fd799b4b4af..e3e13b7b554 100644 --- a/gcc/m2/gm2-libs-min/M2RTS.def +++ b/gcc/m2/gm2-libs-min/M2RTS.def @@ -31,11 +31,17 @@ DEFINITION MODULE M2RTS ; FROM SYSTEM IMPORT ADDRESS ; +TYPE + ArgCVEnvP = PROCEDURE (INTEGER, ADDRESS, ADDRESS) ; (* all these procedures do nothing except satisfy the linker. *) +PROCEDURE RegisterModule (name: ADDRESS; + init, fini: ArgCVEnvP; + dependencies: PROC) ; +PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ; PROCEDURE ExecuteTerminationProcedures ; PROCEDURE ExecuteInitialProcedures ; PROCEDURE HALT ; diff --git a/gcc/m2/gm2-libs-min/M2RTS.mod b/gcc/m2/gm2-libs-min/M2RTS.mod index b3787e785c0..643156d3101 100644 --- a/gcc/m2/gm2-libs-min/M2RTS.mod +++ b/gcc/m2/gm2-libs-min/M2RTS.mod @@ -70,4 +70,10 @@ BEGIN END DeconstructModules ; +PROCEDURE RegisterModule (name: ADDRESS; + init, fini: ArgCVEnvP; + dependencies: PROC) ; +BEGIN +END RegisterModule ; + END M2RTS. diff --git a/gm2tools/Makefile.in b/gm2tools/Makefile.in index 386f2e4163a..c85888f3b6e 100644 --- a/gm2tools/Makefile.in +++ b/gm2tools/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for gm2tools -# Copyright (C) 2021 Free Software Foundation, Inc. +# Copyright (C) 2021-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in index f61b5fc5be9..2957dd2d307 100644 --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -307,7 +307,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ # Makefile for libgm2. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index 174ce2b5356..7507eef24f4 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for libm2cor. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index 1c952cc21e6..b7fe5fe16f5 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for libm2iso. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -179,9 +179,8 @@ libm2iso_la_LIBADD = @BUILD_ISOLIB_TRUE@ TextIO.lo WholeConv.lo WholeIO.lo \ @BUILD_ISOLIB_TRUE@ WholeStr.lo @BUILD_ISOLIB_TRUE@am_libm2iso_la_OBJECTS = $(am__objects_1) \ -@BUILD_ISOLIB_TRUE@ libm2iso_la-ErrnoCategory.lo \ -@BUILD_ISOLIB_TRUE@ libm2iso_la-wrapsock.lo \ -@BUILD_ISOLIB_TRUE@ libm2iso_la-wraptime.lo libm2iso_la-RTco.lo +@BUILD_ISOLIB_TRUE@ ErrnoCategory.lo libm2iso_la-wrapsock.lo \ +@BUILD_ISOLIB_TRUE@ libm2iso_la-wraptime.lo RTco.lo libm2iso_la_OBJECTS = $(am_libm2iso_la_OBJECTS) @BUILD_ISOLIB_TRUE@am_libm2iso_la_rpath = -rpath $(toolexeclibdir) AM_V_P = $(am__v_P_@AM_V@) @@ -222,6 +221,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 = $(libm2iso_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -539,8 +556,8 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@toolexeclib_LTLIBRARIES = libm2iso.la @BUILD_ISOLIB_TRUE@libm2iso_la_SOURCES = $(M2MODS) \ -@BUILD_ISOLIB_TRUE@ ErrnoCategory.c wrapsock.c \ -@BUILD_ISOLIB_TRUE@ wraptime.c RTco.c +@BUILD_ISOLIB_TRUE@ ErrnoCategory.cc wrapsock.c \ +@BUILD_ISOLIB_TRUE@ wraptime.c RTco.cc @BUILD_ISOLIB_TRUE@C_INCLUDES = -I.. -I$(toplevel_srcdir)/libiberty -I$(toplevel_srcdir)/include @BUILD_ISOLIB_TRUE@libm2isodir = libm2iso @@ -555,7 +572,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .mod .def .o .obj .lo .a .la +.SUFFIXES: .c .mod .def .o .obj .lo .a .la .cc $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -630,8 +647,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2iso_la-ErrnoCategory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2iso_la-RTco.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ErrnoCategory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RTco.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2iso_la-wrapsock.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2iso_la-wraptime.Plo@am__quote@ @@ -656,13 +673,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libm2iso_la-ErrnoCategory.lo: ErrnoCategory.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -MT libm2iso_la-ErrnoCategory.lo -MD -MP -MF $(DEPDIR)/libm2iso_la-ErrnoCategory.Tpo -c -o libm2iso_la-ErrnoCategory.lo `test -f 'ErrnoCategory.c' || echo '$(srcdir)/'`ErrnoCategory.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2iso_la-ErrnoCategory.Tpo $(DEPDIR)/libm2iso_la-ErrnoCategory.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ErrnoCategory.c' object='libm2iso_la-ErrnoCategory.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -c -o libm2iso_la-ErrnoCategory.lo `test -f 'ErrnoCategory.c' || echo '$(srcdir)/'`ErrnoCategory.c - libm2iso_la-wrapsock.lo: wrapsock.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -MT libm2iso_la-wrapsock.lo -MD -MP -MF $(DEPDIR)/libm2iso_la-wrapsock.Tpo -c -o libm2iso_la-wrapsock.lo `test -f 'wrapsock.c' || echo '$(srcdir)/'`wrapsock.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2iso_la-wrapsock.Tpo $(DEPDIR)/libm2iso_la-wrapsock.Plo @@ -677,12 +687,26 @@ libm2iso_la-wraptime.lo: wraptime.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -c -o libm2iso_la-wraptime.lo `test -f 'wraptime.c' || echo '$(srcdir)/'`wraptime.c -libm2iso_la-RTco.lo: RTco.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -MT libm2iso_la-RTco.lo -MD -MP -MF $(DEPDIR)/libm2iso_la-RTco.Tpo -c -o libm2iso_la-RTco.lo `test -f 'RTco.c' || echo '$(srcdir)/'`RTco.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2iso_la-RTco.Tpo $(DEPDIR)/libm2iso_la-RTco.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='RTco.c' object='libm2iso_la-RTco.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) $(libm2iso_la_CFLAGS) $(CFLAGS) -c -o libm2iso_la-RTco.lo `test -f 'RTco.c' || echo '$(srcdir)/'`RTco.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_ISOLIB_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 @@ -887,6 +911,9 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@.c.lo: @BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ +@BUILD_ISOLIB_TRUE@.cc.lo: +@BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ + @BUILD_ISOLIB_TRUE@install-data-local: force @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) @BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index 0f2f41f1419..a75a1a48418 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for libm2log. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index a4f66c1f987..24283840689 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for libm2min. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -439,7 +439,9 @@ toolexeclib_LTLIBRARIES = libm2min.la libm2min_la_SOURCES = $(M2MODS) libc.c libm2min_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2min_la_SOURCES))) libm2min_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs -libm2min_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs -fno-exceptions -fno-m2-plugin +libm2min_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs -fno-exceptions \ + -fno-m2-plugin -fno-scaffold-dynamic -fno-scaffold-main + libm2min_la_LINK = $(LINK) -version-info $(libtool_VERSION) BUILT_SOURCES = SYSTEM.def CLEANFILES = SYSTEM.def diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index ec497e18a01..61df4b57206 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for libm2pim. -# Copyright 2013-2021 Free Software Foundation, Inc. +# Copyright 2013-2022 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -154,11 +154,11 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" LTLIBRARIES = $(toolexeclib_LTLIBRARIES) libm2pim_la_LIBADD = @BUILD_PIMLIB_TRUE@am__objects_1 = ASCII.lo IO.lo Args.lo M2RTS.lo \ -@BUILD_PIMLIB_TRUE@ Assertion.lo NumberIO.lo Break.lo SYSTEM.lo \ -@BUILD_PIMLIB_TRUE@ CmdArgs.lo Scan.lo StrCase.lo FIO.lo \ -@BUILD_PIMLIB_TRUE@ StrIO.lo StrLib.lo TimeString.lo \ -@BUILD_PIMLIB_TRUE@ Environment.lo FpuIO.lo Debug.lo \ -@BUILD_PIMLIB_TRUE@ SysStorage.lo Storage.lo StdIO.lo \ +@BUILD_PIMLIB_TRUE@ M2Dependent.lo Assertion.lo NumberIO.lo \ +@BUILD_PIMLIB_TRUE@ Break.lo SYSTEM.lo CmdArgs.lo Scan.lo \ +@BUILD_PIMLIB_TRUE@ StrCase.lo FIO.lo StrIO.lo StrLib.lo \ +@BUILD_PIMLIB_TRUE@ TimeString.lo Environment.lo FpuIO.lo \ +@BUILD_PIMLIB_TRUE@ Debug.lo SysStorage.lo Storage.lo StdIO.lo \ @BUILD_PIMLIB_TRUE@ SEnvironment.lo DynamicStrings.lo SFIO.lo \ @BUILD_PIMLIB_TRUE@ SArgs.lo SCmdArgs.lo PushBackInput.lo \ @BUILD_PIMLIB_TRUE@ StringConvert.lo FormatStrings.lo \ @@ -168,14 +168,10 @@ libm2pim_la_LIBADD = @BUILD_PIMLIB_TRUE@ LegacyReal.lo MemUtils.lo gdbif.lo \ @BUILD_PIMLIB_TRUE@ GetOpt.lo OptLib.lo @BUILD_PIMLIB_TRUE@am_libm2pim_la_OBJECTS = $(am__objects_1) \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-UnixArgs.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-Selective.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-sckt.lo libm2pim_la-errno.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-dtoa.lo libm2pim_la-ldtoa.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-termios.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-SysExceptions.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-target.lo libm2pim_la-wrapc.lo \ -@BUILD_PIMLIB_TRUE@ libm2pim_la-cgetopt.lo +@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 libm2pim_la_OBJECTS = $(am_libm2pim_la_OBJECTS) @BUILD_PIMLIB_TRUE@am_libm2pim_la_rpath = -rpath $(toolexeclibdir) AM_V_P = $(am__v_P_@AM_V@) @@ -216,6 +212,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 = $(libm2pim_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -455,6 +469,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@toolexeclib_LTLIBRARIES = libm2pim.la @BUILD_PIMLIB_TRUE@M2MODS = ASCII.mod IO.mod \ @BUILD_PIMLIB_TRUE@ Args.mod M2RTS.mod \ +@BUILD_PIMLIB_TRUE@ M2Dependent.mod \ @BUILD_PIMLIB_TRUE@ Assertion.mod NumberIO.mod \ @BUILD_PIMLIB_TRUE@ Break.mod SYSTEM.mod \ @BUILD_PIMLIB_TRUE@ CmdArgs.mod Scan.mod \ @@ -489,7 +504,9 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@ IO.def ldtoa.def \ @BUILD_PIMLIB_TRUE@ LegacyReal.def libc.def \ @BUILD_PIMLIB_TRUE@ libm.def LMathLib0.def \ -@BUILD_PIMLIB_TRUE@ M2EXCEPTION.def M2RTS.def \ +@BUILD_PIMLIB_TRUE@ M2Dependent.def \ +@BUILD_PIMLIB_TRUE@ M2EXCEPTION.def M2LINK.def \ +@BUILD_PIMLIB_TRUE@ M2RTS.def \ @BUILD_PIMLIB_TRUE@ MathLib0.def MemUtils.def \ @BUILD_PIMLIB_TRUE@ NumberIO.def PushBackInput.def \ @BUILD_PIMLIB_TRUE@ RTExceptions.def RTint.def \ @@ -508,16 +525,16 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@ cgetopt.def @BUILD_PIMLIB_TRUE@libm2pim_la_SOURCES = $(M2MODS) \ -@BUILD_PIMLIB_TRUE@ UnixArgs.c \ -@BUILD_PIMLIB_TRUE@ Selective.c sckt.c \ -@BUILD_PIMLIB_TRUE@ errno.c dtoa.c \ -@BUILD_PIMLIB_TRUE@ ldtoa.c termios.c \ -@BUILD_PIMLIB_TRUE@ SysExceptions.c target.c \ +@BUILD_PIMLIB_TRUE@ UnixArgs.cc \ +@BUILD_PIMLIB_TRUE@ Selective.cc sckt.cc \ +@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@libm2pimdir = libm2pim @BUILD_PIMLIB_TRUE@libm2pim_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2pim_la_SOURCES))) -@BUILD_PIMLIB_TRUE@libm2pim_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -DBUILD_GM2_LIBS -I@srcdir@/../ +@BUILD_PIMLIB_TRUE@libm2pim_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -DBUILD_GM2_LIBS -I@srcdir@/../ -I@srcdir@/../libm2iso @BUILD_PIMLIB_TRUE@libm2pim_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g @BUILD_PIMLIB_TRUE@libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) @BUILD_PIMLIB_TRUE@BUILT_SOURCES = SYSTEM.def @@ -527,7 +544,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .mod .def .o .obj .lo .a .la +.SUFFIXES: .c .mod .def .o .obj .lo .a .la .cc $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -602,17 +619,17 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-Selective.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-SysExceptions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-UnixArgs.Plo@am__quote@ +@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)/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-dtoa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-errno.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-ldtoa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libm2pim_la-sckt.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-termios.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@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/termios.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -635,62 +652,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libm2pim_la-UnixArgs.lo: UnixArgs.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-UnixArgs.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-UnixArgs.Tpo -c -o libm2pim_la-UnixArgs.lo `test -f 'UnixArgs.c' || echo '$(srcdir)/'`UnixArgs.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-UnixArgs.Tpo $(DEPDIR)/libm2pim_la-UnixArgs.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='UnixArgs.c' object='libm2pim_la-UnixArgs.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-UnixArgs.lo `test -f 'UnixArgs.c' || echo '$(srcdir)/'`UnixArgs.c - -libm2pim_la-Selective.lo: Selective.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-Selective.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-Selective.Tpo -c -o libm2pim_la-Selective.lo `test -f 'Selective.c' || echo '$(srcdir)/'`Selective.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-Selective.Tpo $(DEPDIR)/libm2pim_la-Selective.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='Selective.c' object='libm2pim_la-Selective.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-Selective.lo `test -f 'Selective.c' || echo '$(srcdir)/'`Selective.c - -libm2pim_la-sckt.lo: sckt.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-sckt.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-sckt.Tpo -c -o libm2pim_la-sckt.lo `test -f 'sckt.c' || echo '$(srcdir)/'`sckt.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-sckt.Tpo $(DEPDIR)/libm2pim_la-sckt.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sckt.c' object='libm2pim_la-sckt.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-sckt.lo `test -f 'sckt.c' || echo '$(srcdir)/'`sckt.c - -libm2pim_la-errno.lo: errno.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-errno.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-errno.Tpo -c -o libm2pim_la-errno.lo `test -f 'errno.c' || echo '$(srcdir)/'`errno.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-errno.Tpo $(DEPDIR)/libm2pim_la-errno.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='errno.c' object='libm2pim_la-errno.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-errno.lo `test -f 'errno.c' || echo '$(srcdir)/'`errno.c - -libm2pim_la-dtoa.lo: dtoa.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-dtoa.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-dtoa.Tpo -c -o libm2pim_la-dtoa.lo `test -f 'dtoa.c' || echo '$(srcdir)/'`dtoa.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-dtoa.Tpo $(DEPDIR)/libm2pim_la-dtoa.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dtoa.c' object='libm2pim_la-dtoa.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-dtoa.lo `test -f 'dtoa.c' || echo '$(srcdir)/'`dtoa.c - -libm2pim_la-ldtoa.lo: ldtoa.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-ldtoa.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-ldtoa.Tpo -c -o libm2pim_la-ldtoa.lo `test -f 'ldtoa.c' || echo '$(srcdir)/'`ldtoa.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-ldtoa.Tpo $(DEPDIR)/libm2pim_la-ldtoa.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ldtoa.c' object='libm2pim_la-ldtoa.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-ldtoa.lo `test -f 'ldtoa.c' || echo '$(srcdir)/'`ldtoa.c - -libm2pim_la-termios.lo: termios.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-termios.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-termios.Tpo -c -o libm2pim_la-termios.lo `test -f 'termios.c' || echo '$(srcdir)/'`termios.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-termios.Tpo $(DEPDIR)/libm2pim_la-termios.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='termios.c' object='libm2pim_la-termios.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-termios.lo `test -f 'termios.c' || echo '$(srcdir)/'`termios.c - -libm2pim_la-SysExceptions.lo: SysExceptions.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-SysExceptions.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-SysExceptions.Tpo -c -o libm2pim_la-SysExceptions.lo `test -f 'SysExceptions.c' || echo '$(srcdir)/'`SysExceptions.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-SysExceptions.Tpo $(DEPDIR)/libm2pim_la-SysExceptions.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='SysExceptions.c' object='libm2pim_la-SysExceptions.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-SysExceptions.lo `test -f 'SysExceptions.c' || echo '$(srcdir)/'`SysExceptions.c - libm2pim_la-target.lo: target.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-target.lo -MD -MP -MF $(DEPDIR)/libm2pim_la-target.Tpo -c -o libm2pim_la-target.lo `test -f 'target.c' || echo '$(srcdir)/'`target.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libm2pim_la-target.Tpo $(DEPDIR)/libm2pim_la-target.Plo @@ -712,6 +673,27 @@ libm2pim_la-cgetopt.lo: cgetopt.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-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 +@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_PIMLIB_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 @@ -912,6 +894,9 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_PIMLIB_TRUE@.mod.lo: SYSTEM.def @BUILD_PIMLIB_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2pim_la_M2FLAGS) $< -o $@ +@BUILD_PIMLIB_TRUE@.cc.lo: +@BUILD_PIMLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@ + @BUILD_PIMLIB_TRUE@install-data-local: force @BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) @BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2pim/dtoa.cc b/libgm2/libm2pim/dtoa.cc index d0ca0b096e9..3174bab5799 100644 --- a/libgm2/libm2pim/dtoa.cc +++ b/libgm2/libm2pim/dtoa.cc @@ -136,7 +136,7 @@ dtoa_calcmaxsig (char *p, int ndigits) char *o; int x; - e = index (p, 'E'); + e = strchr (p, 'E'); if (e == NULL) x = 0; else @@ -145,7 +145,7 @@ dtoa_calcmaxsig (char *p, int ndigits) x = atoi (e + 1); } - o = index (p, '.'); + o = strchr (p, '.'); if (o == NULL) return strlen (p) + x; else @@ -168,7 +168,7 @@ dtoa_calcdecimal (char *p, int str_size, int ndigits) int x; int l; - e = index (p, 'E'); + e = strchr (p, 'E'); if (e == NULL) x = 0; else @@ -178,7 +178,7 @@ dtoa_calcdecimal (char *p, int str_size, int ndigits) } l = strlen (p); - o = index (p, '.'); + o = strchr (p, '.'); if (o == NULL) x += strlen (p); else