From: Nathan Sidwell <nathan@codesourcery.com>
Date: Wed, 9 Aug 2000 09:57:55 +0000 (+0000)
Subject: rtti.c (build_dynamic_cast_1): Set "C" linkage for new abi runtime.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e8dad182700d23558d74de4d1461379d9ed6124;p=gcc.git

rtti.c (build_dynamic_cast_1): Set "C" linkage for new abi runtime.

	* rtti.c (build_dynamic_cast_1): Set "C" linkage for new abi
	runtime.
	* cp/tinfo.cc (__dynamic_cast): Likewise.
	* cp/inc/cxxabi.h (__dynamic_cast): Likewise.

From-SVN: r35588
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9044923b7cc..8912264d2d5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-09  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* rtti.c (build_dynamic_cast_1): Set "C" linkage for new abi
+	runtime.
+	* cp/tinfo.cc (__dynamic_cast): Likewise.
+	* cp/inc/cxxabi.h (__dynamic_cast): Likewise.	
+
 2000-08-09  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* cvt.c (convert_to_pointer_force): Fix error message when
diff --git a/gcc/cp/inc/cxxabi.h b/gcc/cp/inc/cxxabi.h
index 6e645530b0f..2587e85f26f 100644
--- a/gcc/cp/inc/cxxabi.h
+++ b/gcc/cp/inc/cxxabi.h
@@ -414,7 +414,7 @@ protected:
 };
 
 /* dynamic cast runtime */
-extern "C++"
+extern "C"
 void *__dynamic_cast (const void *__src_ptr,    /* object started from */
                       const __class_type_info *__src_type, /* static type of object */
                       const __class_type_info *__dst_type, /* desired target type */
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 63c1e3cc583..94e67a551a9 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -846,11 +846,7 @@ build_dynamic_cast_1 (type, expr)
 	                  (NULL_TREE, ptrdiff_type_node, void_list_node))));
 	        }
 	      tmp = build_function_type (ptr_type_node, tmp);
-	      if (new_abi_rtti_p ())
-		/* We want its name mangling.  */
-		dcast_fn = build_cp_library_fn_ptr (name, tmp);
-	      else
-		dcast_fn = build_library_fn_ptr (name, tmp);
+	      dcast_fn = build_library_fn_ptr (name, tmp);
               pop_nested_namespace (ns);
               dynamic_cast_node = dcast_fn;
 	    }
diff --git a/gcc/cp/tinfo.cc b/gcc/cp/tinfo.cc
index bb57bf8a50c..c381ff11101 100644
--- a/gcc/cp/tinfo.cc
+++ b/gcc/cp/tinfo.cc
@@ -1165,7 +1165,7 @@ __do_upcast (const __class_type_info *dst, const void *obj_ptr,
 }
 
 // this is the external interface to the dynamic cast machinery
-extern "C++" void *
+extern "C" void *
 __dynamic_cast (const void *src_ptr,    // object started from
                 const __class_type_info *src_type, // type of the starting object
                 const __class_type_info *dst_type, // desired target type