mirror of
https://forge.sourceware.org/marek/gcc.git
synced 2026-02-22 03:47:02 -05:00
This followup to PR modula2/122241 reduces error message clutter by filtering unknown symbol error ensuring that only one error message is emitted for an unknown symbol at a particular location. The filter is implemented using two binary trees. A new generic (based on the address type) binary dictionary module is added to the base libraries. gcc/m2/ChangeLog: PR modula2/122407 * Make-lang.in (GM2-LIBS-BOOT-DEFS): Add BinDict.def. (GM2-LIBS-BOOT-MODS): Add BinDict.mod. (GM2-COMP-BOOT-DEFS): Add FilterError.def. (GM2-COMP-BOOT-MODS): Add FilterError.mod. (GM2-LIBS-DEFS): Add BinDict.def. (GM2-LIBS-MODS): Add BinDict.mod. * gm2-compiler/M2Error.def (KillError): New procedure. * gm2-compiler/M2Error.mod (WriteFormat3): Reformat. (NewError): Rewrite and call AddToList. (AddToList): New procedure. (SubFromList): Ditto. (WipeReferences): Ditto. (KillError): Ditto. * gm2-compiler/M2LexBuf.mod (MakeVirtualTok): Return caret if all token positions are identical. * gm2-compiler/M2MetaError.mod (KillError): Import. (FilterError): Import. (FilterUnknown): New global. (initErrorBlock): Initialize symcause and token. (push): Capitalize comments. (pop): Copy symcause to toblock if discovered. (doError): Add parameter sym. (defaultError): Assign token if discovered. Pass NulSym to doError. (updateTokSym): New procedure. (chooseError): Call updateTokSym. (doErrorScopeModule): Pass sym to doError. (doErrorScopeForward): Ditto. (doErrorScopeMod): Ditto. (doErrorScopeFor): Ditto. (doErrorScopeDefinition): Ditto. (doErrorScopeDef): Ditto. (doErrorScopeProc): Ditto. (used): Pass sym[bol] to doError. (op): Assign symcause when encountering an error, warning or note. (MetaErrorStringT1): Rewrite. (MetaErrorStringT2): Ditto. (MetaErrorStringT3): Ditto. (MetaErrorStringT4): Ditto. (isUniqueError): New procedure function. (wrapErrors): Rewrite. (FilterUnknown): Initialize. * gm2-compiler/M2Quads.mod (BuildTSizeFunction): Add spell check hint specifier. * gm2-compiler/FilterError.def: New file. * gm2-compiler/FilterError.mod: New file. * gm2-libs/BinDict.def: New file. * gm2-libs/BinDict.mod: New file. libgm2/ChangeLog: PR modula2/122407 * libm2pim/Makefile.am (M2MODS): Add BinDict.mod. (M2DEFS): Add BinDict.def. * libm2pim/Makefile.in: Regenerate. Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
243 lines
7.6 KiB
Makefile
243 lines
7.6 KiB
Makefile
# Makefile for libm2pim.
|
|
# 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
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; see the file COPYING3. If not see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
SUFFIXES = .c .mod .def .o .obj .lo .a .la
|
|
|
|
ACLOCAL_AMFLAGS = -I .. -I ../config
|
|
|
|
VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs
|
|
|
|
# Multilib support.
|
|
MAKEOVERRIDES=
|
|
|
|
gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
|
|
|
|
# Directory in which the compiler finds libraries etc.
|
|
libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
|
|
# Used to install the shared libgcc.
|
|
slibdir = @slibdir@
|
|
|
|
toolexeclibdir=@toolexeclibdir@
|
|
toolexecdir=@toolexecdir@
|
|
|
|
MULTIDIR := $(shell $(CC) $(CFLAGS) -print-multi-directory)
|
|
MULTIOSDIR := $(shell $(CC) $(CFLAGS) -print-multi-os-directory)
|
|
|
|
MULTIOSSUBDIR := $(shell if test x$(MULTIOSDIR) != x.; then echo /$(MULTIOSDIR); fi)
|
|
inst_libdir = $(libsubdir)$(MULTISUBDIR)
|
|
inst_slibdir = $(slibdir)$(MULTIOSSUBDIR)
|
|
|
|
|
|
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
|
# values defined in terms of make variables, as is the case for CC and
|
|
# friends when we are called from the top level Makefile.
|
|
AM_MAKEFLAGS = \
|
|
"GCC_DIR=$(GCC_DIR)" \
|
|
"GM2_SRC=$(GM2_SRC)" \
|
|
"AR_FLAGS=$(AR_FLAGS)" \
|
|
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
|
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
|
|
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
|
|
"CFLAGS=$(CFLAGS)" \
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
|
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
|
"INSTALL=$(INSTALL)" \
|
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
|
"LDFLAGS=$(LDFLAGS)" \
|
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
|
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
|
"MAKE=$(MAKE)" \
|
|
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
|
"MULTISUBDIR=$(MULTISUBDIR)" \
|
|
"MULTIOSDIR=$(MULTIOSDIR)" \
|
|
"MULTIBUILDTOP=$(MULTIBUILDTOP)" \
|
|
"MULTIFLAGS=$(MULTIFLAGS)" \
|
|
"PICFLAG=$(PICFLAG)" \
|
|
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
|
"SHELL=$(SHELL)" \
|
|
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
|
"exec_prefix=$(exec_prefix)" \
|
|
"infodir=$(infodir)" \
|
|
"libdir=$(libdir)" \
|
|
"includedir=$(includedir)" \
|
|
"prefix=$(prefix)" \
|
|
"tooldir=$(tooldir)" \
|
|
"AR=$(AR)" \
|
|
"AS=$(AS)" \
|
|
"LD=$(LD)" \
|
|
"RANLIB=$(RANLIB)" \
|
|
"NM=$(NM)" \
|
|
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
|
|
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
|
"DESTDIR=$(DESTDIR)" \
|
|
"WERROR=$(WERROR)" \
|
|
"TARGET_LIB_PATH_libgm2=$(TARGET_LIB_PATH_libgm2)"
|
|
|
|
# Subdir rules rely on $(FLAGS_TO_PASS)
|
|
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
|
|
|
|
if BUILD_PIMLIB
|
|
toolexeclib_LTLIBRARIES = libm2pim.la
|
|
|
|
M2MODS = ASCII.mod \
|
|
Args.mod BinDict.mod \
|
|
IO.mod M2RTS.mod \
|
|
M2Dependent.mod \
|
|
M2Diagnostic.mod \
|
|
M2WIDESET.mod \
|
|
Assertion.mod NumberIO.mod \
|
|
Break.mod SYSTEM.mod \
|
|
CmdArgs.mod Scan.mod \
|
|
StrCase.mod FIO.mod \
|
|
StrIO.mod StrLib.mod \
|
|
TimeString.mod Environment.mod \
|
|
FpuIO.mod Debug.mod \
|
|
SysStorage.mod Storage.mod \
|
|
StdIO.mod SEnvironment.mod \
|
|
DynamicStrings.mod SFIO.mod \
|
|
SArgs.mod SCmdArgs.mod \
|
|
PushBackInput.mod \
|
|
StringConvert.mod FormatStrings.mod \
|
|
Builtins.mod MathLib0.mod \
|
|
M2EXCEPTION.mod RTExceptions.mod \
|
|
SMathLib0.mod RTint.mod \
|
|
Indexing.mod \
|
|
LMathLib0.mod LegacyReal.mod \
|
|
MemUtils.mod gdbif.mod \
|
|
GetOpt.mod OptLib.mod \
|
|
ARRAYOFCHAR.mod \
|
|
CHAR.mod \
|
|
StringFileSysOp.mod \
|
|
String.mod \
|
|
FileSysOp.mod
|
|
|
|
# COROUTINES.mod has been removed as it is implemented in ../libm2iso.
|
|
|
|
M2DEFS = Args.def ASCII.def \
|
|
Assertion.def BinDict.def \
|
|
Break.def \
|
|
Builtins.def cbuiltin.def \
|
|
CmdArgs.def CFileSysOp.def \
|
|
COROUTINES.def \
|
|
cxxabi.def Debug.def \
|
|
dtoa.def DynamicStrings.def \
|
|
Environment.def errno.def \
|
|
FIO.def FormatStrings.def \
|
|
FpuIO.def gdbif.def \
|
|
Indexing.def \
|
|
IO.def ldtoa.def \
|
|
LegacyReal.def libc.def \
|
|
libm.def LMathLib0.def \
|
|
M2Dependent.def \
|
|
M2Diagnostic.def \
|
|
M2EXCEPTION.def \
|
|
M2RTS.def \
|
|
M2WIDESET.def \
|
|
MathLib0.def MemUtils.def \
|
|
NumberIO.def PushBackInput.def \
|
|
RTExceptions.def RTint.def \
|
|
SArgs.def SCmdArgs.def \
|
|
Scan.def \
|
|
sckt.def Selective.def \
|
|
SEnvironment.def SFIO.def \
|
|
SMathLib0.def StdIO.def \
|
|
Storage.def StrCase.def \
|
|
StringConvert.def StrIO.def \
|
|
StrLib.def SysExceptions.def \
|
|
SysStorage.def SYSTEM.def \
|
|
termios.def TimeString.def \
|
|
UnixArgs.def wrapc.def \
|
|
GetOpt.def OptLib.def \
|
|
cgetopt.def \
|
|
ARRAYOFCHAR.def \
|
|
CHAR.def \
|
|
StringFileSysOp.def \
|
|
String.def \
|
|
FileSysOp.def
|
|
|
|
libm2pim_la_SOURCES = $(M2MODS) \
|
|
UnixArgs.cc \
|
|
Selective.cc sckt.cc \
|
|
errno.cc dtoa.cc \
|
|
ldtoa.cc termios.cc \
|
|
SysExceptions.cc target.c \
|
|
wrapc.cc cgetopt.cc \
|
|
CFileSysOp.cc
|
|
|
|
libm2pimdir = libm2pim
|
|
libm2pim_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2pim_la_SOURCES)))
|
|
libm2pim_la_CFLAGS = \
|
|
-I. -I.. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso \
|
|
-DBUILD_GM2_LIBS -I@srcdir@/../ -I@srcdir@/../libm2iso
|
|
|
|
libm2pim_la_M2FLAGS = \
|
|
-fm2-pathname=m2pim -I. -I$(GM2_SRC)/gm2-libs \
|
|
-fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \
|
|
-fm2-g -g -Wcase-enum -Wreturn-type \
|
|
-Wall \
|
|
-fcase -fm2-prefix=m2pim
|
|
|
|
if TARGET_DARWIN
|
|
libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup
|
|
else
|
|
libm2pim_la_link_flags =
|
|
endif
|
|
if ENABLE_DARWIN_AT_RPATH
|
|
libm2pim_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/
|
|
endif
|
|
libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags) -lm
|
|
BUILT_SOURCES = SYSTEM.def
|
|
CLEANFILES = SYSTEM.def
|
|
|
|
M2LIBDIR = /m2/m2pim/
|
|
|
|
SYSTEM.def: Makefile
|
|
bash $(GM2_SRC)/tools-src/makeSystem -fpim \
|
|
$(GM2_SRC)/gm2-libs/SYSTEM.def \
|
|
$(GM2_SRC)/gm2-libs/SYSTEM.mod \
|
|
-I$(GM2_SRC)/gm2-libs \
|
|
"$(GM2_FOR_TARGET)" $@
|
|
|
|
.mod.lo: SYSTEM.def
|
|
$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
--mode=compile $(GM2_FOR_TARGET) \
|
|
-c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2pim_la_M2FLAGS) $< -o $@
|
|
|
|
.cc.lo:
|
|
$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) \
|
|
$(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@
|
|
|
|
install-data-local: force
|
|
mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)
|
|
for i in $(M2DEFS) $(M2MODS) ; do \
|
|
if [ -f $$i ] ; then \
|
|
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
|
|
elif [ -f @srcdir@/../../gcc/m2/gm2-libs/$$i ] ; then \
|
|
$(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
|
|
else \
|
|
echo "cannot find $$i" ; exit 1 ; \
|
|
fi ; \
|
|
chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \
|
|
done
|
|
|
|
force:
|
|
|
|
endif
|