* config/cpu/m68k/atomicity.h: Use __mcfisaa__, __mcfisaaplus__,

	__mcfisab__ & __mcfisac__ instead of obsolete cpu #defines.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e4bdd7..82e860d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * config/cpu/m68k/atomicity.h: Use __mcfisaa__, __mcfisaaplus__,
+       __mcfisab__ & __mcfisac__ instead of obsolete cpu #defines.
+
 2007-06-13  Richard Earnshaw  <rearnsha@arm.com>
 
        * libsupc++/eh_arm.cc (__cxa_type_match): Handle foreign

diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h
index f63b582..1d1b427 100644 (file)
--- a/libstdc++-v3/config/cpu/m68k/atomicity.h
+++ b/libstdc++-v3/config/cpu/m68k/atomicity.h
@@ -89,14 +89,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     _Atomic_word __result;
     
     // bset with no immediate addressing (not SMP-safe)
-#if defined(__mcf5200__) || defined(__mcf5300__)
+#if defined(__mcfisaa__) || defined(__mcfisaaplus__)
     __asm__ __volatile__("1: bset.b #7,%0@\n\tjbne 1b"
                         : /* no outputs */
                         : "a"(&_Atomicity_lock<0>::_S_atomicity_lock)
                         : "cc", "memory");
     
-    // CPU32 and MCF5400 support test-and-set (SMP-safe).
-#elif defined(__mcpu32__) || defined(__mcf5400__)
+    // CPU32 and CF ISAs B & C support test-and-set (SMP-safe).
+#elif defined(__mcpu32__) || defined(__mcfisab__) || defined (__mcfisac__)
     __asm__ __volatile__("1: tas %0\n\tjbne 1b"
                         : "+m"(_Atomicity_lock<0>::_S_atomicity_lock)
                         : /* none */