diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 418fa802bb9..e4f13a88670 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-08  Roger Sayle  <roger@eyesopen.com>
+
+	PR inline-asm/8788
+	* stmt.c (expand_asm_operands): Avoid calling force_reg on BLKmode
+	operands.
+
 2005-05-08  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/alpha.c (adjust_address): Fix typo last change.
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 94b018adba8..d1e71dea4f1 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -877,7 +877,7 @@ expand_asm_operands (tree string, tree outputs, tree inputs,
 
       if (asm_operand_ok (op, constraint) <= 0)
 	{
-	  if (allows_reg)
+	  if (allows_reg && TYPE_MODE (type) != BLKmode)
 	    op = force_reg (TYPE_MODE (type), op);
 	  else if (!allows_mem)
 	    warning (0, "asm operand %d probably doesn%'t match constraints",
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3d4ba310502..48d99363742 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-08  Roger Sayle  <roger@eyesopen.com>
+
+	PR inline-asm/8788
+	* gcc.dg/pr8788-1.c: New testcase.
+
 2005-05-08  Richard Sandiford  <rsandifo@redhat.com>
 
 	PR target/21416
diff --git a/gcc/testsuite/gcc.dg/pr8788-1.c b/gcc/testsuite/gcc.dg/pr8788-1.c
new file mode 100644
index 00000000000..74e1694090c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr8788-1.c
@@ -0,0 +1,20 @@
+/* PR inline-asm/8788 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef struct {
+    long x[6];
+} myjmp_buf;
+
+typedef struct {
+    myjmp_buf regs;
+} my_stack;
+
+void switch_to_stack (my_stack *stack){
+    asm (  /* { dg-error "impossible constraint" } */
+/* { dg-warning "asm operand 1" "asm operand 1" { target *-*-* } 14 } */
+        "\n"
+        : "+r" (stack->regs)
+    );
+}
+