diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c46aec484e..682afb203cb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-31  Geoffrey Keating  <geoffk@redhat.com>
+
+	* g++.dg/abi/empty4.C: Allow for 16-bit ints.
+
+	* g++.dg/special/initp1.C (X): Allow for 16-bit ints.
+
+	* gcc.c-torture/unsorted/bcopy.c (BYTES): Honor STACK_SIZE.
+
 2001-08-30  Geoffrey Keating  <geoffk@redhat.com>
 
 	* gcc.c-torture/execute/longlong.c (alpha_ep_extbl_i_eq_0): Allow
diff --git a/gcc/testsuite/g++.dg/abi/empty4.C b/gcc/testsuite/g++.dg/abi/empty4.C
index 39ab9c5e437..fe3d9a81a46 100644
--- a/gcc/testsuite/g++.dg/abi/empty4.C
+++ b/gcc/testsuite/g++.dg/abi/empty4.C
@@ -10,21 +10,21 @@ struct Empty {};
 
 struct Inter : Empty {};
 
-int now = 0;
+long now = 0;
 
 struct NonPod
 {
-  int m;
+  long m;
 
   NonPod () {m = 0x12345678;}
-  NonPod (int m_) {m = m_;}
+  NonPod (long m_) {m = m_;}
   NonPod &operator= (NonPod const &src) {now = m; m = src.m;}
   NonPod (NonPod const &src) {m = src.m;}
 };
 
 struct A : Inter
 {
-  A (int c) {m = c;}
+  A (long c) {m = c;}
   
   NonPod m;
 };
@@ -34,19 +34,19 @@ struct B
   Inter empty;
   NonPod m;
 
-  B (int c) {m = c;}
+  B (long c) {m = c;}
 };
 
 struct C : NonPod, Inter
 {
-  C (int c) : NonPod (c), Inter () {}
+  C (long c) : NonPod (c), Inter () {}
 };
 
 int main ()
 {
   A a (0x12131415);
   
-  int was = a.m.m;
+  long was = a.m.m;
   
   a = 0x22232425;
 
diff --git a/gcc/testsuite/g++.dg/special/initp1.C b/gcc/testsuite/g++.dg/special/initp1.C
index ad4974d48d4..5552acec7c2 100644
--- a/gcc/testsuite/g++.dg/special/initp1.C
+++ b/gcc/testsuite/g++.dg/special/initp1.C
@@ -51,7 +51,7 @@ int Two::count;
 long x = 0;
 
 #define X( n ) \
-  do { if ( x & (1 << (n)) ) return 1; else x |= (1 << (n)); } while (0)
+  do { if ( x & (1L << (n)) ) return 1; else x |= (1L << (n)); } while (0)
 
 int main()
 {
diff --git a/gcc/testsuite/gcc.c-torture/unsorted/bcopy.c b/gcc/testsuite/gcc.c-torture/unsorted/bcopy.c
index 1732b349e4d..aed994e578a 100644
--- a/gcc/testsuite/gcc.c-torture/unsorted/bcopy.c
+++ b/gcc/testsuite/gcc.c-torture/unsorted/bcopy.c
@@ -51,7 +51,11 @@ bcopy3 (s, d, c)
     }
 }
 
+#if defined(STACK_SIZE) && STACK_SIZE < 16384
+#define BYTES STACK_SIZE
+#else
 #define BYTES 16384
+#endif
 
 main ()
 {