diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 3a983badc525..a4f6261ebfe4 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-23  Sofiane Naci <sofiane.naci@arm.com>
+
+	Mark libatomic unsupported in AArch64.
+
+	* configure.tgt: Mark libatomic unsupported.
+
 2012-09-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR other/43620
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index 847ac41ebed8..0caa0f42ff99 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -95,6 +95,11 @@ fi
 
 # Other system configury
 case "${target}" in
+  aarch64*)
+	# This is currently not supported in AArch64.
+	UNSUPPORTED=1
+	;;
+
   arm*-*-linux*)
 	# OS support for atomic primitives.
 	config_path="${config_path} linux/arm posix"