From 32649b97b910a25743777a9ef0c7ba2a0bae3e35 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 17 Sep 2008 07:43:49 +0000 Subject: [PATCH] Fix testcases compilation failures due to unused variables. * ld-elfcomm/common1b.c (dummy1): Mark the variable for GCC as USED. * ld-shared/main.c (main): Move the P variable only to the places where it is used. --- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-elfcomm/common1b.c | 6 +++++- ld/testsuite/ld-shared/main.c | 38 ++++++++++++++++++++++---------------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index cc898e6..8065033 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-09-17 Jan Kratochvil + + Fix testcases compilation failures due to unused variables. + * ld-elfcomm/common1b.c (dummy1): Mark the variable for GCC as USED. + * ld-shared/main.c (main): Move the P variable only to the places where + it is used. + 2008-09-16 H.J. Lu PR ld/6877 diff --git a/ld/testsuite/ld-elfcomm/common1b.c b/ld/testsuite/ld-elfcomm/common1b.c index 4ed9e03..a375c90 100644 --- a/ld/testsuite/ld-elfcomm/common1b.c +++ b/ld/testsuite/ld-elfcomm/common1b.c @@ -1,3 +1,7 @@ -static char dummy1 = 'X'; +static +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) + __attribute__((__used__)) +#endif /* __GNUC__ */ + char dummy1 = 'X'; char foo1 [] = "Aligned at odd byte."; char foo2 [4]; diff --git a/ld/testsuite/ld-shared/main.c b/ld/testsuite/ld-shared/main.c index ce06261..0817d27 100644 --- a/ld/testsuite/ld-shared/main.c +++ b/ld/testsuite/ld-shared/main.c @@ -38,8 +38,6 @@ shlib_overriddencall2 () int main () { - int (*p) (); - printf ("mainvar == %d\n", mainvar); printf ("overriddenvar == %d\n", overriddenvar); printf ("shlibvar1 == %d\n", shlibvar1); @@ -62,21 +60,29 @@ main () printf ("shlib_checkfunptr2 (main_called) == %d\n", shlib_checkfunptr2 (main_called)); #endif - p = shlib_getfunptr1 (); - printf ("shlib_getfunptr1 () "); - if (p == shlib_shlibvar1) - printf ("=="); - else - printf ("!="); - printf (" shlib_shlibvar1\n"); + { + int (*p) (); + + p = shlib_getfunptr1 (); + printf ("shlib_getfunptr1 () "); + if (p == shlib_shlibvar1) + printf ("=="); + else + printf ("!="); + printf (" shlib_shlibvar1\n"); + } #ifndef XCOFF_TEST - p = shlib_getfunptr2 (); - printf ("shlib_getfunptr2 () "); - if (p == main_called) - printf ("=="); - else - printf ("!="); - printf (" main_called\n"); + { + int (*p) (); + + p = shlib_getfunptr2 (); + printf ("shlib_getfunptr2 () "); + if (p == main_called) + printf ("=="); + else + printf ("!="); + printf (" main_called\n"); + } #endif #endif printf ("shlib_check () == %d\n", shlib_check ()); -- 2.7.4