diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 32f6c21208a512cbd6736136ee77be1452763861..f4f0034b7fb87c0a25afabfba5b241a260405225 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-19  Andreas Jaeger  <aj@suse.de>
+
+	* config/cpu/x86-64/bits/limits.h: New file.
+
+	* config/cpu/x86-64/bits/atomicity.h: New file.
+
+	* configure.target: Add x86-64.
+
 2001-10-17  Phil Edwards  <pme@gcc.gnu.org>
 
 	* docs/html/17_intro/howto.html:  Remove 1999 links (and explain
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index db81c4efbb41f47b12186b2358ab304362a612e0..61f331e31ea2f87cdf3e51206c28ff07ad643b31 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -57,6 +57,9 @@ case "${target_cpu}" in
   sparc*)
     cpu_include_dir="config/cpu/sparc/sparc32"
     ;;
+  x86_64*)
+    cpu_include_dir="config/cpu/x86-64"
+    ;;
   *)
     cpu_include_dir="config/cpu/generic"
     ;;
@@ -137,14 +140,17 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
 case "${target}" in
+   cris-*-*)
+     LIMITSH=config/cpu/cris
+     ;;
    i?86-*-*)
      LIMITSH=config/cpu/i386
      ;;
    powerpc-*-*)
      LIMITSH=config/cpu/powerpc
      ;;
-   cris-*-*)
-     LIMITSH=config/cpu/cris
+   x86_64-*-*)
+     LIMITSH=config/cpu/x86-64
      ;;
    *)
      LIMITSH=config/cpu/generic