diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 476795a111de..5460fae445ac 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* interpret.cc (run): Correctly access libffi return values of
+	integral smaller-than-int type; these are implicitly promoted.
+
 2004-07-13  Bryce McKinlay  <mckinlay@redhat.com>
 
 	PR libgcj/7587
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 40c7cbaac5a8..109ee10ff8b3 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -1207,15 +1207,15 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
 	    switch (rtype)
 	      {
 	      case FFI_TYPE_SINT8:
-		PUSHI (rvalue.byte_value);
+		PUSHI ((jbyte)(rvalue.int_value & 0xff));
 		break;
 
 	      case FFI_TYPE_SINT16:
-		PUSHI (rvalue.short_value);
+		PUSHI ((jshort)(rvalue.int_value & 0xffff));
 		break;
 
 	      case FFI_TYPE_UINT16:
-		PUSHI (rvalue.char_value);
+		PUSHI (rvalue.int_value & 0xffff);
 		break;
 
 	      case FFI_TYPE_FLOAT: