diff options
| author | Aldy Hernandez <aldyh@redhat.com> | 2013-06-28 09:57:43 -0700 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@redhat.com> | 2013-06-28 09:57:43 -0700 |
| commit | 7fb75753fa7e7c54af3b5e0aea65d8051feac55d (patch) | |
| tree | 568d89cbf5521cbb882c33a3a42fb332ff2e49b8 /gcc/config/cris/cris.c | |
| parent | db2127098137dea6c246041e0d763a57a174fa3c (diff) | |
| parent | 2814409c2f46b5f71706f08358f395dddc9d8a81 (diff) | |
| download | gcc-7fb75753fa7e7c54af3b5e0aea65d8051feac55d.tar.gz | |
Merge remote-tracking branch 'origin/gomp-4_0-branch' into cilk-in-gomp
Conflicts:
gcc/Makefile.in
gcc/c-family/c-common.h
gcc/c/c-parser.c
gcc/cp/Make-lang.in
gcc/cp/cp-tree.h
gcc/gimple.h
gcc/omp-low.c
gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
Diffstat (limited to 'gcc/config/cris/cris.c')
0 files changed, 0 insertions, 0 deletions