/usr/src/gcc-7/debian/patches/libcc1-compiler-name.diff is in gcc-7-source 7.3.0-16ubuntu3.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | # DP: libcc1: Fix setting the compiler name, taken from the trunk
libcc1/
2017-11-16 Sergio Durigan Junior <sergiodj@redhat.com>
Pedro Alves <palves@redhat.com>
* Makefile.am: Remove references to c-compiler-name.h and
cp-compiler-name.h
* Makefile.in: Regenerate.
* compiler-name.hh: New file.
* libcc1.cc: Don't include c-compiler-name.h. Include
compiler-name.hh.
* libcp1.cc: Don't include cp-compiler-name.h. Include
compiler-name.hh.
Index: libcc1/libcc1.cc
===================================================================
--- a/src/libcc1/libcc1.cc (revision 254837)
+++ b/src/libcc1/libcc1.cc (revision 254838)
@@ -37,7 +37,7 @@
#include "libiberty.h"
#include "xregex.h"
#include "findcomp.hh"
-#include "c-compiler-name.h"
+#include "compiler-name.hh"
#include "intl.h"
struct libcc1;
Index: libcc1/Makefile.in
===================================================================
--- a/src/libcc1/Makefile.in (revision 254837)
+++ b/src/libcc1/Makefile.in (revision 254838)
@@ -307,8 +307,6 @@
cc1libdir = $(libdir)/$(libsuffix)
@ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
@ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
-BUILT_SOURCES = c-compiler-name.h cp-compiler-name.h
-MOSTLYCLEANFILES = c-compiler-name.h cp-compiler-name.h
shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
marshall.cc marshall.hh rpc.hh status.hh
@@ -344,7 +342,7 @@
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libcc1_la_LDFLAGS) $(LTLDFLAGS) -o $@
-all: $(BUILT_SOURCES) cc1plugin-config.h
+all: cc1plugin-config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
@@ -567,15 +565,13 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
all-am: Makefile $(LTLIBRARIES) cc1plugin-config.h
installdirs:
for dir in "$(DESTDIR)$(cc1libdir)" "$(DESTDIR)$(plugindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -595,7 +591,6 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
@@ -606,7 +601,6 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-cc1libLTLIBRARIES clean-generic clean-libtool \
@@ -681,7 +675,7 @@
uninstall-am: uninstall-cc1libLTLIBRARIES uninstall-pluginLTLIBRARIES
-.MAKE: all check install install-am install-strip
+.MAKE: all install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-cc1libLTLIBRARIES clean-generic clean-libtool \
@@ -702,21 +696,6 @@
override CXXFLAGS := $(filter-out -fsanitize=address,$(CXXFLAGS))
override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS))
-# Put this in a header so we don't run sed for each compilation. This
-# is also simpler to debug as one can easily see the constant.
-# FIXME: compute it in configure.ac and output it in config.status, or
-# introduce timestamp files for some indirection to avoid rebuilding it
-# every time.
-c-compiler-name.h: Makefile
- -rm -f $@T
- echo "#define C_COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@T
- mv $@T $@ # $(SHELL) $(srcdir)/../move-if-change $@T $@
-
-cp-compiler-name.h: Makefile
- -rm -f $@T
- echo "#define CP_COMPILER_NAME \"`echo g++ | sed '$(transform)'`\"" > $@T
- mv $@T $@ # $(SHELL) $(srcdir)/../move-if-change $@T $@
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: libcc1/compiler-name.hh
===================================================================
--- a/src/libcc1/compiler-name.hh (nonexistent)
+++ b/src/libcc1/compiler-name.hh (revision 254838)
@@ -0,0 +1,29 @@
+/* The names of the compilers we use.
+ Copyright (C) 2017 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC 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, or (at your option) any later
+version.
+
+GCC 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 GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
+
+#ifndef COMPILER_NAME_H
+#define COMPILER_NAME_H
+
+// C compiler name.
+#define C_COMPILER_NAME "gcc"
+
+// C++ compiler name.
+#define CP_COMPILER_NAME "g++"
+
+#endif // ! COMPILER_NAME_H
Index: libcc1/libcp1.cc
===================================================================
--- a/src/libcc1/libcp1.cc (revision 254837)
+++ b/src/libcc1/libcp1.cc (revision 254838)
@@ -37,7 +37,7 @@
#include "libiberty.h"
#include "xregex.h"
#include "findcomp.hh"
-#include "cp-compiler-name.h"
+#include "compiler-name.hh"
#include "intl.h"
struct libcp1;
Index: libcc1/Makefile.am
===================================================================
--- a/src/libcc1/Makefile.am (revision 254837)
+++ b/src/libcc1/Makefile.am (revision 254838)
@@ -45,24 +45,6 @@
cc1lib_LTLIBRARIES = libcc1.la
endif
-BUILT_SOURCES = c-compiler-name.h cp-compiler-name.h
-MOSTLYCLEANFILES = c-compiler-name.h cp-compiler-name.h
-
-# Put this in a header so we don't run sed for each compilation. This
-# is also simpler to debug as one can easily see the constant.
-# FIXME: compute it in configure.ac and output it in config.status, or
-# introduce timestamp files for some indirection to avoid rebuilding it
-# every time.
-c-compiler-name.h: Makefile
- -rm -f $@T
- echo "#define C_COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@T
- mv $@T $@ # $(SHELL) $(srcdir)/../move-if-change $@T $@
-
-cp-compiler-name.h: Makefile
- -rm -f $@T
- echo "#define CP_COMPILER_NAME \"`echo g++ | sed '$(transform)'`\"" > $@T
- mv $@T $@ # $(SHELL) $(srcdir)/../move-if-change $@T $@
-
shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
marshall.cc marshall.hh rpc.hh status.hh
|