struct-ret-3.c (CHUNK_SIZE): New define.

	* gcc.dg/struct-ret-3.c (CHUNK_SIZE): New define.  Use CHUNK_SIZE
	instead of hardcoded number.  Increase CHUNK_SIZE to 16384 for
	large stack sizes.

From-SVN: r143123

2 files changed, 28 insertions, 14 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c07a959..cdd20c6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-06  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.dg/struct-ret-3.c (CHUNK_SIZE): New define.  Use CHUNK_SIZE
+	instead of hardcoded number.  Increase CHUNK_SIZE to 16384 for
+	large stack sizes.
+
 2009-01-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	AVX Programming Reference (December, 2008)
diff --git a/gcc/testsuite/gcc.dg/struct-ret-3.c b/gcc/testsuite/gcc.dg/struct-ret-3.c
index c384d49..0be43b6 100644
--- a/gcc/testsuite/gcc.dg/struct-ret-3.c
+++ b/gcc/testsuite/gcc.dg/struct-ret-3.c
@@ -9,6 +9,12 @@
 #include <errno.h>
 #include <unistd.h>
 
+#if defined(STACK_SIZE) && (STACK_SIZE < 128*1024)
+ #define CHUNK_SIZE 4096
+#else
+ #define CHUNK_SIZE 16384
+#endif
+
 unsigned long ossAlignX(unsigned long i, unsigned long X)
 {
    return ((i + (X - 1)) & ~(unsigned long) (X - 1));
@@ -59,20 +65,22 @@ int main(void)
 
    struct stuff
    {
-      char c0[4096-sizeof(struct XXX)];
+      char c0[CHUNK_SIZE-sizeof(struct XXX)];
       struct XXX o;
-      char c1[4096*2-sizeof(struct SQLU_DATAPART_0)];
+      char c1[CHUNK_SIZE*2-sizeof(struct SQLU_DATAPART_0)];
       struct SQLU_DATAPART_0 dp;
-      char c2[4096*2-sizeof(struct SQLU_DICT_INFO_0)];
+      char c2[CHUNK_SIZE*2-sizeof(struct SQLU_DICT_INFO_0)];
       struct SQLU_DICT_INFO_0 di;
-      char c3[4096];
+      char c3[CHUNK_SIZE];
    };
 
-   char buf[sizeof(struct stuff)+4096];
-   struct stuff *u = (struct stuff *)ossAlignX((unsigned long)&buf[0], 4096);
+   char buf[sizeof(struct stuff)+CHUNK_SIZE];
+   struct stuff *u
+     = (struct stuff *)ossAlignX((unsigned long)&buf[0], CHUNK_SIZE);
 
-   /* This test assumes system memory page size of 4096 bytes or less.  */
-   if (sysconf(_SC_PAGESIZE) > 4096)
+   /* This test assumes system memory page
+      size of CHUNK_SIZE bytes or less.  */
+   if (sysconf(_SC_PAGESIZE) > CHUNK_SIZE)
      return 0;
 
    memset(u, 1, sizeof(struct stuff));
@@ -80,15 +88,15 @@ int main(void)
    u->c2[0] = '\xBB';
    u->c3[0] = '\xCC';
 
-   rc = mprotect(u->c1, 4096, PROT_NONE);
+   rc = mprotect(u->c1, CHUNK_SIZE, PROT_NONE);
    if (rc == -1)
       printf("mprotect:c1: %d: %d(%s)\n", rc, errno, strerror(errno));
 
-   rc = mprotect(u->c2, 4096, PROT_NONE);
+   rc = mprotect(u->c2, CHUNK_SIZE, PROT_NONE);
    if (rc == -1)
       printf("mprotect:c2: %d: %d(%s)\n", rc, errno, strerror(errno));
 
-   rc = mprotect(u->c3, 4096, PROT_NONE);
+   rc = mprotect(u->c3, CHUNK_SIZE, PROT_NONE);
    if (rc == -1)
       printf("mprotect:c3: %d: %d(%s)\n", rc, errno, strerror(errno));
 
@@ -96,9 +104,9 @@ int main(void)
    u->dp.pDictRidderInfo = &u->di;
    Initialize(&u->o, 0);
 
-   mprotect(u->c1, 4096, PROT_READ|PROT_WRITE);
-   mprotect(u->c2, 4096, PROT_READ|PROT_WRITE);
-   mprotect(u->c3, 4096, PROT_READ|PROT_WRITE);
+   mprotect(u->c1, CHUNK_SIZE, PROT_READ|PROT_WRITE);
+   mprotect(u->c2, CHUNK_SIZE, PROT_READ|PROT_WRITE);
+   mprotect(u->c3, CHUNK_SIZE, PROT_READ|PROT_WRITE);
 
    return 0;
 }