[libclc] 111/291: Merge tag 'upstream/0_git20140101'

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository libclc.

commit 288d2daffdca60339eccd4be6fc13fea4619b85c
Merge: 21f2751 0e431f5
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Fri Jan 10 02:46:15 2014 +0000

    Merge tag 'upstream/0_git20140101'

 LICENSE.TXT                                        |   4 +-
 build/metabuild.py                                 |   5 +
 configure.py                                       |  26 +-
 generic/include/clc/as_type.h                      |  15 +
 generic/include/clc/atomic/atomic_add.h            |   3 +
 generic/include/clc/atomic/atomic_dec.h            |   1 +
 generic/include/clc/atomic/atomic_decl.inc         |  10 +
 generic/include/clc/atomic/atomic_inc.h            |   1 +
 generic/include/clc/atomic/atomic_sub.h            |   3 +
 .../cl_khr_global_int32_base_atomics/atom_add.h    |   2 +
 .../cl_khr_global_int32_base_atomics/atom_dec.h    |   2 +
 .../cl_khr_global_int32_base_atomics/atom_inc.h    |   2 +
 .../cl_khr_global_int32_base_atomics/atom_sub.h    |   2 +
 generic/include/clc/clc.h                          |  28 ++
 generic/include/clc/clcmacro.h                     |  12 +
 generic/include/clc/common/sign.h                  |   5 +
 generic/include/clc/convert.h                      |  11 +-
 generic/include/clc/float/definitions.h            |  24 ++
 generic/include/clc/integer/mad_hi.h               |   1 +
 generic/include/clc/integer/upsample.h             |  12 +-
 generic/include/clc/math/clc_nextafter.h           |  11 +
 generic/include/clc/math/nextafter.h               |   5 +
 generic/include/clc/math/round.h                   |   9 +
 generic/include/clc/math/trunc.h                   |   9 +
 generic/include/clc/relational/isnan.h             |  21 ++
 generic/include/math/clc_nextafter.h               |   7 +
 generic/lib/SOURCES                                |   9 +
 generic/lib/atomic/atomic_impl.ll                  |  23 ++
 .../cl_khr_global_int32_base_atomics/atom_add.cl   |   9 +
 .../cl_khr_global_int32_base_atomics/atom_dec.cl   |   9 +
 .../cl_khr_global_int32_base_atomics/atom_inc.cl   |   9 +
 .../cl_khr_global_int32_base_atomics/atom_sub.cl   |   9 +
 generic/lib/common/sign.cl                         |  27 ++
 generic/lib/convert.cl                             | 149 --------
 generic/lib/gen_convert.py                         | 390 +++++++++++++++++++++
 generic/lib/integer/mul_hi.cl                      |  16 +-
 generic/lib/integer/upsample.cl                    |  12 +-
 generic/lib/math/clc_nextafter.cl                  |  42 +++
 generic/lib/math/nextafter.cl                      |  11 +
 generic/lib/relational/isnan.cl                    |  17 +
 r600/lib/SOURCES                                   |   3 +-
 r600/lib/atomic/atomic.cl                          |  21 ++
 r600/lib/math/nextafter.cl                         |   3 +
 r600/lib/synchronization/barrier.cl                |  15 +-
 r600/lib/synchronization/barrier_impl.ll           |  33 +-
 45 files changed, 841 insertions(+), 197 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git