From: Nathan Sidwell <nathan@codesourcery.com>
Date: Sun, 17 Jun 2007 13:09:58 +0000 (+0000)
Subject: atomicity.h: Use __mcfisaa__...
X-Git-Tag: releases/gcc-4.3.0~4418
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19caedae314ce20ca4eb9cc7a64432d6fdf850b7;p=thirdparty%2Fgcc.git

atomicity.h: Use __mcfisaa__...

	* config/cpu/m68k/atomicity.h: Use __mcfisaa__, __mcfisaaplus__,
	__mcfisab__ & __mcfisac__ instead of obsolete cpu #defines.

From-SVN: r125775
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e4bdd7b7e38..82e860dbe7aa 100644
--- 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 f63b582a9768..1d1b4276df85 100644
--- 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 */