FIX recent PPC crashes introduced by the pointer-tagging patch (I hope)

There was an accidental endian-dependency in changes related to RET_FUN.
The changes in question weren't strictly necessary - they were left
over from the original workaround for the compacting GC problems, so
I've just reverted those changes in this patch, which should hopefully
fix the PPC problems.

2 files changed, 1 insertions, 6 deletions

diff --git a/includes/Closures.h b/includes/Closures.h
index df53ceedd3..64582ba6b5 100644
--- a/includes/Closures.h
+++ b/includes/Closures.h
@@ -306,8 +306,7 @@ typedef struct {
  */
 typedef struct {
     const struct _StgInfoTable* info;
-    StgHalfWord    size;
-    StgHalfWord    tag;
+    StgWord        size;
     StgClosure *   fun;
     StgClosure *   payload[FLEXIBLE_ARRAY];
 } StgRetFun;
diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index aa3c6730f8..2fe99b6ba5 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -403,10 +403,6 @@ main(int argc, char *argv[])
     struct_field(StgLargeBitmap, size);
     field_offset(StgLargeBitmap, bitmap);
 
-    struct_field(StgRetFun, size);
-    struct_field(StgRetFun, tag);
-    struct_field(StgRetFun, fun);
-
     struct_size(snEntry);
     struct_field(snEntry,sn_obj);
     struct_field(snEntry,addr);