configure.target (LIMITSH): Set for cris.

	* configure.target (LIMITSH): Set for cris.
	(cpu_include_dir): Set for cris-*-*.
	* config/cpu/cris/bits/atomicity.h: New file.
	* config/cpu/cris/bits/limits.h: New file.

From-SVN: r45882

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a217547..647ed5e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-29  Hans-Peter Nilsson  <hp@axis.com>
+
+       * configure.target (LIMITSH): Set for cris.
+       (cpu_include_dir): Set for cris-*-*.
+       * config/cpu/cris/bits/atomicity.h: New file.
+       * config/cpu/cris/bits/limits.h: New file.
+
 2001-09-28  Benjamin Kosnik  <bkoz@redhat.com>
 
        * config/locale/time_members_gnu.h (__timepunct::_M_get_helper): Add.

diff --git a/libstdc++-v3/config/cpu/cris/bits/atomicity.h b/libstdc++-v3/config/cpu/cris/bits/atomicity.h
new file mode 100644 (file)
index 0000000..653595e
--- /dev/null
+++ b/libstdc++-v3/config/cpu/cris/bits/atomicity.h
@@ -0,0 +1,79 @@
+// Low-level functions for atomic operations: Generic version  -*- C++ -*-
+
+// Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#ifndef _BITS_ATOMICITY_H
+#define _BITS_ATOMICITY_H      1
+
+// This entity must not cross a page boundary.
+typedef int _Atomic_word __attribute__ ((__aligned__ (4)));
+
+static inline _Atomic_word
+__attribute__ ((__unused__))
+__exchange_and_add (_Atomic_word* __mem, int __val)
+{
+  int __tmp;
+  _Atomic_word __result;
+
+#if (__CRIS_arch_version >= 10)
+  __asm__ __volatile__ (" clearf               \n"
+                       "0:                     \n"
+                       " move.d %4,%2          \n"
+                       " move.d [%3],%0        \n"
+                       " add.d %0,%2           \n"
+                       " ax                    \n"
+                       " move.d %2,[%3]        \n"
+                       " bwf 0b                \n"
+                       " clearf                \n"
+                       :  "=&r" (__result), "=m" (*__mem), "=&r" (__tmp)
+                       : "r" (__mem), "g" (__val), "m" (*__mem)
+                       : "memory");
+#else
+  __asm__ __volatile__ (" move $ccr,$r9                \n"
+                       " di                    \n"
+                       " move.d %4,%2          \n"
+                       " move.d [%3],%0        \n"
+                       " add.d %0,%2           \n"
+                       " move.d %2,[%3]        \n"
+                       " move $r9,$ccr         \n"
+                       :  "=&r" (__result), "=m" (*__mem), "=&r" (__tmp)
+                       : "r" (__mem), "g" (__val), "m" (*__mem)
+                       : "memory", "r9");
+#endif
+
+  return __result;
+}
+
+static inline void
+__attribute__ ((__unused__))
+__atomic_add (_Atomic_word* __mem, int __val)
+{
+  __exchange_and_add (__mem, __val);
+}
+
+#endif /* atomicity.h */

diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 6d10614..db81c4e 100644 (file)
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -30,6 +30,9 @@ case "${target_cpu}" in
   arm*)
     cpu_include_dir="config/cpu/arm"
     ;;
+  cris)
+    cpu_include_dir="config/cpu/cris"
+    ;;
   ia64)
     cpu_include_dir="config/cpu/ia64"
     ;;
@@ -140,6 +143,9 @@ case "${target}" in
    powerpc-*-*)
      LIMITSH=config/cpu/powerpc
      ;;
+   cris-*-*)
+     LIMITSH=config/cpu/cris
+     ;;
    *)
      LIMITSH=config/cpu/generic
      ;;