diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 19574c3afe4eeed5ce9ae90cf8ee62bbbbade263..0fff6f8e353f4ab6602cc9acb3b6ad7a5a12b2e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/i386/i386.c (ix86_avoid_jump_mispredicts): Check
+	ASM_OUTPUT_MAX_SKIP_PAD instead of ASM_OUTPUT_MAX_SKIP_ALIGN.
+
 2009-05-19  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
 	PR c/40172
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e9f8b9566a081db1337fc5108bf3e9755e7d4bb9..0c4c18b0f1c974424b9282416ea0a17e8a513166 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -27191,7 +27191,7 @@ x86_function_profiler (FILE *file, int labelno ATTRIBUTE_UNUSED)
     }
 }
 
-#ifdef ASM_OUTPUT_MAX_SKIP_ALIGN
+#ifdef ASM_OUTPUT_MAX_SKIP_PAD
 /* We don't have exact information about the insn sizes, but we may assume
    quite safely that we are informed about all 1 byte insns and memory
    address sizes.  This is enough to eliminate unnecessary padding in