From e3a682f4197f9f39808febfd1862e722d7675d34 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 20 Apr 2021 16:56:07 +0200 Subject: Use genversion to generate version.h. c++tools/ChangeLog: * Makefile.in: Include also ../gcc folder. gcc/ChangeLog: * Makefile.in: Rename gcov-iov to genversion and depend on version.h (instead of gcov-iov.h). * gcov-io.h: Include version.h instread of gcov-iov.h. * gengtype-state.c (read_state_version): Likewise. * gcov-iov.c: Moved to... * genversion.c: ...here. * lto-streamer.h (LTO_major_version): Define it with GCC_major_version. * version.c: Removed. * version.h: Removed. libgcc/ChangeLog: * libgcov-driver.c (gcov_version): Use different name that does not clash with newly introduced macro. --- c++tools/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'c++tools') diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in index 9700706..afc87d0 100644 --- a/c++tools/Makefile.in +++ b/c++tools/Makefile.in @@ -89,9 +89,9 @@ all::g++-mapper-server$(exeext) MAPPER.O := server.o resolver.o CODYLIB = ../libcody/libcody.a -CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I. +CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I. -I../gcc g++-mapper-server$(exeext): $(MAPPER.O) $(CODYLIB) - +$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(VERSION.O) $(LIBIBERTY) $(NETLIBS) + +$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(LIBIBERTY) $(NETLIBS) # copy to gcc dir so tests there can run all::../gcc/g++-mapper-server$(exeext) -- cgit v1.1