* configure.ac: Set ABI_TWEAKS_SRCDIR.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / libsupc++ / cxxabi.h

diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h
index 9e8a090..f1f74e7 100644 (file)
--- a/libstdc++-v3/libsupc++/cxxabi.h
+++ b/libstdc++-v3/libsupc++/cxxabi.h
@@ -43,6 +43,7 @@
 #define _CXXABI_H 1
 
 #include <stddef.h>
+#include <bits/cxxabi_tweaks.h>
  
 #ifdef __cplusplus
 namespace __cxxabiv1
@@ -104,14 +105,6 @@ namespace __cxxabiv1
                    size_t __padding_size, void (*__destructor) (void*),
                    void (*__dealloc) (void*, size_t));
 
-#ifdef __ARM_EABI__
-  // The ARM EABI says this is a 32-bit type.
-  typedef int __guard;
-#else
-  // The ABI requires a 64-bit type.
-  __extension__ typedef int __guard __attribute__((mode (__DI__)));
-#endif
-
   int 
   __cxa_guard_acquire(__guard*);