diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 563ef3e375a..7247c385f54 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-28  Eric Botcazou  <ebotcazou@act-europe.fr>
+
+	* config/sparc/sparc.md (call_address_struct_value_sp32):
+	Properly mask the immediate field of the 'unimp' instruction.
+	(call_symbolic_struct_value_sp32): Likewise.
+
 2004-09-24  Ben Elliston  <bje@au.ibm.com>
 	    Steven Bosscher  <stevenb@suse.de>
 	    Andrew Pinski  <pinskia@physics.uc.edu>
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index d91e51d5656..182afb9a7cd 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -7438,7 +7438,10 @@
    (clobber (reg:SI 15))]
   ;;- Do not use operand 1 for most machines.
   "! TARGET_ARCH64 && GET_CODE (operands[2]) == CONST_INT && INTVAL (operands[2]) > 0"
-  "call\t%a0, %1\n\t nop\n\tunimp\t%2"
+{
+  operands[2] = GEN_INT (INTVAL (operands[2]) & 0xfff);
+  return "call\t%a0, %1\n\t nop\n\tunimp\t%2";
+}
   [(set_attr "type" "call_no_delay_slot")
    (set_attr "length" "3")])
 
@@ -7451,7 +7454,10 @@
    (clobber (reg:SI 15))]
   ;;- Do not use operand 1 for most machines.
   "! TARGET_ARCH64 && GET_CODE (operands[2]) == CONST_INT && INTVAL (operands[2]) > 0"
-  "call\t%a0, %1\n\t nop\n\tunimp\t%2"
+{
+  operands[2] = GEN_INT (INTVAL (operands[2]) & 0xfff);
+  return "call\t%a0, %1\n\t nop\n\tunimp\t%2";
+}
   [(set_attr "type" "call_no_delay_slot")
    (set_attr "length" "3")])