| Message ID | 20180322143850.1766-11-christophe.lyon@st.com |
|---|---|
| State | New |
| Headers | show |
| Series | FDPIC ABI for ARM | expand |
Hi, On 22 March 2018 at 15:38, Christophe Lyon <christophe.lyon@st.com> wrote: > 2018-XX-XX Christophe Lyon <christophe.lyon@st.com> > Mickaël Guêné <mickael.guene@st.com> > > ld > * testsuite/ld-elf/pr2404b.c (main): Rename time variable into > time1. > --- > ld/testsuite/ld-elf/pr2404b.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/ld/testsuite/ld-elf/pr2404b.c b/ld/testsuite/ld-elf/pr2404b.c > index 5f0f7b4..4bbc2b1 100644 > --- a/ld/testsuite/ld-elf/pr2404b.c > +++ b/ld/testsuite/ld-elf/pr2404b.c > @@ -3,7 +3,7 @@ > extern int bar (void); > > int times = -1; > -int time; > +int time1; > > int > main () > @@ -12,9 +12,9 @@ main () > times = 20; > printf ("times: %d\n", times); > > - printf ("time: %d\n", time); > - time = 10; > - printf ("time: %d\n", time); > + printf ("time1: %d\n", time1); > + time1 = 10; > + printf ("time: %d\n", time1); This update was inconsistent in terms of output, as well as wrt the expected output. I committed the attached patch as obious. Sorry, Christophe > bar (); > > return 0; > -- > 2.6.3 > commit aa684341294a9125c528041f81d17c488bed5552 Author: Christophe Lyon <christophe.lyon@linaro.org> Date: Thu Apr 26 13:44:33 2018 +0000 [ld/testsuite] Fix pr2404 output. 2018-04-26 Christophe Lyon <christophe.lyon@linaro.org> * testsuite/ld-elf/pr2404b.c (main): Adjust printf to account for new variable name. * testsuite/ld-elf/pr2404.out: Adjust expected output accordingly. diff --git a/ld/ChangeLog b/ld/ChangeLog index 2b0eb1a..076b2fe 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2018-04-26 Christophe Lyon <christophe.lyon@linaro.org> + + * testsuite/ld-elf/pr2404b.c (main): Adjust printf to account for + new variable name. + * testsuite/ld-elf/pr2404.out: Adjust expected output accordingly. + 2018-04-25 Christophe Lyon <christophe.lyon@st.com> * testsuite/ld-arm/export-class.exp: Accept arm*-*-uclinuxfdpiceabi. diff --git a/ld/testsuite/ld-elf/pr2404.out b/ld/testsuite/ld-elf/pr2404.out index d1aa5fe..987e528 100644 --- a/ld/testsuite/ld-elf/pr2404.out +++ b/ld/testsuite/ld-elf/pr2404.out @@ -1,4 +1,4 @@ times: -1 times: 20 -time: 0 -time: 10 +time1: 0 +time1: 10 diff --git a/ld/testsuite/ld-elf/pr2404b.c b/ld/testsuite/ld-elf/pr2404b.c index 4bbc2b1..34c3c16 100644 --- a/ld/testsuite/ld-elf/pr2404b.c +++ b/ld/testsuite/ld-elf/pr2404b.c @@ -14,7 +14,7 @@ main () printf ("time1: %d\n", time1); time1 = 10; - printf ("time: %d\n", time1); + printf ("time1: %d\n", time1); bar (); return 0;
diff --git a/ld/testsuite/ld-elf/pr2404b.c b/ld/testsuite/ld-elf/pr2404b.c index 5f0f7b4..4bbc2b1 100644 --- a/ld/testsuite/ld-elf/pr2404b.c +++ b/ld/testsuite/ld-elf/pr2404b.c @@ -3,7 +3,7 @@ extern int bar (void); int times = -1; -int time; +int time1; int main () @@ -12,9 +12,9 @@ main () times = 20; printf ("times: %d\n", times); - printf ("time: %d\n", time); - time = 10; - printf ("time: %d\n", time); + printf ("time1: %d\n", time1); + time1 = 10; + printf ("time: %d\n", time1); bar (); return 0;