Add libatomic as a target library.

From-SVN: r187018

13 files changed, 810 insertions, 0 deletions

diff --git a/libatomic/config/arm/arm-config.h b/libatomic/config/arm/arm-config.h
new file mode 100644
index 0000000..b94a372
--- /dev/null
+++ b/libatomic/config/arm/arm-config.h
@@ -0,0 +1,75 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+
+#if defined(__ARM_ARCH_2__)
+# define __ARM_ARCH__ 2
+#endif
+
+#if defined(__ARM_ARCH_3__)
+# define __ARM_ARCH__ 3
+#endif
+
+#if defined(__ARM_ARCH_3M__) || defined(__ARM_ARCH_4__) \
+	|| defined(__ARM_ARCH_4T__)
+/* We use __ARM_ARCH__ set to 4 here, but in reality it's any processor with
+   long multiply instructions.  That includes v3M.  */
+# define __ARM_ARCH__ 4
+#endif
+	
+#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
+	|| defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
+	|| defined(__ARM_ARCH_5TEJ__)
+# define __ARM_ARCH__ 5
+#endif
+
+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
+	|| defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
+	|| defined(__ARM_ARCH_6M__)
+# define __ARM_ARCH__ 6
+#endif
+
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
+	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
+	|| defined(__ARM_ARCH_7EM__)
+# define __ARM_ARCH__ 7
+#endif
+
+#ifndef __ARM_ARCH__
+#error Unable to determine architecture.
+#endif
+
+#if __ARM_ARCH__ >= 7 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6ZK__)
+# define HAVE_STREX	1
+# define HAVE_STREXBHD	1
+#elif __ARM_ARCH__ == 6
+# define HAVE_STREX	1
+#endif
+
+#if __ARM_ARCH__ >= 7
+# define HAVE_DMB	1
+#elif __ARM_ARCH__ == 6
+# define HAVE_DMB_MCR	1
+#endif
diff --git a/libatomic/config/arm/exch_n.c b/libatomic/config/arm/exch_n.c
new file mode 100644
index 0000000..ba6258b
--- /dev/null
+++ b/libatomic/config/arm/exch_n.c
@@ -0,0 +1,114 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <libatomic_i.h>
+#include <arm-config.h>
+
+
+/* When using STREX to implement sub-word exchange, we can do much better
+   than the compiler by using the APSR.GE and APSR.C flags.  */
+
+#if !DONE && HAVE_STREX && !HAVE_STREXBH && N == 2
+UTYPE
+SIZE(libat_exchange) (UTYPE *mptr, UTYPE newval, int smodel)
+{
+  UWORD t1, t2;
+  UTYPE oldval;
+
+  __atomic_thread_fence (__ATOMIC_SEQ_CST);
+
+  /* In the N=2 case, there are only two cases for MPTR: mptr % 4 == {0,2}.
+     Rather than computing a variable shift for this, we can store the one
+     bit of misalignment in the carry flag, and use conditional constant
+     shifts instead.  This saves a register.  */
+#ifdef __ARMEB__
+# define HI	"cc"				/* iff value is in high half */
+# define LO	"cs"				/* iff value is in low half */
+#else
+# define HI	"cs"
+# define LO	"cc"
+#endif
+
+  asm volatile (
+		"lsrs	%[t2],%[ptr],#2\n"	/* carry = mptr & 2 */
+	"	bic	%[ptr],%[ptr],#3\n"	/* align mptr */
+	"	itt	"HI"\n"
+	"	lsl"HI"	%[t1],%[t1],#16\n"	/* shift mask into place */
+	"	lsl"HI"	%[new],%[new],#16\n"	/* shift newval into place */
+	"	uadd16	%[t1],%[t1],%[t1]\n"	/* copy mask into APSR.GE */
+	"0:	ldrex	%[t2],[%[ptr]]\n"
+	"	ite	"LO"\n"
+	"	uxth"LO" %[old],%[t2]\n"	/* return old value */
+	"	uxth"HI" %[old],%[t2], ror #16\n"
+	"	sel	%[t1],%[new],%[t2]\n"	/* merge newval */
+	"	strex	%[t2],%[t1],[%[ptr]]\n"
+	"	tst	%[t2],%[t2]\n"		/* dont clobber carry */
+	"	bne	0b"
+	: [old] "=&r"(oldval), [t1] "=&r"(t1), [t2] "=&r"(t2),
+	  [ptr] "+r"(mptr), [new] "+r"(newval)
+	: "1"(0xffff)
+	: "memory");
+
+  __atomic_thread_fence (__ATOMIC_SEQ_CST);
+
+  return oldval;
+}
+
+#define DONE 1
+#endif /* !HAVE_STREXBH && N == 2 */
+
+
+#if !DONE && HAVE_STREX && !HAVE_STREXBH && N == 1
+UTYPE
+SIZE(libat_exchange) (UTYPE *mptr, UTYPE newval, int smodel)
+{
+  UWORD *wptr, woldval, wnewval, shift, mask, t1, t2;
+
+  __atomic_thread_fence (__ATOMIC_SEQ_CST);
+
+  wptr = (UWORD *)((uintptr_t)mptr & -WORDSIZE);
+  shift = (((uintptr_t)mptr % WORDSIZE) * CHAR_BIT) ^ INVERT_MASK_1;
+  mask = MASK_1 << shift;
+  wnewval = newval << shift;
+
+  asm volatile (
+		"uadd8	%[t1],%[t1],%[t1]\n"	/* move mask to APSR.GE */
+	"0:	ldrex	%[old],[%[wptr]]\n"
+	"	sel	%[t1],%[new],%[old]\n"	/* merge newval */
+	"	strex	%[t2],%[t1],[%[wptr]]\n"
+	"	cmp	%[t2],#0\n"
+	"	bne	0b"
+	: [old] "=&r"(woldval), [t1] "=&r"(t1), [t2] "=&r"(t2)
+	: [new] "r"(wnewval), [wptr] "r"(wptr), "1"(mask)
+	: "memory");
+
+  __atomic_thread_fence (__ATOMIC_SEQ_CST);
+
+  return woldval >> shift;
+}
+
+#define DONE 1
+#endif /* !HAVE_STREXBH && N == 1 */
+
+#include "../../exch_n.c"
diff --git a/libatomic/config/arm/host-config.h b/libatomic/config/arm/host-config.h
new file mode 100644
index 0000000..bbf4a3f
--- /dev/null
+++ b/libatomic/config/arm/host-config.h
@@ -0,0 +1,4 @@
+/* Avoiding the DMB (or kernel helper) can be a good thing.  */
+#define WANT_SPECIALCASE_RELAXED
+
+#include_next <host-config.h>
diff --git a/libatomic/config/ia64/host-config.h b/libatomic/config/ia64/host-config.h
new file mode 100644
index 0000000..d1f11c3
--- /dev/null
+++ b/libatomic/config/ia64/host-config.h
@@ -0,0 +1,5 @@
+/* Avoiding the synchronizations are a good thing.  */
+#define WANT_SPECIALCASE_RELAXED
+#define WANT_SPECIALCASE_ACQREL
+
+#include_next <host-config.h>
diff --git a/libatomic/config/linux/arm/host-config.h b/libatomic/config/linux/arm/host-config.h
new file mode 100644
index 0000000..5d87835
--- /dev/null
+++ b/libatomic/config/linux/arm/host-config.h
@@ -0,0 +1,179 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <config/arm/arm-config.h>
+
+
+/* Kernel helper for 32-bit compare-and-exchange.  */
+typedef int (__kernel_cmpxchg_t) (UWORD oldval, UWORD newval, UWORD *ptr);
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
+
+/* Kernel helper for 64-bit compare-and-exchange.  */
+typedef int (__kernel_cmpxchg64_t) (const U_8 * oldval, const U_8 * newval,
+				    U_8 *ptr);
+#define __kernel_cmpxchg64 (*(__kernel_cmpxchg64_t *) 0xffff0f60)
+
+/* Kernel helper for memory barrier.  */
+typedef void (__kernel_dmb_t) (void);
+#define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
+
+/* Kernel helper page version number.  */
+#define __kernel_helper_version (*(unsigned int *)0xffff0ffc)
+
+
+#ifndef HAVE_STREX
+static inline bool
+atomic_compare_exchange_w (UWORD *mptr, UWORD *eptr, UWORD newval,
+			   bool weak_p UNUSED, int sm UNUSED, int fm UNUSED)
+{
+  bool ret = true;
+  UWORD oldval;
+
+  oldval = *eptr;
+  if (__builtin_expect (__kernel_cmpxchg (oldval, newval, mptr) != 0, 0))
+    {
+      oldval = *mptr;
+      ret = false;
+    }
+  *eptr = oldval;
+
+  return ret;
+}
+# define atomic_compare_exchange_w atomic_compare_exchange_w
+# if N == WORDSIZE
+#  define atomic_compare_exchange_n atomic_compare_exchange_w
+# endif
+#endif /* HAVE_STREX */
+
+#if !defined(HAVE_STREXBHD) && defined(HAVE_KERNEL64) && N == 8
+static inline bool
+atomic_compare_exchange_n (UTYPE *mptr, UTYPE *eptr, UTYPE newval,
+			   bool weak_p UNUSED, int sm UNUSED, int fm UNUSED)
+{
+  if (__kernel_cmpxchg64 (eptr, &newval, mptr) == 0)
+    return true;
+  else
+    {
+      *eptr = *mptr;
+      return false;
+    }
+}
+#define atomic_compare_exchange_n atomic_compare_exchange_n
+#endif
+
+#if !defined(HAVE_DMB) && !defined(HAVE_DMB_MCR)
+static inline void
+pre_barrier(int model UNUSED)
+{
+  __kernel_dmb ();
+}
+
+static inline void
+post_barrier(int model UNUSED)
+{
+  __kernel_dmb ();
+}
+# define pre_post_barrier 1
+#endif /* !HAVE_DMB */
+
+#if HAVE_IFUNC
+extern bool libat_have_strexbhd HIDDEN;
+
+# define IFUNC_COND_1	libat_have_strexbhd
+# define IFUNC_COND_2	(__kernel_helper_version >= 5)
+
+/* Alternative 1 is -march=armv7-a -- we have everything native.  */
+# if IFUNC_ALT == 1
+#  undef  HAVE_ATOMIC_CAS_1
+#  undef  HAVE_ATOMIC_CAS_2
+#  undef  HAVE_ATOMIC_CAS_4
+#  undef  HAVE_ATOMIC_CAS_8
+#  undef  HAVE_ATOMIC_EXCHANGE_1
+#  undef  HAVE_ATOMIC_EXCHANGE_2
+#  undef  HAVE_ATOMIC_EXCHANGE_4
+#  undef  HAVE_ATOMIC_EXCHANGE_8
+#  undef  HAVE_ATOMIC_LDST_1
+#  undef  HAVE_ATOMIC_LDST_2
+#  undef  HAVE_ATOMIC_LDST_4
+#  undef  HAVE_ATOMIC_LDST_8
+#  undef  HAVE_ATOMIC_FETCH_OP_1
+#  undef  HAVE_ATOMIC_FETCH_OP_2
+#  undef  HAVE_ATOMIC_FETCH_OP_4
+#  undef  HAVE_ATOMIC_FETCH_OP_8
+#  undef  HAVE_ATOMIC_TAS_1
+#  undef  HAVE_ATOMIC_TAS_2
+#  undef  HAVE_ATOMIC_TAS_4
+#  undef  HAVE_ATOMIC_TAS_8
+#  define HAVE_ATOMIC_CAS_1		1
+#  define HAVE_ATOMIC_CAS_2		1
+#  define HAVE_ATOMIC_CAS_4		1
+#  define HAVE_ATOMIC_CAS_8		1
+#  define HAVE_ATOMIC_EXCHANGE_1	1
+#  define HAVE_ATOMIC_EXCHANGE_2	1
+#  define HAVE_ATOMIC_EXCHANGE_4	1
+#  define HAVE_ATOMIC_EXCHANGE_8	1
+#  define HAVE_ATOMIC_LDST_1		1
+#  define HAVE_ATOMIC_LDST_2		1
+#  define HAVE_ATOMIC_LDST_4		1
+#  define HAVE_ATOMIC_LDST_8		1
+#  define HAVE_ATOMIC_FETCH_OP_1	1
+#  define HAVE_ATOMIC_FETCH_OP_2	1
+#  define HAVE_ATOMIC_FETCH_OP_4	1
+#  define HAVE_ATOMIC_FETCH_OP_8	1
+#  define HAVE_ATOMIC_TAS_1		1
+#  define HAVE_ATOMIC_TAS_2		1
+#  define HAVE_ATOMIC_TAS_4		1
+#  define HAVE_ATOMIC_TAS_8		1
+# endif /* IFUNC_ALT == 1 */
+
+# undef  MAYBE_HAVE_ATOMIC_CAS_1
+# define MAYBE_HAVE_ATOMIC_CAS_1	IFUNC_COND_1
+# undef  MAYBE_HAVE_ATOMIC_EXCHANGE_1
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_1	MAYBE_HAVE_ATOMIC_CAS_1
+# undef  MAYBE_HAVE_ATOMIC_LDST_1
+# define MAYBE_HAVE_ATOMIC_LDST_1	MAYBE_HAVE_ATOMIC_CAS_1
+# undef  MAYBE_HAVE_ATOMIC_CAS_2
+# define MAYBE_HAVE_ATOMIC_CAS_2	IFUNC_COND_1
+# undef  MAYBE_HAVE_ATOMIC_EXCHANGE_2
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_2	MAYBE_HAVE_ATOMIC_CAS_2
+# undef  MAYBE_HAVE_ATOMIC_LDST_2
+# define MAYBE_HAVE_ATOMIC_LDST_2	MAYBE_HAVE_ATOMIC_CAS_2
+# undef  MAYBE_HAVE_ATOMIC_CAS_4
+# define MAYBE_HAVE_ATOMIC_CAS_4	IFUNC_COND_1
+# undef  MAYBE_HAVE_ATOMIC_EXCHANGE_4
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_4	MAYBE_HAVE_ATOMIC_CAS_4
+# undef  MAYBE_HAVE_ATOMIC_LDST_4
+# define MAYBE_HAVE_ATOMIC_LDST_4	MAYBE_HAVE_ATOMIC_CAS_4
+# undef  MAYBE_HAVE_ATOMIC_CAS_8
+# define MAYBE_HAVE_ATOMIC_CAS_8	(IFUNC_COND_1 | IFUNC_COND_2)
+# undef  MAYBE_HAVE_ATOMIC_EXCHANGE_8
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_8	MAYBE_HAVE_ATOMIC_CAS_8
+# undef  MAYBE_HAVE_ATOMIC_LDST_8
+# define MAYBE_HAVE_ATOMIC_LDST_8	MAYBE_HAVE_ATOMIC_CAS_8
+
+# define IFUNC_NCOND(N)			(N == 8 ? 2 : 1)
+
+#endif /* HAVE_IFUNC */
+
+#include_next <host-config.h>
diff --git a/libatomic/config/linux/arm/init.c b/libatomic/config/linux/arm/init.c
new file mode 100644
index 0000000..532160b
--- /dev/null
+++ b/libatomic/config/linux/arm/init.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+#if HAVE_IFUNC
+
+bool libat_have_strexbhd;
+
+static void __attribute__((constructor))
+init_cpu_revision (void)
+{
+}
+
+#endif /* HAVE_IFUNC */
diff --git a/libatomic/config/linux/arm/load_n.c b/libatomic/config/linux/arm/load_n.c
new file mode 100644
index 0000000..94e4278
--- /dev/null
+++ b/libatomic/config/linux/arm/load_n.c
@@ -0,0 +1,49 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+
+/* If we use the builtin we'll get __sync_synchronize, not __kernel_dmb.  */
+#if !DONE && N <= WORDSIZE && !defined(HAVE_DMB) && !defined(HAVE_DMB_MCR)
+UTYPE
+SIZE(libat_load) (UTYPE *mptr, int smodel)
+{
+  UTYPE ret;
+
+  if (maybe_specialcase_relaxed(smodel))
+    ret = *mptr;
+  else
+    {
+      __kernel_dmb ();
+      ret = *mptr;
+      __kernel_dmb ();
+    }
+  return ret;
+}
+
+#define DONE 1
+#endif /* !HAVE_DMB */
+
+#include "../../../load_n.c"
diff --git a/libatomic/config/linux/arm/store_n.c b/libatomic/config/linux/arm/store_n.c
new file mode 100644
index 0000000..4ab44c3
--- /dev/null
+++ b/libatomic/config/linux/arm/store_n.c
@@ -0,0 +1,46 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+
+/* If we use the builtin we'll get __sync_synchronize, not __kernel_dmb.  */
+#if !DONE && N <= WORDSIZE && !defined(HAVE_DMB) && !defined(HAVE_DMB_MCR)
+void
+SIZE(libat_store) (UTYPE *mptr, UTYPE val, int smodel)
+{
+  if (maybe_specialcase_relaxed(smodel))
+    *mptr = val;
+  else
+    {
+      __kernel_dmb ();
+      *mptr = val;
+      __kernel_dmb ();
+    }
+}
+
+#define DONE 1
+#endif /* !HAVE_DMB */
+
+#include "../../../store_n.c"
diff --git a/libatomic/config/posix/host-config.h b/libatomic/config/posix/host-config.h
new file mode 100644
index 0000000..a296fff
--- /dev/null
+++ b/libatomic/config/posix/host-config.h
@@ -0,0 +1,55 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Included after all more target-specific host-config.h.  */
+
+
+#ifndef protect_start_end
+# ifdef HAVE_ATTRIBUTE_VISIBILITY
+#  pragma GCC visibility push(hidden)
+# endif
+
+void libat_lock_1 (void *ptr);
+void libat_unlock_1 (void *ptr);
+
+static inline UWORD
+protect_start (void *ptr)
+{
+  libat_lock_1 (ptr);
+  return 0;
+}
+
+static inline void
+protect_end (void *ptr, UWORD dummy UNUSED)
+{
+  libat_unlock_1 (ptr);
+}
+
+# define protect_start_end 1
+# ifdef HAVE_ATTRIBUTE_VISIBILITY
+#  pragma GCC visibility pop
+# endif
+#endif /* protect_start_end */
+
+#include_next <host-config.h>
diff --git a/libatomic/config/posix/lock.c b/libatomic/config/posix/lock.c
new file mode 100644
index 0000000..e57d333
--- /dev/null
+++ b/libatomic/config/posix/lock.c
@@ -0,0 +1,116 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+#include <pthread.h>
+
+
+/* The target page size.  Must be no larger than the runtime page size,
+   lest locking fail with virtual address aliasing (i.e. a page mmaped
+   at two locations).  */
+#ifndef PAGE_SIZE
+#define PAGE_SIZE	4096
+#endif
+
+/* The target cacheline size.  This is an optimization; the padding that
+   should be applied to the locks to keep them from interfering.  */
+#ifndef CACHLINE_SIZE
+#define CACHLINE_SIZE	64
+#endif
+
+/* The granularity at which locks are applied.  Almost certainly the
+   cachline size is the right thing to use here.  */
+#ifndef WATCH_SIZE
+#define WATCH_SIZE	CACHLINE_SIZE
+#endif
+
+struct lock
+{
+  pthread_mutex_t mutex;
+  char pad[sizeof(pthread_mutex_t) < CACHLINE_SIZE
+	   ? CACHLINE_SIZE - sizeof(pthread_mutex_t)
+	   : 0];
+};
+
+#define NLOCKS		(PAGE_SIZE / WATCH_SIZE)
+static struct lock locks[NLOCKS] = {
+  [0 ... NLOCKS-1].mutex = PTHREAD_MUTEX_INITIALIZER
+};
+
+static inline uintptr_t 
+addr_hash (void *ptr)
+{
+  return ((uintptr_t)ptr / WATCH_SIZE) % NLOCKS;
+}
+
+void
+libat_lock_1 (void *ptr)
+{
+  pthread_mutex_lock (&locks[addr_hash (ptr)].mutex);
+}
+
+void
+libat_unlock_1 (void *ptr)
+{
+  pthread_mutex_unlock (&locks[addr_hash (ptr)].mutex);
+}
+
+void
+libat_lock_n (void *ptr, size_t n)
+{
+  uintptr_t h = addr_hash (ptr);
+  size_t i = 0;
+
+  /* Don't lock more than all the locks we have.  */
+  if (n > PAGE_SIZE)
+    n = PAGE_SIZE;
+
+  do
+    {
+      pthread_mutex_lock (&locks[h].mutex);
+      if (++h == NLOCKS)
+	h = 0;
+      i += WATCH_SIZE;
+    }
+  while (i < n);
+}
+
+void
+libat_unlock_n (void *ptr, size_t n)
+{
+  uintptr_t h = addr_hash (ptr);
+  size_t i = 0;
+
+  if (n > PAGE_SIZE)
+    n = PAGE_SIZE;
+
+  do
+    {
+      pthread_mutex_unlock (&locks[h].mutex);
+      if (++h == NLOCKS)
+	h = 0;
+      i += WATCH_SIZE;
+    }
+  while (i < n);
+}
diff --git a/libatomic/config/powerpc/host-config.h b/libatomic/config/powerpc/host-config.h
new file mode 100644
index 0000000..5447c83
--- /dev/null
+++ b/libatomic/config/powerpc/host-config.h
@@ -0,0 +1,24 @@
+/* Avoiding the synchronizations are a good thing.  */
+#define WANT_SPECIALCASE_RELAXED
+#define WANT_SPECIALCASE_ACQREL
+
+/* Glibc, at least, uses lwsync (aka acq_rel) in its pthread mutex
+   implementation.  If the user is asking for seq_cst (aka hwsync),
+   this is insufficient.  */
+
+static inline void __attribute__((always_inline, artificial))
+pre_seq_barrier(int model)
+{
+  if (model == __ATOMIC_SEQ_CST)
+    __atomic_thread_fence (__ATOMIC_SEQ_CST);
+}
+
+static inline void __attribute__((always_inline, artificial))
+post_seq_barrier(int model)
+{
+  pre_seq_barrier(model);
+}
+
+#define pre_post_seq_barrier 1
+
+#include_next <host-config.h>
diff --git a/libatomic/config/x86/host-config.h b/libatomic/config/x86/host-config.h
new file mode 100644
index 0000000..c4532c3f
--- /dev/null
+++ b/libatomic/config/x86/host-config.h
@@ -0,0 +1,69 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#if HAVE_IFUNC
+#include <cpuid.h>
+
+extern unsigned int libat_feat1_ecx HIDDEN;
+extern unsigned int libat_feat1_edx HIDDEN;
+
+#ifdef __x86_64__
+# define IFUNC_COND_1	(libat_feat1_ecx & bit_CMPXCHG16B)
+#else
+# define IFUNC_COND_1	(libat_feat1_edx & bit_CMPXCHG8B)
+#endif
+
+#ifdef __x86_64__
+# define IFUNC_NCOND(N) (N == 16)
+#else
+# define IFUNC_NCOND(N) (N == 8)
+#endif
+
+#ifdef __x86_64__
+# undef MAYBE_HAVE_ATOMIC_CAS_16
+# define MAYBE_HAVE_ATOMIC_CAS_16	IFUNC_COND_1
+# undef MAYBE_HAVE_ATOMIC_EXCHANGE_16
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_16	IFUNC_COND_1
+# undef MAYBE_HAVE_ATOMIC_LDST_16
+# define MAYBE_HAVE_ATOMIC_LDST_16	IFUNC_COND_1
+# if IFUNC_ALT == 1
+#  undef HAVE_ATOMIC_CAS_16
+#  define HAVE_ATOMIC_CAS_16 1
+# endif
+#else
+# undef MAYBE_HAVE_ATOMIC_CAS_8
+# define MAYBE_HAVE_ATOMIC_CAS_8	IFUNC_COND_1
+# undef MAYBE_HAVE_ATOMIC_EXCHANGE_8
+# define MAYBE_HAVE_ATOMIC_EXCHANGE_8	IFUNC_COND_1
+# undef MAYBE_HAVE_ATOMIC_LDST_8
+# define MAYBE_HAVE_ATOMIC_LDST_8	IFUNC_COND_1
+# if IFUNC_ALT == 1
+#  undef HAVE_ATOMIC_CAS_8
+#  define HAVE_ATOMIC_CAS_8 1
+# endif
+#endif
+
+#endif /* HAVE_IFUNC */
+
+#include_next <host-config.h>
diff --git a/libatomic/config/x86/init.c b/libatomic/config/x86/init.c
new file mode 100644
index 0000000..c4e066a
--- /dev/null
+++ b/libatomic/config/x86/init.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 2012 Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@redhat.com>.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic 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 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+#if HAVE_IFUNC
+
+unsigned int libat_feat1_ecx, libat_feat1_edx;
+
+static void __attribute__((constructor))
+init_cpuid (void)
+{
+  unsigned int eax, ebx;
+  __get_cpuid (1, &eax, &ebx, &libat_feat1_ecx, &libat_feat1_edx);
+}
+
+#endif /* HAVE_IFUNC */