[Patch/RFC] Atomic builtins clean up

[Paolo Carlini <pcarlini at suse dot de>]

Hi,

before minimally fixing 24692 I'd like to install a clean up like the 
below (in testing on x86-linux and ia64-linux), already mentioned time ago.

Anyone disagreeing with the idea of putting this new "generic" 
implementation of atomicity.h, exploiting the atomic builtins, under 
config/cpu/generic/atomic_builtins? I'm open to alternate suggestions... 
For instance, at first I had it one level above, in 
config/cpu/atomic_builtins, but that way I think it's not clear that we 
are talking about a generic implementation after all and that generic 
implementations of other cpu files, like atomic_word.h, can go with it.

Paolo.

/////////////////
2006-05-27  Paolo Carlini  <pcarlini@suse.de>

	* configure.host: If the CPU provides atomic builtins select
	generic/atomic_builtins/atomicity.h.
	* config/cpu/generic/atomic_builtins/atomicity.h: Add.
	* config/cpu/powerpc/atomicity.h: Remove.
	* config/cpu/ia64/atomicity.h: Likewise.
	* config/cpu/alpha/atomicity.h: Likewise.
	* config/cpu/s390/atomicity.h: Likewise.

Index: configure.host
===================================================================
--- configure.host	(revision 114043)
+++ configure.host	(working copy)
@@ -142,11 +142,18 @@
 abi_baseline_pair=${try_cpu}-${host_os}
 unset try_cpu
 
-if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
-  atomicity_dir=$cpu_include_dir
-else
-  atomicity_dir="cpu/generic"
-fi
+case "${host_cpu}" in
+  alpha* | ia64 | powerpc* | rs6000 | s390*)
+    atomicity_dir="cpu/generic/atomic_builtins"
+    ;;
+  *)
+    if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+      atomicity_dir=$cpu_include_dir
+    else
+      atomicity_dir="cpu/generic"
+    fi
+    ;;
+esac
 
 if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
   abi_tweaks_dir=$cpu_include_dir
Index: config/cpu/powerpc/atomicity.h
===================================================================
--- config/cpu/powerpc/atomicity.h	(revision 114043)
+++ config/cpu/powerpc/atomicity.h	(working copy)
@@ -1,45 +0,0 @@
-// Low-level functions for atomic operations: PowerPC version  -*- C++ -*-
-
-// Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// 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.
-
-#include <bits/atomicity.h>
-
-_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-  _Atomic_word
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __sync_fetch_and_add(__mem, __val); }
-  
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __sync_fetch_and_add(__mem, __val); }
-
-_GLIBCXX_END_NAMESPACE
Index: config/cpu/ia64/atomicity.h
===================================================================
--- config/cpu/ia64/atomicity.h	(revision 114043)
+++ config/cpu/ia64/atomicity.h	(working copy)
@@ -1,45 +0,0 @@
-// Low-level functions for atomic operations: IA64 version  -*- C++ -*-
-
-// Copyright (C) 2000, 2001, 2003, 2004, 2005
-// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// 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.
-
-#include <bits/atomicity.h>
-
-_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-  _Atomic_word 
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __sync_fetch_and_add(__mem, __val); }
-
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __sync_fetch_and_add(__mem, __val); }
-
-_GLIBCXX_END_NAMESPACE
Index: config/cpu/alpha/atomicity.h
===================================================================
--- config/cpu/alpha/atomicity.h	(revision 114043)
+++ config/cpu/alpha/atomicity.h	(working copy)
@@ -1,46 +0,0 @@
-// Low-level functions for atomic operations: Alpha version  -*- C++ -*-
-
-// Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// 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.
-
-#include <bits/atomicity.h>
-
-_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-  _Atomic_word
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __sync_fetch_and_add(__mem, __val); }
-
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __sync_fetch_and_add(__mem, __val); }
-
-_GLIBCXX_END_NAMESPACE
-
Index: config/cpu/generic/atomic_builtins/atomicity.h
===================================================================
--- config/cpu/generic/atomic_builtins/atomicity.h	(revision 0)
+++ config/cpu/generic/atomic_builtins/atomicity.h	(revision 0)
@@ -0,0 +1,45 @@
+// Low-level functions for atomic operations: version for CPUs providing
+// atomic builtins -*- C++ -*-
+
+// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// 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.
+
+#include <bits/atomicity.h>
+
+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
+
+  _Atomic_word 
+  __attribute__ ((__unused__))
+  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
+  { return __sync_fetch_and_add(__mem, __val); }
+
+  void
+  __attribute__ ((__unused__))
+  __atomic_add(volatile _Atomic_word* __mem, int __val)
+  { __sync_fetch_and_add(__mem, __val); }
+
+_GLIBCXX_END_NAMESPACE
Index: config/cpu/s390/atomicity.h
===================================================================
--- config/cpu/s390/atomicity.h	(revision 114043)
+++ config/cpu/s390/atomicity.h	(working copy)
@@ -1,44 +0,0 @@
-// Low-level functions for atomic operations: S/390 version  -*- C++ -*-
-
-// Copyright (C) 2001, 2003, 2004, 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// 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.
-
-#include <bits/atomicity.h>
-
-_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
-  _Atomic_word 
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
-  { return __sync_fetch_and_add(__mem, __val); }
-  
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word* __mem, int __val)
-  { __sync_fetch_and_add(__mem, __val); }
-
-_GLIBCXX_END_NAMESPACE