[ocl-icd] 04/06: Imported Upstream version 2.2.7
Vincent Danjean
vdanjean at debian.org
Mon Jun 8 23:27:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
vdanjean pushed a commit to branch master
in repository ocl-icd.
commit 13af189869e9a7361df8c0259f5b812287b65f56
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date: Tue Jun 9 01:21:03 2015 +0200
Imported Upstream version 2.2.7
---
NEWS | 7 +++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
icd_generator.rb | 55 ++++++++++++++++++++++++++++++++++++++++---------------
tests/package.m4 | 4 ++--
tests/testsuite | 12 ++++++------
6 files changed, 66 insertions(+), 34 deletions(-)
diff --git a/NEWS b/NEWS
index 3872a5b..43aa116 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
+Version 2.2.7
+=============
+
+Vincent Danjean (2):
+ Also use real prototype in weak test functions
+ New release
+
Version 2.2.6
=============
diff --git a/configure b/configure
index 9eb6647..2b26752 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.6.
+# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.7.
#
# Report bugs to <ocl-icd-devel at lists.forge.imag.fr>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenCL ICD Loader'
PACKAGE_TARNAME='ocl-icd'
-PACKAGE_VERSION='2.2.6'
-PACKAGE_STRING='OpenCL ICD Loader 2.2.6'
+PACKAGE_VERSION='2.2.7'
+PACKAGE_STRING='OpenCL ICD Loader 2.2.7'
PACKAGE_BUGREPORT='ocl-icd-devel at lists.forge.imag.fr'
PACKAGE_URL=''
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenCL ICD Loader 2.2.6 to adapt to many kinds of systems.
+\`configure' configures OpenCL ICD Loader 2.2.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1400,7 +1400,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.6:";;
+ short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.7:";;
esac
cat <<\_ACEOF
@@ -1517,7 +1517,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenCL ICD Loader configure 2.2.6
+OpenCL ICD Loader configure 2.2.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1940,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenCL ICD Loader $as_me 2.2.6, which was
+It was created by OpenCL ICD Loader $as_me 2.2.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2807,7 +2807,7 @@ fi
# Define the identity of the package.
PACKAGE='ocl-icd'
- VERSION='2.2.6'
+ VERSION='2.2.7'
cat >>confdefs.h <<_ACEOF
@@ -13553,7 +13553,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenCL ICD Loader $as_me 2.2.6, which was
+This file was extended by OpenCL ICD Loader $as_me 2.2.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13619,7 +13619,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenCL ICD Loader config.status 2.2.6
+OpenCL ICD Loader config.status 2.2.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6bd1e27..6b12755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67])
-AC_INIT([OpenCL ICD Loader], [2.2.6], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
+AC_INIT([OpenCL ICD Loader], [2.2.7], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
AC_CONFIG_SRCDIR([ocl_icd_loader.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
diff --git a/icd_generator.rb b/icd_generator.rb
index 28faceb..984b9c2 100644
--- a/icd_generator.rb
+++ b/icd_generator.rb
@@ -288,22 +288,47 @@ EOF
#include <stdio.h>
#include <dlfcn.h>
-#define F(f) \\
-__attribute__((weak)) int f (void* arg, int arg2, int arg3, void* arg4, void* arg5) { \\
- void (* p)(void*, int, int, void*, void*)=NULL; \\
- p=dlsym(RTLD_NEXT, #f); \\
- if (p) { \\
- (*p)(arg, arg2, arg3, arg4, arg5); \\
- } else { \\
- printf("-1 : "); \\
- } \\
- return 0; \\
-}
-
EOF
- $api_entries.each_key { |func_name|
- next if $noweak_funcs.include?(func_name)
- run_dummy_icd_weak += "F(#{func_name})\n"
+ run_dummy_icd_weak += "#pragma GCC diagnostic push\n"
+ run_dummy_icd_weak += "# pragma GCC diagnostic ignored \"-Wcpp\"\n"
+ run_dummy_icd_weak += "# define CL_USE_DEPRECATED_OPENCL_1_0_APIS\n"
+ run_dummy_icd_weak += "# define CL_USE_DEPRECATED_OPENCL_1_1_APIS\n"
+ run_dummy_icd_weak += "# define CL_USE_DEPRECATED_OPENCL_1_2_APIS\n"
+ run_dummy_icd_weak += "# include <CL/opencl.h>\n"
+ run_dummy_icd_weak += self.include_headers
+ run_dummy_icd_weak += "#pragma GCC diagnostic pop\n"
+
+ $api_entries.each { |func_name, entry|
+ next if $noweak_funcs.include?(func_name)
+ clean_entry = entry.sub(/(.*\)).*/m,'\1').gsub("/*","").gsub("*/","").gsub("\r","") + "{\n"
+ return_type = entry.match(/CL_API_ENTRY (.*) CL_API_CALL/)[1]
+ parameters = clean_entry.match(/\(.*\)/m)[0][1..-2]
+ parameters.gsub!(/\[.*?\]/,"")
+ parameters.sub!(/\(.*?\*\s*(.*?)\)\s*\(.*?\)/m,'\1')
+ run_dummy_icd_weak += clean_entry.gsub(/\*\[.*?\]/,"* ").gsub(/\[.+?\]/,"")
+ first_parameter = parameters.match(/.*?\,/m)
+ if not first_parameter then
+ first_parameter = parameters.match(/.*/m)[0]
+ else
+ first_parameter = first_parameter[0][0..-2]
+ end
+ fps = first_parameter.split
+ run_dummy_icd_weak += " void (*p)()=dlsym(RTLD_NEXT, \"#{func_name}\");\n"
+ ps = parameters.split(",")
+ ps = ps.collect { |p|
+ p = p.split
+ p = p[-1].gsub("*","")
+ }
+
+ run_dummy_icd_weak += " if(p) {\n"
+ run_dummy_icd_weak += " return((*(typeof(#{func_name})*)p)("
+ run_dummy_icd_weak += ps.join(", ")
+ run_dummy_icd_weak += "));\n"
+ run_dummy_icd_weak += " } else {\n"
+ run_dummy_icd_weak += " printf(\"-1 : \");\n"
+ run_dummy_icd_weak += " return (#{return_type})0;\n"
+ run_dummy_icd_weak += " }\n"
+ run_dummy_icd_weak += "}\n\n"
}
return run_dummy_icd_weak
end
diff --git a/tests/package.m4 b/tests/package.m4
index 286b312..033ff87 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -4,9 +4,9 @@ m4_define([AT_PACKAGE_NAME],
m4_define([AT_PACKAGE_TARNAME],
[ocl-icd])
m4_define([AT_PACKAGE_VERSION],
- [2.2.6])
+ [2.2.7])
m4_define([AT_PACKAGE_STRING],
- [OpenCL ICD Loader 2.2.6])
+ [OpenCL ICD Loader 2.2.7])
m4_define([AT_PACKAGE_BUGREPORT],
[ocl-icd-devel at lists.forge.imag.fr])
m4_define([AT_PACKAGE_URL],
diff --git a/tests/testsuite b/tests/testsuite
index b5fca58..9a063fd 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -926,7 +926,7 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-OpenCL ICD Loader 2.2.6 test suite test groups:
+OpenCL ICD Loader 2.2.7 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -967,7 +967,7 @@ _ATEOF
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (OpenCL ICD Loader 2.2.6)" &&
+ $as_echo "$as_me (OpenCL ICD Loader 2.2.7)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1153,11 +1153,11 @@ exec 5>>"$at_suite_log"
# Banners and logs.
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.6 test suite. ##
+## OpenCL ICD Loader 2.2.7 test suite. ##
## ----------------------------------- ##"
{
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.6 test suite. ##
+## OpenCL ICD Loader 2.2.7 test suite. ##
## ----------------------------------- ##"
echo
@@ -2001,7 +2001,7 @@ _ASBOX
$as_echo "Please send $at_msg and all information you think might help:
To: <ocl-icd-devel at lists.forge.imag.fr>
- Subject: [OpenCL ICD Loader 2.2.6] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [OpenCL ICD Loader 2.2.7] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
@@ -2396,7 +2396,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "ocl_version: OpenCL 1.2
-version: 2.2.6
+version: 2.2.7
name: OpenCL ICD Loader
vendor: OCL Icd free software
" | \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ocl-icd.git
More information about the Pkg-opencl-commits
mailing list