diff options
| author | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
| commit | e97c99f15937e5762a973b25192aab824126a6d3 (patch) | |
| tree | 7f0be3ff7c7d976af06887dc50accd68f7630a7f /gcc-4.9/gcc/lto | |
| parent | f1c18afafc2b321465ae6b07ede127095942d7dc (diff) | |
| download | toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.gz toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.bz2 toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.zip | |
[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch.
Merge gcc-4_9 source r214745 from google/gcc-4_9 branch.
Change-Id: Ie6fa0fd72f4b4eec3adc4db4bb922e652d1c2605
Diffstat (limited to 'gcc-4.9/gcc/lto')
| -rw-r--r-- | gcc-4.9/gcc/lto/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc-4.9/gcc/lto/lto-lang.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/lto/ChangeLog b/gcc-4.9/gcc/lto/ChangeLog index c029da671..6c6ea2bdd 100644 --- a/gcc-4.9/gcc/lto/ChangeLog +++ b/gcc-4.9/gcc/lto/ChangeLog @@ -1,3 +1,11 @@ +2014-08-15 Bin Cheng <bin.cheng@arm.com> + + Backport from mainline + 2014-08-08 Bin Cheng <bin.cheng@arm.com> + + PR lto/62032 + * lto-lang.c (lto_init): Switch mis-matched arguments. + 2014-07-16 Release Manager * GCC 4.9.1 released. diff --git a/gcc-4.9/gcc/lto/lto-lang.c b/gcc-4.9/gcc/lto/lto-lang.c index f60d2127b..1a4da916f 100644 --- a/gcc-4.9/gcc/lto/lto-lang.c +++ b/gcc-4.9/gcc/lto/lto-lang.c @@ -1186,10 +1186,10 @@ lto_init (void) } else { - lto_define_builtins (va_list_type_node, - build_reference_type (va_list_type_node)); + lto_define_builtins (build_reference_type (va_list_type_node), + va_list_type_node); } - + if (flag_cilkplus) cilk_init_builtins (); |