aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/Makefile.in6
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-pretty-print.h2
4 files changed, 16 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8a7f25..c87ebd7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-22 Romain Geissler <romain.geissler@gmail.com>
+
+ PR plugins/45348
+ PR plugins/48425
+ PR plugins/46577
+ * Makefile.in: Do not flatten c-family directory when installing
+ plugin headers.
+
2011-07-25 Eric Botcazou <ebotcazou@adacore.com>
* ipa-inline.c (can_inline_edge_p): Look into DECL_STRUCT_FUNCTION of
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 88d8513..e6d1717 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4602,8 +4602,8 @@ s-header-vars: Makefile
# Install the headers needed to build a plugin.
install-plugin: installdirs lang.install-plugin s-header-vars
-# We keep the directory structure for files in config and .def files. All
-# other files are flattened to a single directory.
+# We keep the directory structure for files in config or c-family and .def
+# files. All other files are flattened to a single directory.
$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \
srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
@@ -4615,7 +4615,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars
else continue; \
fi; \
case $$path in \
- "$(srcdir)"/config/* | "$(srcdir)"/*.def ) \
+ "$(srcdir)"/config/* | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \
base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \
*) base=`basename $$path` ;; \
esac; \
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index be7317d..7d85299 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-25 Romain Geissler <romain.geissler@gmail.com>
+
+ * c-pretty-print.h: Search c-common.h in c-family.
+
2011-07-22 Jason Merrill <jason@redhat.com>
PR c++/49793
diff --git a/gcc/c-family/c-pretty-print.h b/gcc/c-family/c-pretty-print.h
index b41e8ed..8d399dd 100644
--- a/gcc/c-family/c-pretty-print.h
+++ b/gcc/c-family/c-pretty-print.h
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3. If not see
#define GCC_C_PRETTY_PRINTER
#include "tree.h"
-#include "c-common.h"
+#include "c-family/c-common.h"
#include "pretty-print.h"