Index: gcc/gcc/testsuite/gcc.c-torture/compile/20000211-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20000211-1.c	2007-08-22 12:49:51.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20000211-1.c	2009-05-27 12:06:52.373470000 +0200
@@ -1,4 +1,4 @@
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef unsigned char Bufbyte;
 typedef int Bytecount;
 typedef int Charcount;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20010328-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20010328-1.c	2007-08-22 12:49:19.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20010328-1.c	2009-05-27 12:08:08.093189200 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef unsigned int __u_int;
 typedef unsigned long __u_long;
 
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20030320-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20030320-1.c	2007-08-22 12:49:49.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20030320-1.c	2009-05-27 12:09:48.891354400 +0200
@@ -2,7 +2,7 @@
    conditional returns without updating dominance info.
    Extracted from glibc's dl-load.c.  */
 
-typedef unsigned long size_t;
+typedef __SIZE_TYPE__ size_t;
 
 static size_t
 is_dst (const char *start, const char *name, const char *str,
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20030405-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20030405-1.c	2007-08-22 12:49:19.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20030405-1.c	2009-05-27 12:10:24.641812000 +0200
@@ -6,7 +6,7 @@
    and when the PHI node at the end of the while() is visited the first
    time, CCP will try to assign it a value of UNDEFINED, but the default
    value for *str is a constant.  */
-typedef	unsigned int size_t;
+typedef	__SIZE_TYPE__ size_t;
 size_t strlength (const char * const);
 char foo();
 
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20030902-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20030902-1.c	2007-08-22 12:49:54.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20030902-1.c	2009-05-27 12:12:00.721070700 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef unsigned long int reg_syntax_t;
 struct re_pattern_buffer
 {
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20060202-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20060202-1.c	2007-08-22 12:49:19.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20060202-1.c	2009-05-27 12:13:29.596639500 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef const struct objc_selector
 {
   void *sel_id;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/20080613-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/20080613-1.c	2008-06-16 09:48:24.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/20080613-1.c	2009-05-27 12:14:28.503266500 +0200
@@ -1,7 +1,7 @@
 /* PR middle-end/36520 */
 /* Testcase by Richard Guenther <rguenth@gcc.gnu.org> */
 
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef unsigned short int sa_family_t;
 struct cmsghdr   {
     size_t cmsg_len;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/920428-2.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/920428-2.c	2007-08-22 12:50:07.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/920428-2.c	2009-05-27 12:15:45.300633000 +0200
@@ -41,7 +41,7 @@
  short _flag;
  char _file;
 } _iob[];
-typedef unsigned long size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef char *va_list;
 struct _iobuf *fopen(const char *filename, const char *type);
 struct _iobuf *freopen(const char *filename, const char *type, struct _iobuf *stream);
Index: gcc/gcc/testsuite/gcc.c-torture/compile/980329-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/980329-1.c	2007-08-22 12:49:26.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/980329-1.c	2009-05-27 12:16:17.253962500 +0200
@@ -1,4 +1,4 @@
-typedef unsigned long int size_t;
+typedef __SIZE_TYPE__ size_t;
 struct re_pattern_buffer
   {
     unsigned char *buffer;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/980816-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/980816-1.c	2007-08-22 12:49:53.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/980816-1.c	2009-05-27 12:16:48.097909900 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef void *XtPointer;
 
 typedef struct _WidgetRec *Widget;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr32584.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr32584.c	2007-08-22 12:49:38.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr32584.c	2009-05-27 12:19:35.270854800 +0200
@@ -1,5 +1,8 @@
-typedef long unsigned int size_t;
-typedef long int __ssize_t;
+typedef __SIZE_TYPE__ size_t;
+/* Kludge */
+#define unsigned
+typedef __SIZE_TYPE__ __ssize_t;
+#undef unsigned
 typedef struct
 {
 } __mbstate_t;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr33173.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr33173.c	2007-09-10 10:02:19.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr33173.c	2009-05-27 12:20:19.193010900 +0200
@@ -1,4 +1,4 @@
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef struct
 {
 }
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr33382.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr33382.c	2007-09-13 16:09:39.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr33382.c	2009-05-27 12:20:46.365059800 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef struct {
     int disable;
     char *searchconfig[];
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr34334.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr34334.c	2007-12-06 09:45:06.000000000 +0100
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr34334.c	2009-05-27 12:21:48.365456600 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 __extension__ typedef long long int __quad_t;
 __extension__ typedef unsigned int __mode_t;
 __extension__ typedef __quad_t __off64_t;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr34688.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr34688.c	2008-01-29 14:21:22.000000000 +0100
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr34688.c	2009-05-27 12:22:19.381280100 +0200
@@ -1,4 +1,4 @@
-typedef unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
          typedef struct {
         }
          HashTable;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr35043.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr35043.c	2008-02-05 17:00:17.000000000 +0100
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr35043.c	2009-05-27 12:22:59.975289900 +0200
@@ -1,4 +1,4 @@
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 typedef struct   {
       long double dat[2];
 } gsl_complex_long_double;
Index: gcc/gcc/testsuite/gcc.c-torture/compile/pr37669.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.c-torture/compile/pr37669.c	2008-09-30 11:22:12.000000000 +0200
+++ gcc/gcc/testsuite/gcc.c-torture/compile/pr37669.c	2009-05-27 12:23:30.428609800 +0200
@@ -1,6 +1,6 @@
 /* This testcase used to fail because a miscompiled execute_fold_all_builtins. */
 
-typedef long unsigned int size_t;
+typedef __SIZE_TYPE__ size_t;
 extern __inline __attribute__ ((__always_inline__)) int __attribute__
 ((__nothrow__)) snprintf (char *__restrict __s, size_t __n, __const char
 *__restrict __fmt, ...)  {
Index: gcc/gcc/testsuite/gcc.dg/20050629-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/20050629-1.c	2007-08-22 13:07:24.000000000 +0200
+++ gcc/gcc/testsuite/gcc.dg/20050629-1.c	2009-05-27 12:47:31.631797000 +0200
@@ -5,7 +5,7 @@
    contains many warnings, but it exposes a copy propagation bug that
    is somewhat difficult to reproduce otherwise.  */
 
-typedef long unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
   extern void fancy_abort (const char *, int, const char *) __attribute__ ((__noreturn__));
   typedef union tree_node *tree;
   enum tree_code {
Index: gcc/gcc/testsuite/gcc.dg/pr33667.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/pr33667.c	2007-10-08 09:28:42.000000000 +0200
+++ gcc/gcc/testsuite/gcc.dg/pr33667.c	2009-05-27 12:48:24.733362400 +0200
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
 
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 typedef unsigned char uint8_t;
 typedef unsigned short int uint16_t;
 typedef unsigned long long int uint64_t;
Index: gcc/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c	2007-08-22 13:06:53.000000000 +0200
+++ gcc/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c	2009-05-27 12:49:25.304777200 +0200
@@ -3,7 +3,7 @@
 /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */
 /* { dg-options "-O2 -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
-typedef unsigned long size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 
 struct re_pattern_buffer
 {
Index: gcc/gcc/testsuite/gcc.dg/torture/pr39204.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/torture/pr39204.c	2009-02-17 16:54:16.000000000 +0100
+++ gcc/gcc/testsuite/gcc.dg/torture/pr39204.c	2009-05-27 12:55:21.837894800 +0200
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-w" } */
 
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 typedef unsigned char __u_char;
 typedef unsigned short int __u_short;
 typedef unsigned int __u_int;
Index: gcc/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c	2008-09-01 11:13:37.000000000 +0200
+++ gcc/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c	2009-05-27 12:56:23.700832900 +0200
@@ -2,7 +2,7 @@
 /* { dg-options "-O1 -fdump-tree-dom2" } */
 
 
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 extern void *xmalloc (size_t) __attribute__ ((__malloc__));
 struct edge_def
 {
Index: gcc/gcc/testsuite/gcc.dg/tree-ssa/pr36908.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/tree-ssa/pr36908.c	2008-11-04 09:40:55.000000000 +0100
+++ gcc/gcc/testsuite/gcc.dg/tree-ssa/pr36908.c	2009-05-27 12:57:17.952928200 +0200
@@ -2,7 +2,7 @@
 /* { dg-options "-O2 -ftree-loop-distribution" } */
 #define NULL ((void *)0)
 
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 extern void *foo(size_t nelem, size_t elsize);
 extern void bar (char*, ...);
 
Index: gcc/gcc/testsuite/gcc.dg/tree-ssa/pr38250.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/tree-ssa/pr38250.c	2008-12-04 09:57:36.000000000 +0100
+++ gcc/gcc/testsuite/gcc.dg/tree-ssa/pr38250.c	2009-05-27 12:57:58.844600000 +0200
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -ftree-loop-distribution" } */
 
-typedef long unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 typedef struct   {
           long dat[2];
 } gsl_complex_long_double;
Index: gcc/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c
===================================================================
--- gcc.orig/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c	2007-08-22 13:00:28.000000000 +0200
+++ gcc/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c	2009-05-27 12:58:41.033180000 +0200
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O -w -fdump-tree-dse-vops" } */
 
-typedef unsigned int size_t;
+__extension__ typedef __SIZE_TYPE__ size_t;
 typedef struct _IO_FILE FILE;
 typedef struct
 {