diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55056be6927..5a0bea3ad44 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-21  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* gcc.c-torture/unsorted/msp.c (A_SIZE): Define according to
+	STACK_SIZE;
+	* gcc.c-torture/compile/991214-2.c (HISTO_SIZE): Define according
+	to STACK_SIZE; Use it to define size of add_histo array.
+	* gcc.c-torture/compile/920723-1.c (GITT_SIZE): Define according 
+	to STACK_SIZE.
+	(f): Use GITT_SIZE to define size of gitt local table.
+	* gcc.c-torture/compile/930621-1.c (BYTEMEM_SIZE): Define according 
+	to STACK_SIZE; Use it to define size of bytemem array.
+
 2001-05-21  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* gcc.c-torture/compile/20000804-1.x: New file, this test fails
diff --git a/gcc/testsuite/gcc.c-torture/compile/920723-1.c b/gcc/testsuite/gcc.c-torture/compile/920723-1.c
index af0cf76f42c..d8734a6796e 100644
--- a/gcc/testsuite/gcc.c-torture/compile/920723-1.c
+++ b/gcc/testsuite/gcc.c-torture/compile/920723-1.c
@@ -1,3 +1,11 @@
+#if defined(STACK_SIZE) && STACK_SIZE < 65536
+# define GITT_SIZE 75
+#endif
+
+#ifndef GITT_SIZE
+# define GITT_SIZE 150
+#endif
+
 typedef struct {
   double x, y;
 } vector_t;
@@ -6,7 +14,7 @@ f(int count,vector_t*pos,double r,double *rho)
 {
   int i, j, miny, maxy, hy;
   float help, d;
-  int gitt[150][150];
+  int gitt[GITT_SIZE][GITT_SIZE];
   int *data = (int *)malloc(count*sizeof(int));
   for (i = 0; i < count; i++)
     rho[i] = 0;
diff --git a/gcc/testsuite/gcc.c-torture/compile/930621-1.c b/gcc/testsuite/gcc.c-torture/compile/930621-1.c
index 3679cf1d3de..4199bbe0870 100644
--- a/gcc/testsuite/gcc.c-torture/compile/930621-1.c
+++ b/gcc/testsuite/gcc.c-torture/compile/930621-1.c
@@ -1,6 +1,14 @@
+#if defined(STACK_SIZE) && (STACK_SIZE < 65536)
+# define BYTEMEM_SIZE 10000L
+#endif
+
+#ifndef BYTEMEM_SIZE
+# define BYTEMEM_SIZE 45000L
+#endif
+
 int bytestart[5000 + 1];
 unsigned char modtext[400 + 1];
-unsigned char bytemem[2][45000L + 1];
+unsigned char bytemem[2][BYTEMEM_SIZE + 1];
 
 long
 modlookup (int l)
diff --git a/gcc/testsuite/gcc.c-torture/compile/991214-2.c b/gcc/testsuite/gcc.c-torture/compile/991214-2.c
index 2f7b6bc7d4f..3e18d215e13 100644
--- a/gcc/testsuite/gcc.c-torture/compile/991214-2.c
+++ b/gcc/testsuite/gcc.c-torture/compile/991214-2.c
@@ -1,3 +1,9 @@
+#if defined(STACK_SIZE) && (STACK_SIZE < 65536)
+# define HISTO_SIZE 9
+#else
+# define HISTO_SIZE 36
+#endif
+
 extern int N;
 extern int nrows;
 extern int or_num_angles;
@@ -8,7 +14,7 @@ typedef struct
   int count;
 }Histo;
 
-Histo add_histo[10][2][36][36];
+Histo add_histo[10][2][HISTO_SIZE][HISTO_SIZE];
 
 void cmd_connection_statistics( )
 {
diff --git a/gcc/testsuite/gcc.c-torture/unsorted/msp.c b/gcc/testsuite/gcc.c-torture/unsorted/msp.c
index c73cedd294c..5d350fd5ee0 100644
--- a/gcc/testsuite/gcc.c-torture/unsorted/msp.c
+++ b/gcc/testsuite/gcc.c-torture/unsorted/msp.c
@@ -1,5 +1,10 @@
+#ifdef STACK_SIZE
+# define A_SIZE (STACK_SIZE/sizeof(int))
+#else
+# define A_SIZE 16384
+#endif
 foo ()
 {
-  int a[16384];
+  int a[A_SIZE];
   bar (a);
 }