From b085b0e9fe53565eb8b1a8402dd50a8d57d6af93 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 4 Aug 2014 08:29:59 +0000 Subject: [PATCH] For cproj test-case, use glibc version xfail 2014-08-04 Tom de Vries * gcc.dg/cproj-fails-with-broken-glibc.c: Use xfail for broken glibc version instead of required-target. * lib/target-supports.exp (check_effective_target_not_glibc_2_11_or_earlier): Replace by ... (check_effective_target_glibc_2_11_or_earlier): ... this. * doc/sourcebuild.texi (glibc, glibc_2_12_or_later) (glibc_2_11_or_earlier): Document effective-target keywords. From-SVN: r213543 --- gcc/ChangeLog | 5 +++++ gcc/doc/sourcebuild.texi | 9 +++++++++ gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c | 3 +-- gcc/testsuite/lib/target-supports.exp | 8 ++++---- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f193068..67957ea 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-08-04 Tom de Vries + + * doc/sourcebuild.texi (glibc, glibc_2_12_or_later) + (glibc_2_11_or_earlier): Document effective-target keywords. + 2014-08-01 Jan Hubicka * ipa-devirt.c (odr_type_warn_count): Add type. diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index 39152df..0793f80 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -1804,6 +1804,15 @@ Target is a VxWorks RTP. @item wchar Target supports wide characters. + +@item glibc +Target supports glibc + +@item glibc_2_12_or_later +Target supports glibc 2.12 or later + +@item glibc_2_11_or_earlier +Target supports glibc 2.11 or earlier @end table @subsubsection Other attributes diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c04e0bc..b02eaf4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2014-08-04 Tom de Vries + + * gcc.dg/cproj-fails-with-broken-glibc.c: Use xfail for broken glibc + version instead of required-target. + * lib/target-supports.exp + (check_effective_target_not_glibc_2_11_or_earlier): Replace by ... + (check_effective_target_glibc_2_11_or_earlier): ... this. + 2014-08-04 Arnaud Charlet * gnat.dg/discr6.adb, gnat.dg/discr6_pkg.ads: Removed, no longer diff --git a/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c b/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c index 1df29f9..fc37fac 100644 --- a/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c +++ b/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c @@ -7,11 +7,10 @@ Origin: Kaveh R. Ghazi, April 20, 2010. */ -/* { dg-do run } */ +/* { dg-do run { xfail glibc_2_11_or_earlier } } */ /* { dg-options "-fno-builtin-cproj" } */ /* { dg-add-options c99_runtime } */ /* { dg-require-effective-target c99_runtime } */ -/* { dg-require-effective-target not_glibc_2_11_or_earlier } */ extern void abort(void); extern void exit(int); diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index cbe2930..7157d2a 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -5061,19 +5061,19 @@ proc check_effective_target_glibc_2_12_or_later {} { }] } -# Return true if this is a not a glibc 2.11 or earlier target. +# Return true if this is a glibc 2.11 or earlier target. -proc check_effective_target_not_glibc_2_11_or_earlier {} { +proc check_effective_target_glibc_2_11_or_earlier {} { if { ![check_effective_target_glibc] } { return 1 } if { [check_effective_target_glibc_2_12_or_later] } { - return 1 + return 0 } - return 0 + return 1 } # Return true if this is NOT a Bionic target. -- 2.7.4