Merge branch 'release_0_9'

Graphics / POCL - Pekka Jääskeläinen [tut.fi] - 4 January 2014 10:11 EST



###

Merge branch 'release_0_9'

Conflicts:
Makefile.am
configure.ac


diff --cc configure.ac
index 33e17ac,45e328a..c448d21
--- a/configure.ac
+++ b/configure.ac
@@@ -1212,8 -1207,15 +1207,16 @@@ AC_C_BIGENDIA
# 1:0:0 == 0.7 (not backwards compatible with 0:0:0 due to the ICD)
# 2:0:1 == 0.8 (currently backwards compatible with 0.7, thus age = 1).
# 3:0:2 == 0.9 (currently backwards compatible with 0.7, thus age = 2).
-LIB_CURRENT_VERSION=3
+# 4:0:3 == 0.10 (currently backwards compatible with 0.7, thus age = 3).
- AC_SUBST([LIB_VERSION], ["4:0:3"])
++LIB_CURRENT_VERSION=4
+ LIB_REVISION_VERSION=0
-LIB_AGE_VERSION=2
++LIB_AGE_VERSION=3
+ LIB_FIRST_VERSION=$(($LIB_CURRENT_VERSION - $LIB_AGE_VERSION))
+ AC_SUBST([LIB_VERSION], ["$LIB_CURRENT_VERSION:$LIB_REVISION_VERSION:$LIB_AGE_VERSION"])
+ AC_SUBST([LIB_CURRENT_VERSION], [$LIB_CURRENT_VERSION])
+ AC_SUBST([LIB_REVISION_VERSION], [$LIB_REVISION_VERSION])
+ AC_SUBST([LIB_AGE_VERSION], [$LIB_AGE_VERSION])
+ AC_SUBST([LIB_FIRST_VERSION], [$LIB_FIRST_VERSION])

# The kernel compiler opt plugin shared library, however, changes more
# drastically. Let's try to follow the similar 'current' numbering as

5913d43 Merge branch 'release_0_9'

Makefile.am | 5 +++--
configure.ac | 29 ++++++++++++++++-------------
lib/CL/pocl_util.h | 7 ++-----
lib/llvmopencl/TargetAddressSpaces.cc | 11 +++--------
4 files changed, 24 insertions(+), 28 deletions(-)

Upstream: github.com


  • Share