From patchwork Sun Jul 11 04:44:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix PR42843 to use built compilers
Date: Sat, 10 Jul 2010 18:44:16 -0000
From: Jack Howarth <howarth@bromo.med.uc.edu>
X-Patchwork-Id: 58507
Message-Id: <20100711044416.GA15826@bromo.med.uc.edu>
To: gcc-patches@gcc.gnu.org
Cc: amylaar@gcc.gnu.org

The previous fix for PR testsuite/42843 (r160461) incorrectly
set PLUGINCC and PLUGINCFLAGS to the values for the host
compiler rather than the built compiler. The attached patch
uses ENABLE_BUILD_WITH_CXX to conditionally set PLUGINCC
to either CC or CXX and PLUGINCFLAGS to either CFLAGS or
CXXFLAGS. The patch also adds the missing include of
diagnostic.h for those testcases that require warning() to
be defined. Bootstrapped and regression tested with --enable-build-with-cxx
on x86_64-apple-darwin10. Okay for gcc trunk?
                  Jack

2010-07-10  Jack Howarth  <howarth@bromo.med.uc.edu>

        PR testsuite/42843
        * gcc/Makefile.in: Define PLUGINCC and PLUGINCFLAGS
	conditionally on ENABLE_BUILD_WITH_CXX.
	* gcc.dg/plugin/selfassign.c: Include diagnostic.h.
	* gcc.dg/plugin/ggcplug.c: Likewise.
	* g++.dg/plugin/selfassign.c: Likewise.
	* g++.dg/plugin/attribute_plugin.c: Likewise.
	* g++.dg/plugin/dumb_plugin.c: Likewise.
	* g++.dg/plugin/pragma_plugin.c: Likewise.


Index: gcc/testsuite/gcc.dg/plugin/selfassign.c
===================================================================
--- gcc/testsuite/gcc.dg/plugin/selfassign.c	(revision 162051)
+++ gcc/testsuite/gcc.dg/plugin/selfassign.c	(working copy)
@@ -14,6 +14,7 @@
 #include "tree-pass.h"
 #include "intl.h"
 #include "plugin-version.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/testsuite/gcc.dg/plugin/ggcplug.c
===================================================================
--- gcc/testsuite/gcc.dg/plugin/ggcplug.c	(revision 162051)
+++ gcc/testsuite/gcc.dg/plugin/ggcplug.c	(working copy)
@@ -13,6 +13,7 @@
 #include "intl.h"
 #include "gcc-plugin.h"
 #include "plugin-version.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/testsuite/g++.dg/plugin/selfassign.c
===================================================================
--- gcc/testsuite/g++.dg/plugin/selfassign.c	(revision 162051)
+++ gcc/testsuite/g++.dg/plugin/selfassign.c	(working copy)
@@ -14,6 +14,7 @@
 #include "tree-pass.h"
 #include "intl.h"
 #include "plugin-version.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/testsuite/g++.dg/plugin/attribute_plugin.c
===================================================================
--- gcc/testsuite/g++.dg/plugin/attribute_plugin.c	(revision 162051)
+++ gcc/testsuite/g++.dg/plugin/attribute_plugin.c	(working copy)
@@ -10,6 +10,7 @@
 #include "intl.h"
 #include "toplev.h"
 #include "plugin.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/testsuite/g++.dg/plugin/dumb_plugin.c
===================================================================
--- gcc/testsuite/g++.dg/plugin/dumb_plugin.c	(revision 162051)
+++ gcc/testsuite/g++.dg/plugin/dumb_plugin.c	(working copy)
@@ -10,6 +10,7 @@
 #include "tree-pass.h"
 #include "intl.h"
 #include "toplev.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/testsuite/g++.dg/plugin/pragma_plugin.c
===================================================================
--- gcc/testsuite/g++.dg/plugin/pragma_plugin.c	(revision 162051)
+++ gcc/testsuite/g++.dg/plugin/pragma_plugin.c	(working copy)
@@ -14,6 +14,7 @@
 #include "tree-pass.h"
 #include "intl.h"
 #include "toplev.h"
+#include "diagnostic.h"
 
 int plugin_is_GPL_compatible;
 
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in	(revision 162051)
+++ gcc/Makefile.in	(working copy)
@@ -330,12 +330,15 @@
 LTO_BINARY_READER = @LTO_BINARY_READER@
 LTO_USE_LIBELF = @LTO_USE_LIBELF@
 
-# Compiler needed for plugin support
-PLUGINCC = $(COMPILER)
+# Compiler and flags needed for plugin support
+ifneq ($(ENABLE_BUILD_WITH_CXX),yes)
+PLUGINCC = $(CC)
+PLUGINCFLAGS = $(CFLAGS)
+else
+PLUGINCC = $(CXX)
+PLUGINCFLAGS = $(CXXFLAGS)
+endif
 
-# Flags needed for plugin support
-PLUGINCFLAGS = $(COMPILER_FLAGS)
-
 # Libs and linker options needed for plugin support
 PLUGINLIBS = @pluginlibs@