diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e5e1511092386092d88fcf234c83833a2d01253..5afcde684d64f965b2d79c64d139a87b139435b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-27  Nathan Sidwell  <nathan@codesourcery.com>
 
+	* stor-layout.c (sizetype_set): Remove.
+	(set_sizetype): Don't test or set it.
+
 	* tree.h (size_int_type): Remove.
 	* fold-const.c: Do not #include gt-fold-const.h.
 	(size_htab_hash, size_htab_eq): Remove.
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 3141e7d1af5bcc00fcdfb5b1e22dc70dd6e1d10d..30eec879f538512eed67081d6b5f69d3fa02eb90 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -37,9 +37,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "regs.h"
 #include "params.h"
 
-/* Set to one when set_sizetype has been called.  */
-static int sizetype_set;
-
 /* Data type for the expressions representing sizes of data types.
    It is the first integer type laid out.  */
 tree sizetype_tab[(int) TYPE_KIND_LAST];
@@ -1887,8 +1884,6 @@ set_sizetype (tree type)
 		       2 * HOST_BITS_PER_WIDE_INT);
   tree t;
 
-  if (sizetype_set)
-    abort ();
   if (TYPE_UNSIGNED (type) != TYPE_UNSIGNED (sizetype))
     abort ();