diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93969c12cd2f..5c44f16f3256 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-19  Jason Merrill  <jason@redhat.com>
+
+	PR target/40332
+	* configure.ac (gcc_cv_as_cfi_advance_working): Check 32-bit advance.
+	* configure: Likewise.
+
 2010-02-20  Alan Modra  <amodra@gmail.com>
 
 	PR middle-end/42344
diff --git a/gcc/configure b/gcc/configure
index 92ee2e9d7d45..a0e15ad2f471 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21421,7 +21421,7 @@ else
     echo '	.text
 	.cfi_startproc
 	.cfi_adjust_cfa_offset 64
-	.skip 512, 0
+	.skip 75031, 0
 	.cfi_adjust_cfa_offset 128
 	.cfi_endproc' > conftest.s
     if { ac_try='$gcc_cv_as $gcc_cv_as_flags  -o conftest.o conftest.s >&5'
@@ -21433,7 +21433,7 @@ else
     then
 
 if $gcc_cv_readelf -wf conftest.o 2>/dev/null \
-    | grep 'DW_CFA_advance_loc[12]:[ 	][ 	]*512[ 	]' >/dev/null; then
+    | grep 'DW_CFA_advance_loc[124]:[ 	][ 	]*75031[ 	]' >/dev/null; then
    gcc_cv_as_cfi_advance_working=yes
 fi
 
diff --git a/gcc/configure.ac b/gcc/configure.ac
index fee13b306a13..cd44af8b35ec 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2292,12 +2292,12 @@ gcc_GAS_CHECK_FEATURE([working cfi advance], gcc_cv_as_cfi_advance_working,
 [	.text
 	.cfi_startproc
 	.cfi_adjust_cfa_offset 64
-	.skip 512, 0
+	.skip 75031, 0
 	.cfi_adjust_cfa_offset 128
 	.cfi_endproc],
 [[
 if $gcc_cv_readelf -wf conftest.o 2>/dev/null \
-    | grep 'DW_CFA_advance_loc[12]:[ 	][ 	]*512[ 	]' >/dev/null; then
+    | grep 'DW_CFA_advance_loc[124]:[ 	][ 	]*75031[ 	]' >/dev/null; then
    gcc_cv_as_cfi_advance_working=yes
 fi
 ]])