4 files changed, 8 insertions, 31 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index f2c8a56..d3a6e29 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-14   Diego Novillo  <dnovillo@google.com>
+
+	Merge from cxx-conversion branch.  Configury.
+
+	* go-c.h: Remove all handlers of ENABLE_BUILD_WITH_CXX.
+	* go-gcc.cc: Likewise.
+	* go-system.h: Likewise.
+
 2012-07-24  Uros Bizjak  <ubizjak@gmail.com>
 
 	* go-lang.c (lang_decl): Add variable_size GTY option.
diff --git a/gcc/go/go-c.h b/gcc/go/go-c.h
index d46a087..a7f7b1f 100644
--- a/gcc/go/go-c.h
+++ b/gcc/go/go-c.h
@@ -20,16 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GO_GO_C_H
 #define GO_GO_C_H
 
-#ifdef ENABLE_BUILD_WITH_CXX
 #define GO_EXTERN_C
-#else
-#define GO_EXTERN_C extern "C"
-#endif
-
-#if defined(__cplusplus) && !defined(ENABLE_BUILD_WITH_CXX)
-extern "C"
-{
-#endif
 
 #include "machmode.h"
 
@@ -71,8 +62,4 @@ extern const char *go_read_export_data (int, off_t, char **, size_t *, int *);
 
 extern GTY(()) tree go_non_zero_struct;
 
-#if defined(__cplusplus) && !defined(ENABLE_BUILD_WITH_CXX)
-} /* End extern "C".  */
-#endif
-
 #endif /* !defined(GO_GO_C_H) */
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 4729a3b..84bc972 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -24,20 +24,11 @@
 // include it here before tree.h includes it later.
 #include <gmp.h>
 
-#ifndef ENABLE_BUILD_WITH_CXX
-extern "C"
-{
-#endif
-
 #include "tree.h"
 #include "tree-iterator.h"
 #include "gimple.h"
 #include "toplev.h"
 
-#ifndef ENABLE_BUILD_WITH_CXX
-}
-#endif
-
 #include "go-c.h"
 
 #include "gogo.h"
diff --git a/gcc/go/go-system.h b/gcc/go/go-system.h
index 08aac6a..2decc55 100644
--- a/gcc/go/go-system.h
+++ b/gcc/go/go-system.h
@@ -134,11 +134,6 @@ struct hash<T*>
 // later.
 #include <cstdio>
 
-#ifndef ENABLE_BUILD_WITH_CXX
-extern "C"
-{
-#endif
-
 #include "system.h"
 #include "ansidecl.h"
 #include "coretypes.h"
@@ -147,10 +142,6 @@ extern "C"
 #include "input.h"		/* For source_location.  */
 #include "intl.h"		/* For _().  */
 
-#ifndef ENABLE_BUILD_WITH_CXX
-} // End extern "C"
-#endif
-
 // When using gcc, go_assert is just gcc_assert.
 #define go_assert(EXPR) gcc_assert(EXPR)