Reinstate commit 9f0eaa65817303b8768c80454734144c176fda43 with sufficient fixes to hopefully not break tinderboxes.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs
index 3089c2c12da..51d843b45e7 100644
--- a/src/comp/util/common.rs
+++ b/src/comp/util/common.rs
@@ -1,18 +1,22 @@
 
 type ty_mach = tag( ty_i8(), ty_i16(), ty_i32(), ty_i64(),
                     ty_u8(), ty_u16(), ty_u32(), ty_u64(),
-                    ty_f32(), ty_f16() );
+                    ty_f32(), ty_f64() );
 
 fn ty_mach_to_str(ty_mach tm) -> str {
     alt (tm) {
         case (ty_u8()) { ret "u8"; }
-        case (ty_i8()) { ret "i8"; }
         case (ty_u16()) { ret "u16"; }
-        case (ty_i16()) { ret "i16"; }
         case (ty_u32()) { ret "u32"; }
-        case (ty_i32()) { ret "i32"; }
         case (ty_u64()) { ret "u64"; }
+
+        case (ty_i8()) { ret "i8"; }
+        case (ty_i16()) { ret "i16"; }
+        case (ty_i32()) { ret "i32"; }
         case (ty_i64()) { ret "i64"; }
+
+        case (ty_f32()) { ret "f32"; }
+        case (ty_f64()) { ret "f64"; }
     }
 }