From: ktietz Date: Thu, 23 Feb 2012 18:10:53 +0000 (+0000) Subject: * gcc.dg/pack-test-5.c: Add -mno-ms-bitfields option X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=df72dc888532df2b7a46ca7ad91158a788f308c7 * gcc.dg/pack-test-5.c: Add -mno-ms-bitfields option for mingw-targets. * gcc.dg/Wpadded.c: Likewise. * gcc.dg/bf-ms-layout-2.c: Adjust offsets to fit ms-bitfield structure-layout. * gcc.dg/di-sync-multithread.c: Replace for mingw-target the use for sleep by Sleep and add windows.h include for this function. * gcc.dg/format/dfp-printf-1.c: Adjust dg-skip-if rule for mingw targets. * gcc.dg/stack-usage-1.c (SIZE): Provide proper SIZE for x64 mingw target. * gcc.dg/tls/thr-cse-1.c: Provide proper pattern for x64 mingw target. * gcc.dg/tls/opt-11.c (memset): Use __extension__ to avoid fail on x64 mingw target. * gcc.dg/bf-ms-attrib.c: Adjust expected size for ms_struct layout. * gcc.dg/pr50251.c: Disable test for x64 mingw target. * gcc.c-torture/execute/930930-1.c (long): Replace by ptr_t to avoid failure on LLP64 target. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184519 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a3513e9215e..b9eee4940ba 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,25 @@ +2012-02-23 Kai Tietz + + * gcc.dg/pack-test-5.c: Add -mno-ms-bitfields option + for mingw-targets. + * gcc.dg/Wpadded.c: Likewise. + * gcc.dg/bf-ms-layout-2.c: Adjust offsets to fit ms-bitfield + structure-layout. + * gcc.dg/di-sync-multithread.c: Replace for mingw-target the use + for sleep by Sleep and add windows.h include for this function. + * gcc.dg/format/dfp-printf-1.c: Adjust dg-skip-if rule for mingw + targets. + * gcc.dg/stack-usage-1.c (SIZE): Provide proper SIZE for x64 mingw + target. + * gcc.dg/tls/thr-cse-1.c: Provide proper pattern for x64 mingw + target. + * gcc.dg/tls/opt-11.c (memset): Use __extension__ to avoid fail + on x64 mingw target. + * gcc.dg/bf-ms-attrib.c: Adjust expected size for ms_struct layout. + * gcc.dg/pr50251.c: Disable test for x64 mingw target. + * gcc.c-torture/execute/930930-1.c (long): Replace by ptr_t to avoid + failure on LLP64 target. + 2012-02-23 Uros Bizjak PR c/52290 diff --git a/gcc/testsuite/gcc.c-torture/execute/930930-1.c b/gcc/testsuite/gcc.c-torture/execute/930930-1.c index 68fdbbfe851..101a5f9ef26 100644 --- a/gcc/testsuite/gcc.c-torture/execute/930930-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/930930-1.c @@ -1,23 +1,24 @@ -long *wm_TR; -long *wm_HB; -long *wm_SPB; +__extension__ typedef __PTRDIFF_TYPE__ ptr_t; +ptr_t *wm_TR; +ptr_t *wm_HB; +ptr_t *wm_SPB; -long mem[100]; +ptr_t mem[100]; f (mr_TR, mr_SPB, mr_HB, reg1, reg2) - long *mr_TR; - long *mr_SPB; - long *mr_HB; - long *reg1; - long *reg2; + ptr_t *mr_TR; + ptr_t *mr_SPB; + ptr_t *mr_HB; + ptr_t *reg1; + ptr_t *reg2; { - long *x = mr_TR; + ptr_t *x = mr_TR; for (;;) { if (reg1 < reg2) goto out; - if ((long *) *reg1 < mr_HB && (long *) *reg1 >= mr_SPB) + if ((ptr_t *) *reg1 < mr_HB && (ptr_t *) *reg1 >= mr_SPB) *--mr_TR = *reg1; reg1--; } @@ -29,7 +30,7 @@ f (mr_TR, mr_SPB, mr_HB, reg1, reg2) main () { - mem[99] = (long) mem; + mem[99] = (ptr_t) mem; f (mem + 100, mem + 6, mem + 8, mem + 99, mem + 99); exit (0); } diff --git a/gcc/testsuite/gcc.dg/Wpadded.c b/gcc/testsuite/gcc.dg/Wpadded.c index 9e69a9fef50..70fcd79a6d4 100644 --- a/gcc/testsuite/gcc.dg/Wpadded.c +++ b/gcc/testsuite/gcc.dg/Wpadded.c @@ -6,6 +6,7 @@ We won't get a warning anyway if the target has "packed" structure layout. */ /* { dg-options "-Wpadded -fpack-struct=8" } */ +/* { dg-additional-options "-mno-ms-bitfields" { target *-*-mingw* } } */ struct foo { char bar; diff --git a/gcc/testsuite/gcc.dg/bf-ms-attrib.c b/gcc/testsuite/gcc.dg/bf-ms-attrib.c index da4eb08d2da..d62da2ad525 100644 --- a/gcc/testsuite/gcc.dg/bf-ms-attrib.c +++ b/gcc/testsuite/gcc.dg/bf-ms-attrib.c @@ -32,7 +32,7 @@ main() /* As long as the sizes are as expected, we know attributes are working. bf-ms-layout.c makes sure the right thing happens when the attribute is on. */ - if (sizeof(struct one_ms) != 12) + if (sizeof(struct one_ms) != 8) abort(); if (sizeof(struct one_gcc) != 8) abort(); diff --git a/gcc/testsuite/gcc.dg/bf-ms-layout-2.c b/gcc/testsuite/gcc.dg/bf-ms-layout-2.c index 0bd472bc1f8..408ddbeb89e 100644 --- a/gcc/testsuite/gcc.dg/bf-ms-layout-2.c +++ b/gcc/testsuite/gcc.dg/bf-ms-layout-2.c @@ -158,27 +158,27 @@ int main(){ struct ten test_ten; #if defined (_TEST_MS_LAYOUT) || defined (_MSC_VER) - size_t exp_sizeof_one = 12; - size_t exp_sizeof_two = 16; + size_t exp_sizeof_one = 8; + size_t exp_sizeof_two = 12; size_t exp_sizeof_three =6; size_t exp_sizeof_four = 8; size_t exp_sizeof_five = 3; size_t exp_sizeof_six = 8; size_t exp_sizeof_seven = 3; - size_t exp_sizeof_eight = 4; + size_t exp_sizeof_eight = 2; size_t exp_sizeof_nine = 8; - size_t exp_sizeof_ten = 16; + size_t exp_sizeof_ten = 8; - unsigned char exp_one_c = 8; - unsigned char exp_two_c = 12; + unsigned char exp_one_c = 7; + unsigned char exp_two_c = 9; unsigned char exp_three_c = 4; unsigned char exp_four_c = 4; char exp_five_c = 2; char exp_six_c = 5; char exp_seven_c = 2; - char exp_eight_c = 2; + char exp_eight_c = 1; char exp_nine_c = 0; - char exp_ten_c = 8; + char exp_ten_c = 1; #else /* testing -mno-ms-bitfields */ diff --git a/gcc/testsuite/gcc.dg/di-sync-multithread.c b/gcc/testsuite/gcc.dg/di-sync-multithread.c index 307ebf8b314..c786ff1df5f 100644 --- a/gcc/testsuite/gcc.dg/di-sync-multithread.c +++ b/gcc/testsuite/gcc.dg/di-sync-multithread.c @@ -10,6 +10,9 @@ #include #include +#ifdef _WIN32 +#include +#endif /*#define DEBUGIT 1 */ @@ -175,7 +178,11 @@ main () t, err); }; +#ifdef _WIN32 + Sleep (5000); +#else sleep (5); +#endif /* Stop please. */ __sync_lock_test_and_set (&doquit, 1ll); diff --git a/gcc/testsuite/gcc.dg/format/dfp-printf-1.c b/gcc/testsuite/gcc.dg/format/dfp-printf-1.c index e92f1610c34..4453ad192b5 100644 --- a/gcc/testsuite/gcc.dg/format/dfp-printf-1.c +++ b/gcc/testsuite/gcc.dg/format/dfp-printf-1.c @@ -3,7 +3,7 @@ /* { dg-do compile } */ /* { dg-require-effective-target dfp } */ /* { dg-options "-Wformat" } */ -/* { dg-skip-if "No scanf/printf dfp support" { *-*-mingw* } } */ +/* { dg-skip-if "No scanf/printf dfp support" { *-*-mingw* } { "*" } { "" } } */ extern int printf (const char *restrict, ...); diff --git a/gcc/testsuite/gcc.dg/pack-test-5.c b/gcc/testsuite/gcc.dg/pack-test-5.c index 7645043dd84..3a52a002bd5 100644 --- a/gcc/testsuite/gcc.dg/pack-test-5.c +++ b/gcc/testsuite/gcc.dg/pack-test-5.c @@ -1,6 +1,7 @@ /* PR c/11446: packed on a struct takes precedence over aligned on the type of a field. */ /* { dg-do run } */ +/* { dg-additional-options "-mno-ms-bitfields" { target *-*-mingw* } } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.dg/pr49544.c b/gcc/testsuite/gcc.dg/pr49544.c index 9e558da2765..52f79dd7f8e 100644 --- a/gcc/testsuite/gcc.dg/pr49544.c +++ b/gcc/testsuite/gcc.dg/pr49544.c @@ -3,6 +3,8 @@ /* { dg-options "-g -O2" } */ /* { dg-require-effective-target ptr32plus } */ +__extension__ typedef __PTRDIFF_TYPE__ ptr_t; + int baz (int, int, void *); static inline __attribute__ ((always_inline)) long @@ -16,5 +18,5 @@ foo (int x, int y, void *z) long bar (long x, long y, long z) { - return foo (x, y, (void *) z); + return foo (x, y, (void *) (ptr_t) z); } diff --git a/gcc/testsuite/gcc.dg/pr50251.c b/gcc/testsuite/gcc.dg/pr50251.c index 21ca185250b..f791aa88278 100644 --- a/gcc/testsuite/gcc.dg/pr50251.c +++ b/gcc/testsuite/gcc.dg/pr50251.c @@ -1,4 +1,4 @@ -/* { dg-do compile } */ +/* { dg-do compile { target { ! { x86_64-*-mingw* } } } } */ /* { dg-options "-O2" } */ /* { dg-additional-options "-mpreferred-stack-boundary=12" { target x86_64-*-* } } */ diff --git a/gcc/testsuite/gcc.dg/stack-usage-1.c b/gcc/testsuite/gcc.dg/stack-usage-1.c index 77dd03852fb..c852f78f5cd 100644 --- a/gcc/testsuite/gcc.dg/stack-usage-1.c +++ b/gcc/testsuite/gcc.dg/stack-usage-1.c @@ -10,7 +10,11 @@ #if defined(__i386__) # define SIZE 248 #elif defined(__x86_64__) -# define SIZE 356 +# ifndef _WIN64 +# define SIZE 356 +# else +# define SIZE (256 - 24) +# endif #elif defined (__sparc__) # if defined (__arch64__) # define SIZE 76 diff --git a/gcc/testsuite/gcc.dg/tls/opt-11.c b/gcc/testsuite/gcc.dg/tls/opt-11.c index 0069c484a2c..edfe16b7e12 100644 --- a/gcc/testsuite/gcc.dg/tls/opt-11.c +++ b/gcc/testsuite/gcc.dg/tls/opt-11.c @@ -2,8 +2,10 @@ /* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ +__extension__ typedef __SIZE_TYPE__ size_t; + extern void abort (void); -extern void *memset (void *, int, __SIZE_TYPE__); +extern void *memset (void *, int, size_t); struct A { diff --git a/gcc/testsuite/gcc.dg/tls/thr-cse-1.c b/gcc/testsuite/gcc.dg/tls/thr-cse-1.c index 87fdc64688d..8e64424b72a 100644 --- a/gcc/testsuite/gcc.dg/tls/thr-cse-1.c +++ b/gcc/testsuite/gcc.dg/tls/thr-cse-1.c @@ -18,10 +18,11 @@ int foo (int b, int c, int d) return a; } -/* { dg-final { scan-assembler-not "emutls_get_address.*emutls_get_address.*" { target { ! { "*-wrs-vxworks" "*-*-darwin8" "hppa*-*-hpux*" "spu-*-*" "i?86-*-mingw*" } } } } } */ +/* { dg-final { scan-assembler-not "emutls_get_address.*emutls_get_address.*" { target { ! { "*-wrs-vxworks" "*-*-darwin8" "hppa*-*-hpux*" "spu-*-*" "i?86-*-mingw*" "x86_64-*-mingw*" } } } } } */ /* { dg-final { scan-assembler-not "call\tL___emutls_get_address.stub.*call\tL___emutls_get_address.stub.*" { target "*-*-darwin8" } } } */ /* { dg-final { scan-assembler-not "(b,l|bl) __emutls_get_address.*(b,l|bl) __emutls_get_address.*" { target "hppa*-*-hpux*" } } } */ /* { dg-final { scan-assembler-not "(brsl|brasl)\t__emutls_get_address.*(brsl|brasl)\t__emutls_get_address.*" { target spu-*-* } } } */ /* { dg-final { scan-assembler-not "tls_lookup.*tls_lookup.*" { target *-wrs-vxworks } } } */ /* { dg-final { scan-assembler-not "call\t___emutls_get_address.*call\t___emutls_get_address" { target "i?86-*-mingw*" } } } */ +/* { dg-final { scan-assembler-not "call\t__emutls_get_address.*call\t__emutls_get_address" { target "x86_64-*-mingw*" } } } */