diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e88ba6bfd26..2fbd33a6209 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,8 +2,8 @@
 
 	* g++.dg/abi/thunk3.C, g++.dg/abi/thunk4.C: Gate on
 	dg-require-weak.  Adjust regexp to handle leading-underscore
-	targets, NO_DOT_IN_LABEL targets and space as well as TAB after
-	.weak.
+	targets and space as well as TAB after .weak.  Change previous
+	64-bit fix to not use naked dot.
 
 2006-01-03  Paolo Bonzini  <bonzini@gnu.org>
 
diff --git a/gcc/testsuite/g++.dg/abi/thunk3.C b/gcc/testsuite/g++.dg/abi/thunk3.C
index d2c7e8e8bab..2ea67651ade 100644
--- a/gcc/testsuite/g++.dg/abi/thunk3.C
+++ b/gcc/testsuite/g++.dg/abi/thunk3.C
@@ -1,5 +1,5 @@
 // { dg-require-weak "" }
-// { dg-final { scan-assembler-not ".weak\[\t \]_?_ZThn\[8.\]_N7Derived3FooEv" } }
+// { dg-final { scan-assembler-not ".weak\[\t \]_?_ZThn\[48\]_N7Derived3FooEv" } }
 
 struct Base 
 {
diff --git a/gcc/testsuite/g++.dg/abi/thunk4.C b/gcc/testsuite/g++.dg/abi/thunk4.C
index e4891d32bc3..30a152f3dac 100644
--- a/gcc/testsuite/g++.dg/abi/thunk4.C
+++ b/gcc/testsuite/g++.dg/abi/thunk4.C
@@ -1,5 +1,5 @@
 // { dg-require-weak "" }
-// { dg-final { scan-assembler ".weak\[ \t\]_?_ZThn\[8.\]_N7Derived3FooEv" } }
+// { dg-final { scan-assembler ".weak\[ \t\]_?_ZThn\[48\]_N7Derived3FooEv" } }
 
 struct Base 
 {