Remove old ABI support from libsupc++.

	* libsupc++/cxxabi.h: Remove conditionally compiled code.
	* libsupc++/exception_support.cc: Likewise.
	* libsupc++/pure.cc: Likewise.
	* libsupc++/tinfo.cc: Likewise.
	* libsupc++/tinfo.h: Likewise.
	* libsupc++/tinfo2.cc: Likewise.
	* libsupc++/typeinfo: Likewise.
	* libsupc++/vec.cc: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@39732 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 0 insertions, 264 deletions

diff --git a/libstdc++-v3/libsupc++/tinfo2.cc b/libstdc++-v3/libsupc++/tinfo2.cc
index 1f33b438c40..a29d1d30f02 100644
--- a/libstdc++-v3/libsupc++/tinfo2.cc
+++ b/libstdc++-v3/libsupc++/tinfo2.cc
@@ -48,65 +48,8 @@ type_info::before (const type_info &arg) const
 
 #endif
 
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-
-// type info for pointer type.
-
-struct __pointer_type_info : public type_info {
-  const type_info& type;
-
-  __pointer_type_info (const char *n, const type_info& ti)
-    : type_info (n), type (ti) {}
-};
-
-// type info for attributes
-
-struct __attr_type_info : public type_info {
-  enum cv { NONE = 0, CONST = 1, VOLATILE = 2, CONSTVOL = 1 | 2 };
-
-  const type_info& type;
-  cv attr;
-
-  __attr_type_info (const char *n, cv a, const type_info& t)
-    : type_info (n), type (t), attr (a) {}
-};
-
-// type_info for builtin type
-
-struct __builtin_type_info : public type_info {
-  __builtin_type_info (const char *n): type_info (n) {}
-};
-
-// type info for function.
-
-struct __func_type_info : public type_info {
-  __func_type_info (const char *n) : type_info (n) {}
-};
-
-// type info for pointer to member function.
-
-struct __ptmf_type_info : public type_info {
-  __ptmf_type_info (const char *n) : type_info (n) {}
-};
-
-// type info for pointer to data member.
-
-struct __ptmd_type_info : public type_info {
-  __ptmd_type_info (const char *n): type_info (n) {}
-};
-
-// type info for array.
-
-struct __array_type_info : public type_info {
-  __array_type_info (const char *n): type_info (n) {}
-};
-
-#else
-
 #include <cxxabi.h>
-#endif
 
-#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100
 namespace __cxxabiv1 {
 
 using namespace std;
@@ -222,7 +165,6 @@ __pointer_catch (const __pbase_type_info *thr_type,
 }
 
 } // namespace std
-#endif
 
 // Entry points for the compiler.
 
@@ -238,141 +180,9 @@ __throw_type_match_rtti_2 (const void *catch_type_r, const void *throw_type_r,
 
   *valp = objptr;
 
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-// old abi
-  if (catch_type == throw_type)
-    return 1;
-  
-  if (const __user_type_info *p
-      = dynamic_cast <const __user_type_info *> (&throw_type))
-    {
-      return p->upcast (catch_type, objptr, valp);
-    }
-  else if (const __pointer_type_info *fr =
-	   dynamic_cast <const __pointer_type_info *> (&throw_type))
-    {
-      const __pointer_type_info *to =
-	   dynamic_cast <const __pointer_type_info *> (&catch_type);
-
-      if (! to)
-	return 0;
-
-      const type_info *subfr = &fr->type, *subto = &to->type;
-      __attr_type_info::cv cvfrom, cvto;
-
-      if (const __attr_type_info *at
-	  = dynamic_cast <const __attr_type_info *> (subfr))
-	{
-	  cvfrom = at->attr;
-	  subfr = &at->type;
-	}
-      else
-	cvfrom = __attr_type_info::NONE;
-      
-      if (const __attr_type_info *at
-	  = dynamic_cast <const __attr_type_info *> (subto))
-	{
-	  cvto = at->attr;
-	  subto = &at->type;
-	}
-      else
-	cvto = __attr_type_info::NONE;
-
-      if (((cvfrom & __attr_type_info::CONST)
-	   > (cvto & __attr_type_info::CONST))
-	  || ((cvfrom & __attr_type_info::VOLATILE)
-	      > (cvto & __attr_type_info::VOLATILE)))
-	return 0;
-
-      if (*subto == *subfr)
-	return 1;
-      else if (*subto == typeid (void)
-	       && dynamic_cast <const __func_type_info *> (subfr) == 0)
-	return 1;
-      else if (const __user_type_info *p
-	       = dynamic_cast <const __user_type_info *> (subfr))
-	return p->upcast (*subto, objptr, valp);
-      else if (const __pointer_type_info *pfr
-	       = dynamic_cast <const __pointer_type_info *> (subfr))
-	{
-	  // Multi-level pointer conversion.
-
-	  const __pointer_type_info *pto
-	    = dynamic_cast <const __pointer_type_info *> (subto);
-
-	  if (! pto)
-	    return 0;
-	    
-	  bool constp = (cvto & __attr_type_info::CONST);
-	  for (subto = &pto->type, subfr = &pfr->type; ;
-	       subto = &pto->type, subfr = &pfr->type)
-	    {
-	      if (const __attr_type_info *at
-		  = dynamic_cast <const __attr_type_info *> (subfr))
-		{
-		  cvfrom = at->attr;
-		  subfr = &at->type;
-		}
-	      else
-		cvfrom = __attr_type_info::NONE;
-      
-	      if (const __attr_type_info *at
-		  = dynamic_cast <const __attr_type_info *> (subto))
-		{
-		  cvto = at->attr;
-		  subto = &at->type;
-		}
-	      else
-		cvto = __attr_type_info::NONE;
-
-	      if (((cvfrom & __attr_type_info::CONST)
-		   > (cvto & __attr_type_info::CONST))
-		  || ((cvfrom & __attr_type_info::VOLATILE)
-		      > (cvto & __attr_type_info::VOLATILE)))
-		return 0;
-
-	      if (! constp
-		  && (((cvfrom & __attr_type_info::CONST)
-		       < (cvto & __attr_type_info::CONST))
-		      || ((cvfrom & __attr_type_info::VOLATILE)
-			  < (cvto & __attr_type_info::VOLATILE))))
-		return 0;
-
-	      if (*subto == *subfr)
-		return 1;
-
-	      pto = dynamic_cast <const __pointer_type_info *> (subto);
-	      pfr = dynamic_cast <const __pointer_type_info *> (subfr);
-	      if (! pto || ! pfr)
-		return 0;		
-
-	      if (! (cvto & __attr_type_info::CONST))
-		constp = false;
-	    }
-	}
-    }
-#else
-// new abi
-  
   return catch_type.__do_catch (&throw_type, valp, 1);
-#endif
-  return 0;
 }
 
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-/* Backward compatibility wrapper.  */
-
-extern "C" void*
-__throw_type_match_rtti (const void *catch_type_r, const void *throw_type_r,
-			 void *objptr)
-{
-  void *ret;
-  if (__throw_type_match_rtti_2 (catch_type_r, throw_type_r, objptr, &ret))
-    return ret;
-  return NULL;
-}
-#endif
-
 /* Called from __cp_pop_exception.  Is P the type_info node for a pointer
    of some kind?  */
 
@@ -380,80 +190,6 @@ bool
 __is_pointer (void *p)
 {
   const type_info *t = reinterpret_cast <const type_info *>(p);
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-// old abi
-  const __pointer_type_info *pt =
-    dynamic_cast <const __pointer_type_info *> (t);
-  return pt != 0;
-#else
-// new abi
   return t->__is_pointer_p ();
-#endif
 }
 
-#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-// old abi
-
-extern "C" void
-__rtti_ptr (void *addr, const char *n, const type_info *ti)
-{ new (addr) __pointer_type_info (n, *ti); }
-
-extern "C" void
-__rtti_attr (void *addr, const char *n, int attrval, const type_info *ti)
-{
-  new (addr) __attr_type_info
-    (n, static_cast <__attr_type_info::cv> (attrval), *ti);
-}
-
-extern "C" void
-__rtti_func (void *addr, const char *name)
-{ new (addr) __func_type_info (name); }
-
-extern "C" void
-__rtti_ptmf (void *addr, const char *name)
-{ new (addr) __ptmf_type_info (name); }
-
-extern "C" void
-__rtti_ptmd (void *addr, const char *name)
-{ new (addr) __ptmd_type_info (name); }
-
-extern "C" void
-__rtti_array (void *addr, const char *name)
-{ new (addr) __array_type_info (name); }
-
-extern "C" void *
-__dynamic_cast (const type_info& (*from)(void), const type_info& (*to)(void),
-		int require_public, void *address, const type_info & (*sub)(void), void *subptr)
-{
-  if (!require_public) abort();
-  return static_cast <__user_type_info const &> (from ()).dyncast
-      (/*boff=*/-1, to (), address, sub (), subptr);
-}
-
-extern "C" void *
-__dynamic_cast_2 (const type_info& (*from)(void), const type_info& (*to)(void),
-                  int boff,
-		  void *address, const type_info & (*sub)(void), void *subptr)
-{
-  return static_cast <__user_type_info const &> (from ()).dyncast
-      (boff, to (), address, sub (), subptr);
-}
-
-// type_info nodes and functions for the builtin types.  The mangling here
-// must match the mangling in gcc/cp/rtti.c.
-
-#define BUILTIN(mangled)					\
-unsigned char __ti##mangled [sizeof (__builtin_type_info)]	\
-  __attribute__ ((aligned (__alignof__ (void *))));		\
-extern "C" const type_info &__tf##mangled (void) {		\
-  if ((*(void **) __ti##mangled) == 0)				\
-    new (__ti##mangled) __builtin_type_info (#mangled);		\
-  return *(type_info *)__ti##mangled;				\
-}
-
-BUILTIN (v); BUILTIN (x); BUILTIN (l); BUILTIN (i); BUILTIN (s); BUILTIN (b);
-BUILTIN (c); BUILTIN (w); BUILTIN (r); BUILTIN (d); BUILTIN (f);
-BUILTIN (Ui); BUILTIN (Ul); BUILTIN (Ux); BUILTIN (Us); BUILTIN (Uc);
-BUILTIN (Sc);
-
-#endif