diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2014-12-20 08:16:40 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2014-12-20 08:16:40 -0800 |
| commit | 6e88426415205825e1a7a21723be4c7a03b4f40d (patch) | |
| tree | 42c9afe4a72f46106717bbcc2ff60b14f74c926f | |
| parent | 7b734f91a68a76ace4e5e5bbb8f7ce564b2c8e86 (diff) | |
| parent | bd040da1dbb7e6640440f306ddf993af98441851 (diff) | |
| download | fsf-binutils-gdb-origin/hjl/linux/master.zip fsf-binutils-gdb-origin/hjl/linux/master.tar.gz fsf-binutils-gdb-origin/hjl/linux/master.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into hjl/linux/masterorigin/hjl/linux/master
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -rw-r--r-- | gold/testsuite/debug_msg.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 9edf043..f67df17 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2014-12-20 H.J. Lu <hongjiu.lu@intel.com> + + PR gold/14608 + * testsuite/debug_msg.cc (SometimesInlineFunction): Changed + to "return i * i * 3;". + 2014-12-16 Cary Coutant <ccoutant@google.com> * mapfile.cc (Mapfile::print_input_section): Print uncompressed sizes. diff --git a/gold/testsuite/debug_msg.cc b/gold/testsuite/debug_msg.cc index e5beb5f..a48c141 100644 --- a/gold/testsuite/debug_msg.cc +++ b/gold/testsuite/debug_msg.cc @@ -66,7 +66,7 @@ OdrBase* CreateOdrDerived2(); // in odr_violation2.cc extern "C" int OverriddenCFunction(int i); // in odr_violation*.cc inline int SometimesInlineFunction(int i) { // strong in odr_violation2.cc. - return i; + return i * i * 3; } |