This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH, testsuite]: Fix PR 36057: [4.3/4.4 Regression] struct-layout-1_generate.c uses non-ISO C '%n$' operand number formats
- From: Uros Bizjak <ubizjak at gmail dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 17 May 2008 15:07:09 +0200
- Subject: [PATCH, testsuite]: Fix PR 36057: [4.3/4.4 Regression] struct-layout-1_generate.c uses non-ISO C '%n$' operand number formats
Hello!
Attached patch removes numbered arguments from format strings in
struct-layout-1_generate.c. It turns out that some (crippled ;) targets
do not fully support POSIX 1003.1. Sigh, since numbered arguments are
quite usable extension for printf format strings.
2008-05-17 Uros Bizjak <ubizjak@gmail.com>
PR testsuite/36057
* g++.dg/compat/struct-layout-1_generate.c (DG_OPTIONS): Remove.
(const char *dg_options): New array.
(switchfiles): Loop through dg_options array to generate dg-options
directives. Remove numbered arguments usage from fprintf
format strings.
Patch was tested on x86_64-pc-linux-gnu {,-m32}. OK for 4.3 and 4.4?
Uros.
Index: g++.dg/compat/struct-layout-1_generate.c
===================================================================
--- g++.dg/compat/struct-layout-1_generate.c (revision 135465)
+++ g++.dg/compat/struct-layout-1_generate.c (working copy)
@@ -42,12 +42,13 @@ along with GCC; see the file COPYING3.
#define COMPAT_PRLL "ll"
#endif
-#define DG_OPTIONS "\
-/* { dg-options \"%1$s-I%2$s\" } */\n\
-/* { dg-options \"%1$s-I%2$s -mno-mmx\" { target i?86-*-* x86_64-*-* } } */\n\
-/* { dg-options \"%1$s-I%2$s -fno-common\" { target hppa*-*-hpux* } } */\n\
-/* { dg-options \"%1$s-I%2$s -mno-base-addresses\" { target mmix-*-* } } */\n\
-\n"
+const char *dg_options[] = {
+"/* { dg-options \"%s-I%s\" } */\n",
+"/* { dg-options \"%s-I%s -mno-mmx\" { target i?86-*-* x86_64-*-* } } */\n",
+"/* { dg-options \"%s-I%s -fno-common\" { target hppa*-*-hpux* } } */\n",
+"/* { dg-options \"%s-I%s -mno-base-addresses\" { target mmix-*-* } } */\n"
+#define NDG_OPTIONS (sizeof (dg_options) / sizeof (dg_options[0]))
+};
typedef unsigned int hashval_t;
@@ -501,6 +502,8 @@ switchfiles (int fields)
{
static int filecnt;
static char *destbuf, *destptr;
+ int i;
+
++filecnt;
if (outfile)
fclose (outfile);
@@ -528,17 +531,19 @@ switchfiles (int fields)
fputs ("failed to create test files\n", stderr);
exit (1);
}
- fprintf (outfile, DG_OPTIONS "\
+ for (i = 0; i < NDG_OPTIONS; i++)
+ fprintf (outfile, dg_options[i], "", srcdir);
+ fprintf (outfile, "\n\
#include \"struct-layout-1.h\"\n\
\n\
#define TX(n, type, attrs, fields, ops) extern void test##n (void);\n\
-#include \"t%3$03d_test.h\"\n\
+#include \"t%03d_test.h\"\n\
#undef TX\n\
\n\
int main (void)\n\
{\n\
#define TX(n, type, attrs, fields, ops) test##n ();\n\
-#include \"t%3$03d_test.h\"\n\
+#include \"t%03d_test.h\"\n\
#undef TX\n\
if (fails)\n\
{\n\
@@ -546,27 +551,31 @@ int main (void)\n\
abort ();\n\
}\n\
exit (0);\n\
-}\n", "", srcdir, filecnt);
+}\n", filecnt, filecnt);
fclose (outfile);
sprintf (destptr, "t%03d_x.C", filecnt);
outfile = fopen (destbuf, "w");
if (outfile == NULL)
goto fail;
- fprintf (outfile, DG_OPTIONS "\
+ for (i = 0; i < NDG_OPTIONS; i++)
+ fprintf (outfile, dg_options[i], "-w ", srcdir);
+ fprintf (outfile, "\n\
#include \"struct-layout-1_x1.h\"\n\
-#include \"t%3$03d_test.h\"\n\
+#include \"t%03d_test.h\"\n\
#include \"struct-layout-1_x2.h\"\n\
-#include \"t%3$03d_test.h\"\n", "-w ", srcdir, filecnt);
+#include \"t%03d_test.h\"\n", filecnt, filecnt);
fclose (outfile);
sprintf (destptr, "t%03d_y.C", filecnt);
outfile = fopen (destbuf, "w");
if (outfile == NULL)
goto fail;
- fprintf (outfile, DG_OPTIONS "\
+ for (i = 0; i < NDG_OPTIONS; i++)
+ fprintf (outfile, dg_options[i], "-w ", srcdir);
+ fprintf (outfile, "\n\
#include \"struct-layout-1_y1.h\"\n\
-#include \"t%3$03d_test.h\"\n\
+#include \"t%03d_test.h\"\n\
#include \"struct-layout-1_y2.h\"\n\
-#include \"t%3$03d_test.h\"\n", "-w ", srcdir, filecnt);
+#include \"t%03d_test.h\"\n", filecnt, filecnt);
fclose (outfile);
sprintf (destptr, "t%03d_test.h", filecnt);
outfile = fopen (destbuf, "w");