r218677 - in /branches/gomp-4_0-branch: ./ Chan...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Fri Dec 12 15:29:21 2014
New Revision: 218677

URL: https://gcc.gnu.org/viewcvs?rev=218677&root=gcc&view=rev
Log:
svn merge -r 217483:217500 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Added:
    branches/gomp-4_0-branch/config/target-posix
      - copied unchanged from r217500, trunk/config/target-posix
    branches/gomp-4_0-branch/gcc/config/i386/intelmic-mkoffload.c
      - copied unchanged from r217500, trunk/gcc/config/i386/intelmic-mkoffload.c
    branches/gomp-4_0-branch/gcc/config/i386/t-intelmic
      - copied unchanged from r217500, trunk/gcc/config/i386/t-intelmic
    branches/gomp-4_0-branch/libgcc/offloadstuff.c
      - copied unchanged from r217500, trunk/libgcc/offloadstuff.c
    branches/gomp-4_0-branch/libgomp/libgomp_target.h
      - copied, changed from r217500, trunk/libgomp/libgomp_target.h
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c++/examples-4/
      - copied from r217500, trunk/libgomp/testsuite/libgomp.c++/examples-4/
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/examples-4/
      - copied from r217500, trunk/libgomp/testsuite/libgomp.c/examples-4/
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.fortran/examples-4/
      - copied from r217500, trunk/libgomp/testsuite/libgomp.fortran/examples-4/
    branches/gomp-4_0-branch/liboffloadmic/
      - copied from r217500, trunk/liboffloadmic/
Removed:
    branches/gomp-4_0-branch/libgcc/ompstuff.c
    branches/gomp-4_0-branch/libgomp/target.h
Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/ChangeLog
    branches/gomp-4_0-branch/Makefile.def
    branches/gomp-4_0-branch/Makefile.in
    branches/gomp-4_0-branch/config/ChangeLog
    branches/gomp-4_0-branch/configure
    branches/gomp-4_0-branch/configure.ac
    branches/gomp-4_0-branch/gcc/ChangeLog
    branches/gomp-4_0-branch/gcc/Makefile.in
    branches/gomp-4_0-branch/gcc/cgraph.c
    branches/gomp-4_0-branch/gcc/cgraph.h
    branches/gomp-4_0-branch/gcc/cgraphunit.c
    branches/gomp-4_0-branch/gcc/common.opt
    branches/gomp-4_0-branch/gcc/config.gcc
    branches/gomp-4_0-branch/gcc/config.in
    branches/gomp-4_0-branch/gcc/config/i386/i386.c
    branches/gomp-4_0-branch/gcc/configure
    branches/gomp-4_0-branch/gcc/configure.ac
    branches/gomp-4_0-branch/gcc/context.c
    branches/gomp-4_0-branch/gcc/context.h
    branches/gomp-4_0-branch/gcc/coretypes.h
    branches/gomp-4_0-branch/gcc/cp/ChangeLog
    branches/gomp-4_0-branch/gcc/cp/Make-lang.in
    branches/gomp-4_0-branch/gcc/doc/install.texi
    branches/gomp-4_0-branch/gcc/doc/tm.texi
    branches/gomp-4_0-branch/gcc/doc/tm.texi.in
    branches/gomp-4_0-branch/gcc/fold-const.c
    branches/gomp-4_0-branch/gcc/fortran/ChangeLog
    branches/gomp-4_0-branch/gcc/fortran/Make-lang.in
    branches/gomp-4_0-branch/gcc/gcc.c
    branches/gomp-4_0-branch/gcc/genmatch.c
    branches/gomp-4_0-branch/gcc/hooks.c
    branches/gomp-4_0-branch/gcc/hooks.h
    branches/gomp-4_0-branch/gcc/ipa-inline-analysis.c
    branches/gomp-4_0-branch/gcc/lto-cgraph.c
    branches/gomp-4_0-branch/gcc/lto-opts.c
    branches/gomp-4_0-branch/gcc/lto-section-names.h
    branches/gomp-4_0-branch/gcc/lto-streamer.c
    branches/gomp-4_0-branch/gcc/lto-streamer.h
    branches/gomp-4_0-branch/gcc/lto-wrapper.c
    branches/gomp-4_0-branch/gcc/lto/ChangeLog
    branches/gomp-4_0-branch/gcc/lto/lto-partition.c
    branches/gomp-4_0-branch/gcc/lto/lto.c
    branches/gomp-4_0-branch/gcc/match.pd
    branches/gomp-4_0-branch/gcc/omp-low.c
    branches/gomp-4_0-branch/gcc/opts.c
    branches/gomp-4_0-branch/gcc/passes.c
    branches/gomp-4_0-branch/gcc/target.def
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/tree-ssa/forwprop-28.c
    branches/gomp-4_0-branch/gcc/tree-pass.h
    branches/gomp-4_0-branch/gcc/tree-ssa-forwprop.c
    branches/gomp-4_0-branch/gcc/varpool.c
    branches/gomp-4_0-branch/libcilkrts/ChangeLog
    branches/gomp-4_0-branch/libcilkrts/configure.tgt
    branches/gomp-4_0-branch/libgcc/ChangeLog
    branches/gomp-4_0-branch/libgcc/Makefile.in
    branches/gomp-4_0-branch/libgcc/configure
    branches/gomp-4_0-branch/libgcc/configure.ac
    branches/gomp-4_0-branch/libgomp/ChangeLog
    branches/gomp-4_0-branch/libgomp/Makefile.in
    branches/gomp-4_0-branch/libgomp/config.h.in
    branches/gomp-4_0-branch/libgomp/configure
    branches/gomp-4_0-branch/libgomp/configure.ac
    branches/gomp-4_0-branch/libgomp/env.c
    branches/gomp-4_0-branch/libgomp/libgomp-plugin.c
    branches/gomp-4_0-branch/libgomp/libgomp.map
    branches/gomp-4_0-branch/libgomp/oacc-async.c
    branches/gomp-4_0-branch/libgomp/oacc-cuda.c
    branches/gomp-4_0-branch/libgomp/oacc-host.c
    branches/gomp-4_0-branch/libgomp/oacc-init.c
    branches/gomp-4_0-branch/libgomp/oacc-int.h
    branches/gomp-4_0-branch/libgomp/oacc-mem.c
    branches/gomp-4_0-branch/libgomp/oacc-parallel.c
    branches/gomp-4_0-branch/libgomp/oacc-plugin.c
    branches/gomp-4_0-branch/libgomp/plugin/configure
    branches/gomp-4_0-branch/libgomp/plugin/plugin-host.c
    branches/gomp-4_0-branch/libgomp/plugin/plugin-nvptx.c
    branches/gomp-4_0-branch/libgomp/splay-tree.h
    branches/gomp-4_0-branch/libgomp/target.c
    branches/gomp-4_0-branch/libgomp/testsuite/Makefile.am
    branches/gomp-4_0-branch/libgomp/testsuite/Makefile.in
    branches/gomp-4_0-branch/libgomp/testsuite/lib/libgomp.exp
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c++/c++.exp
    branches/gomp-4_0-branch/libgomp/testsuite/libgomp.c/target-7.c
    branches/gomp-4_0-branch/lto-plugin/ChangeLog
    branches/gomp-4_0-branch/lto-plugin/Makefile.am
    branches/gomp-4_0-branch/lto-plugin/Makefile.in
    branches/gomp-4_0-branch/lto-plugin/configure
    branches/gomp-4_0-branch/lto-plugin/configure.ac
    branches/gomp-4_0-branch/lto-plugin/lto-plugin.c

Propchange: branches/gomp-4_0-branch/
            ('svn:mergeinfo' modified)