From a793528482910aca0f7c840ee5bdd5e722b0528a Mon Sep 17 00:00:00 2001 From: Bingfeng Mei Date: Thu, 31 Jul 2014 08:50:50 +0000 Subject: [PATCH] re PR lto/61868 (-frandom-seed always results in random_seed of 0) 2014-07-31 Bingfeng Mei PR lto/61868 * toplev.c (init_random_seed): Move piece of code never called to set_random_seed. (set_random_seed): see above. * gcc.dg/pr61868.c: New test. From-SVN: r213321 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr61868.c | 9 +++++++++ gcc/toplev.c | 20 ++++++++++---------- 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr61868.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 78cea9f03bf..0ee4580d0c4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-07-31 Bingfeng Mei + + PR lto/61868 + * toplev.c (init_random_seed): Move piece of code never called to + set_random_seed. + (set_random_seed): see above. + 2014-07-31 Tom de Vries * tree-ssa-loop.c (pass_tree_loop_init::execute): Remove dead code. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 629e89e6df2..82ec9efc71d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-07-31 Bingfeng Mei + + PR lto/61868 + * gcc.dg/pr61868.c: New test. + 2014-07-30 Paolo Carlini PR c++/57397 diff --git a/gcc/testsuite/gcc.dg/pr61868.c b/gcc/testsuite/gcc.dg/pr61868.c new file mode 100644 index 00000000000..a2872a9ec79 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr61868.c @@ -0,0 +1,9 @@ +/* { dg-do compile } */ +/* { dg-options "-flto -frandom-seed=0x12345" } */ +extern int foo (int); +int main () +{ + foo (100); + return 0; +} +/* { dg-final { scan-assembler "\.gnu\.lto.*.12345" } } */ diff --git a/gcc/toplev.c b/gcc/toplev.c index c2d4232523e..98ea0588013 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -282,16 +282,7 @@ init_local_tick (void) static void init_random_seed (void) { - if (flag_random_seed) - { - char *endp; - - /* When the driver passed in a hex number don't crc it again */ - random_seed = strtoul (flag_random_seed, &endp, 0); - if (!(endp > flag_random_seed && *endp == 0)) - random_seed = crc32_string (0, flag_random_seed); - } - else if (!random_seed) + if (!random_seed) random_seed = local_tick ^ getpid (); /* Old racey fallback method */ } @@ -314,6 +305,15 @@ set_random_seed (const char *val) { const char *old = flag_random_seed; flag_random_seed = val; + if (flag_random_seed) + { + char *endp; + + /* When the driver passed in a hex number don't crc it again */ + random_seed = strtoul (flag_random_seed, &endp, 0); + if (!(endp > flag_random_seed && *endp == 0)) + random_seed = crc32_string (0, flag_random_seed); + } return old; } -- 2.30.2