diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6a02e1cde169424431976f8741f4f74ebbd2c2c..288eafef534b8e88727276759c31f770ec11edbe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-15  Jan Hubicka  <jh@suse.cz>
+
+	PR target/24969
+	* i386.c (classify_argument): Properly adjust offset of bitfield for
+	substructures.
+
 2005-12-15  Richard Sandiford  <richard@codesourcery.com>
 
 	* final.c (final_scan_insn): Flip in_cold_section_p when changing
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 74572188fdd67dc41689f5c0cdc45480d5fdf6a5..bfcfb61b38059d77003d5f7b8818153d5a2eaa4b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2659,8 +2659,8 @@ classify_argument (enum machine_mode mode, tree type,
 		     misaligned integers.  */
 		  if (DECL_BIT_FIELD (field))
 		    {
-		      for (i = int_bit_position (field) / 8 / 8;
-			   i < (int_bit_position (field)
+		      for (i = (int_bit_position (field) + (bit_offset % 64)) / 8 / 8;
+			   i < ((int_bit_position (field) + (bit_offset % 64))
 			        + tree_low_cst (DECL_SIZE (field), 0)
 				+ 63) / 8 / 8; i++)
 			classes[i] =