[oclgrind] 04/10: Refresh patches, drop those applied upstream
James Price
jprice-guest at moszumanska.debian.org
Sun Oct 23 20:01:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
jprice-guest pushed a commit to branch master
in repository oclgrind.
commit 7fe42476c40fd562d634f25776b67a9c2c46efe2
Author: James Price <j.price at bristol.ac.uk>
Date: Sun Oct 23 20:12:08 2016 +0100
Refresh patches, drop those applied upstream
---
debian/patches/altivec-fix.patch | 8 +-
debian/patches/big-endian.patch | 55 ------
debian/patches/clang-library-order.patch | 19 --
debian/patches/cmake-preserve-flags.patch | 24 ---
debian/patches/do-not-install-license.patch | 25 ---
debian/patches/fix-llvm37.patch | 75 --------
debian/patches/i386-shift-width.patch | 24 ---
debian/patches/library-versions.patch | 10 +-
debian/patches/llvm-3.8.patch | 252 --------------------------
debian/patches/no-validate-pch.patch | 14 --
debian/patches/pch-location.patch | 18 +-
debian/patches/private-library-location.patch | 20 +-
debian/patches/series | 10 -
debian/patches/typos.patch | 25 ---
debian/patches/use-opencl-headers.patch | 14 +-
debian/patches/use-std.patch | 46 -----
16 files changed, 35 insertions(+), 604 deletions(-)
diff --git a/debian/patches/altivec-fix.patch b/debian/patches/altivec-fix.patch
index c0a10b8..c3ffcb0 100644
--- a/debian/patches/altivec-fix.patch
+++ b/debian/patches/altivec-fix.patch
@@ -4,11 +4,11 @@ Last-Update: 2015-12-09
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@
+ set(CMAKE_MACOSX_RPATH 1)
- # Enable C++11 for Clang/GCC
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
- endif()
-
- # Disable min/max macros on Windows
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
deleted file mode 100644
index 97dce76..0000000
--- a/debian/patches/big-endian.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: James Price <j.price at bristol.ac.uk>
-Description: Address endianness issues in getConstantData
-Origin: upstream commit:c79487e and upstream commit:3a686dd
-Last-Update: 2016-05-02
---- a/src/core/common.cpp
-+++ b/src/core/common.cpp
-@@ -260,10 +260,27 @@
- switch (type->getTypeID())
- {
- case llvm::Type::IntegerTyID:
-- memcpy(data,
-- ((llvm::ConstantInt*)constant)->getValue().getRawData(),
-- size);
-+ {
-+ uint64_t ui = ((llvm::ConstantInt*)constant)->getZExtValue();
-+ switch (size)
-+ {
-+ case 1:
-+ *((uint8_t*)data) = ui;
-+ break;
-+ case 2:
-+ *((uint16_t*)data) = ui;
-+ break;
-+ case 4:
-+ *((uint32_t*)data) = ui;
-+ break;
-+ case 8:
-+ *((uint64_t*)data) = ui;
-+ break;
-+ default:
-+ FATAL_ERROR("Unsupported constant int size: %u bytes", size);
-+ }
- break;
-+ }
- case llvm::Type::FloatTyID:
- {
- *(float*)data =
---- a/tests/kernels/alignment/packed.ref
-+++ b/tests/kernels/alignment/packed.ref
-@@ -1,4 +1,4 @@
-
- Argument 'out': 4 bytes
-- out[0] = 2
-+ out[0] = 33554434
-
---- a/tests/kernels/alignment/packed.sim
-+++ b/tests/kernels/alignment/packed.sim
-@@ -5,6 +5,6 @@
-
- <size=5 char hex>
- 0x01
--0x02 0x00 0x0 0x00
-+0x02 0x00 0x00 0x02
-
- <size=4 fill=0 dump>
diff --git a/debian/patches/clang-library-order.patch b/debian/patches/clang-library-order.patch
deleted file mode 100644
index 2e3aa1c..0000000
--- a/debian/patches/clang-library-order.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix Clang library link order.
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-09-14
-Applied-Upstream: commit:2706f9c
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,9 +140,9 @@
- src/plugins/MemCheck.cpp
- src/plugins/RaceDetector.h
- src/plugins/RaceDetector.cpp)
--target_link_libraries(oclgrind ${CORE_EXTRA_LIBS}
-- clangAnalysis clangAST clangBasic clangCodeGen clangDriver clangEdit
-- clangFrontend clangLex clangParse clangSema clangSerialization
-+target_link_libraries(oclgrind PRIVATE ${CORE_EXTRA_LIBS}
-+ clangFrontend clangSerialization clangDriver clangCodeGen clangSema
-+ clangAnalysis clangEdit clangAST clangParse clangSema clangLex clangBasic
- ${LLVM_LIBS})
- set_target_properties(oclgrind PROPERTIES OUTPUT_NAME oclgrind-15.5)
-
diff --git a/debian/patches/cmake-preserve-flags.patch b/debian/patches/cmake-preserve-flags.patch
deleted file mode 100644
index d2fa095..0000000
--- a/debian/patches/cmake-preserve-flags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Preserve external CMAKE_{C,CXX}_FLAGS definitions.
-Author: James Price <j.price at bristol.ac.uk>
-Origin: upstream commit:b093b01
-Last-Update: 2015-09-09
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,7 +17,7 @@
-
- # Enable C99 for GCC (required for tests)
- if (CMAKE_COMPILER_IS_GNUCC)
-- set(CMAKE_C_FLAGS "-std=c99")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
- endif()
-
- # Enable rpath on OS X
-@@ -25,7 +25,7 @@
-
- # Enable C++11 for Clang/GCC
- if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-- set(CMAKE_CXX_FLAGS "-std=c++11")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
-
- # Disable min/max macros on Windows
diff --git a/debian/patches/do-not-install-license.patch b/debian/patches/do-not-install-license.patch
deleted file mode 100644
index cacc24d..0000000
--- a/debian/patches/do-not-install-license.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Do not install LICENSE in include directory
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-08-06
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,7 @@
- oclgrind oclgrind-rt oclgrind-rt-icd
- DESTINATION lib)
- install(FILES
-- ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h ${CLC_HEADERS} LICENSE
-+ ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h ${CLC_HEADERS}
- DESTINATION include/oclgrind)
- if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
- install(FILES
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,7 +45,7 @@
- oclgrind_include_HEADERS = src/core/common.h src/core/Context.h \
- src/core/half.h src/core/Kernel.h src/core/KernelInvocation.h \
- src/core/Memory.h src/core/Plugin.h src/core/Program.h \
-- src/core/Queue.h src/core/WorkItem.h src/core/WorkGroup.h config.h LICENSE
-+ src/core/Queue.h src/core/WorkItem.h src/core/WorkGroup.h config.h
- src/core/clc_h.cpp: src/core/gen_clc_h.sh src/core/clc.h
- $(top_srcdir)/src/core/gen_clc_h.sh $(top_srcdir)/src/core/clc.h $@
-
diff --git a/debian/patches/fix-llvm37.patch b/debian/patches/fix-llvm37.patch
deleted file mode 100644
index de3848b..0000000
--- a/debian/patches/fix-llvm37.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: James Price <j.price at bristol.ac.uk>
-Description: Fixed build for LLVM 3.7
-Origin: upstream commit:f6231ef and upstream commit:1b2452c
-Last-Update: 2015-08-06
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,7 +20,7 @@
- lib_LTLIBRARIES = liboclgrind.la liboclgrind-rt.la liboclgrind-rt-icd.la
-
- LLVM_LIBS = `$(llvm_config) --system-libs --libs bitreader bitwriter \
-- core instrumentation ipo irreader linker mcparser objcarcopts option`
-+ core instrumentation ipo irreader linker mcparser objcarcopts option target`
-
- liboclgrind_la_SOURCES = src/core/common.h src/core/common.cpp \
- src/core/Context.h src/core/Context.cpp src/core/half.h \
---- a/src/core/Program.cpp
-+++ b/src/core/Program.cpp
-@@ -448,14 +448,22 @@
- }
-
- // Parse bitcode into IR module
-+#if LLVM_VERSION < 37
- llvm::ErrorOr<llvm::Module*> module =
-+#else
-+ llvm::ErrorOr<unique_ptr<llvm::Module>> module =
-+#endif
- parseBitcodeFile(buffer->getMemBufferRef(), llvm::getGlobalContext());
- if (!module)
- {
- return NULL;
- }
-
-+#if LLVM_VERSION < 37
- return new Program(context, module.get());
-+#else
-+ return new Program(context, module.get().get());
-+#endif
- }
-
- Program* Program::createFromBitcodeFile(const Context *context,
-@@ -470,7 +478,11 @@
- }
-
- // Parse bitcode into IR module
-+#if LLVM_VERSION < 37
- llvm::ErrorOr<llvm::Module*> module =
-+#else
-+ llvm::ErrorOr<unique_ptr<llvm::Module>> module =
-+#endif
- parseBitcodeFile(buffer->get()->getMemBufferRef(),
- llvm::getGlobalContext());
- if (!module)
-@@ -478,7 +490,11 @@
- return NULL;
- }
-
-+#if LLVM_VERSION < 37
- return new Program(context, module.get());
-+#else
-+ return new Program(context, module.get().get());
-+#endif
- }
-
- Program* Program::createFromPrograms(const Context *context,
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,7 +58,7 @@
- # Get LLVM libraries for linking
- llvm_map_components_to_libnames(LLVM_LIBS
- bitreader bitwriter core instrumentation ipo irreader
-- linker mcparser objcarcopts option)
-+ linker mcparser objcarcopts option target)
-
-
- # Check for GNU readline library
diff --git a/debian/patches/i386-shift-width.patch b/debian/patches/i386-shift-width.patch
deleted file mode 100644
index 7dc83b2..0000000
--- a/debian/patches/i386-shift-width.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fixed shift width warning for i386 builds.
-Author: James Price <j.price at bristol.ac.uk>
-Origin: upstream commit:f633dbc
-Last-Update: 2015-09-14
---- a/src/core/WorkItemBuiltins.cpp
-+++ b/src/core/WorkItemBuiltins.cpp
-@@ -1888,7 +1888,7 @@
- {
- uint64_t a = UARGV(0, i);
- uint64_t b = UARGV(1, i);
-- uint64_t c = (a > UINT64_MAX-b) ? (1L<<63) : 0;
-+ uint64_t c = (a > UINT64_MAX-b) ? (((uint64_t)1)<<63) : 0;
- result.setUInt(((a + b) >> 1) | c, i);
- break;
- }
-@@ -2128,7 +2128,7 @@
- {
- uint64_t a = UARGV(0, i);
- uint64_t b = UARGV(1, i);
-- uint64_t c = (a > UINT64_MAX-(b+1)) ? (1L<<63) : 0;
-+ uint64_t c = (a > UINT64_MAX-(b+1)) ? (((uint64_t)1)<<63) : 0;
- result.setUInt(((a + b + 1) >> 1) | c, i);
- break;
- }
diff --git a/debian/patches/library-versions.patch b/debian/patches/library-versions.patch
index 5c28fda..7f9401a 100644
--- a/debian/patches/library-versions.patch
+++ b/debian/patches/library-versions.patch
@@ -3,11 +3,11 @@ Author: James Price <j.price at bristol.ac.uk>
Last-Update: 2015-08-07
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -143,6 +143,7 @@
- clangAnalysis clangAST clangBasic clangCodeGen clangDriver clangEdit
- clangFrontend clangLex clangParse clangSema clangSerialization
+@@ -215,6 +215,7 @@
+ clangFrontend clangSerialization clangDriver clangCodeGen
+ clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic
${LLVM_LIBS})
+set_target_properties(oclgrind PROPERTIES OUTPUT_NAME oclgrind-15.5)
- # Sources for OpenCL runtime API frontend
- set(RUNTIME_SOURCES
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+ target_link_libraries(oclgrind PRIVATE Version)
diff --git a/debian/patches/llvm-3.8.patch b/debian/patches/llvm-3.8.patch
deleted file mode 100644
index f448429..0000000
--- a/debian/patches/llvm-3.8.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-Description: Add support for LLVM 3.8
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2016-10-01
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -197,7 +197,7 @@
- POST_BUILD
- COMMAND
- ${CLANG}
-- -cc1 -x cl -cl-std=CL1.2 -O0 -g -fno-builtin
-+ -cc1 -x cl -cl-std=CL1.2 -O0 -fno-builtin
- -emit-pch -triple spir-unknown-unknown
- -relocatable-pch -isysroot ${CMAKE_BINARY_DIR}/include/oclgrind/
- ${CMAKE_BINARY_DIR}/include/oclgrind/clc.h
-@@ -209,7 +209,7 @@
- POST_BUILD
- COMMAND
- ${CLANG}
-- -cc1 -x cl -cl-std=CL1.2 -O0 -g -fno-builtin
-+ -cc1 -x cl -cl-std=CL1.2 -O0 -fno-builtin
- -emit-pch -triple spir64-unknown-unknown
- -relocatable-pch -isysroot ${CMAKE_BINARY_DIR}/include/oclgrind/
- ${CMAKE_BINARY_DIR}/include/oclgrind/clc.h
---- a/src/core/Kernel.cpp
-+++ b/src/core/Kernel.cpp
-@@ -54,12 +54,12 @@
- new unsigned char[sizeof(size_t)]
- };
- value.setPointer(address);
-- m_arguments[itr] = value;
-+ m_arguments[&*itr] = value;
-
- break;
- }
- case AddrSpaceConstant:
-- m_constants.push_back(itr);
-+ m_constants.push_back(&*itr);
- break;
- case AddrSpaceLocal:
- {
-@@ -71,7 +71,7 @@
- new unsigned char[sizeof(size_t)]
- };
- v.setPointer(m_localMemory->allocateBuffer(size));
-- m_arguments[itr] = v;
-+ m_arguments[&*itr] = v;
-
- break;
- }
-@@ -141,7 +141,7 @@
- llvm::Function::const_arg_iterator itr;
- for (itr = m_function->arg_begin(); itr != m_function->arg_end(); itr++)
- {
-- if (!m_arguments.count(itr))
-+ if (!m_arguments.count(&*itr))
- {
- return false;
- }
-@@ -196,7 +196,7 @@
- {
- argItr++;
- }
-- return argItr;
-+ return &*argItr;
- }
-
- unsigned int Kernel::getArgumentAccessQualifier(unsigned int index) const
---- a/src/core/WorkItem.cpp
-+++ b/src/core/WorkItem.cpp
-@@ -30,9 +30,9 @@
-
- struct WorkItem::Position
- {
-- llvm::Function::const_iterator prevBlock;
-- llvm::Function::const_iterator currBlock;
-- llvm::Function::const_iterator nextBlock;
-+ const llvm::BasicBlock * prevBlock;
-+ const llvm::BasicBlock * currBlock;
-+ const llvm::BasicBlock * nextBlock;
- llvm::BasicBlock::const_iterator currInst;
- std::stack<const llvm::Instruction*> callStack;
- std::stack< std::list<size_t> > allocations;
-@@ -81,7 +81,7 @@
- m_position = new Position;
- m_position->prevBlock = NULL;
- m_position->nextBlock = NULL;
-- m_position->currBlock = kernel->getFunction()->begin();
-+ m_position->currBlock = &*kernel->getFunction()->begin();
- m_position->currInst = m_position->currBlock->begin();
- }
-
-@@ -310,7 +310,7 @@
-
- const llvm::Instruction* WorkItem::getCurrentInstruction() const
- {
-- return m_position->currInst;
-+ return &*m_position->currInst;
- }
-
- Size3 WorkItem::getGlobalID() const
-@@ -509,7 +509,7 @@
- assert(m_state == READY);
-
- // Execute the next instruction
-- execute(m_position->currInst);
-+ execute(&*m_position->currInst);
-
- // Check if we've reached the end of the block
- if (++m_position->currInst == m_position->currBlock->end() ||
-@@ -663,9 +663,9 @@
- // Check if function has definition
- if (!function->isDeclaration())
- {
-- m_position->callStack.push(m_position->currInst);
-+ m_position->callStack.push(&*m_position->currInst);
- m_position->allocations.push(list<size_t>());
-- m_position->nextBlock = function->begin();
-+ m_position->nextBlock = &*function->begin();
-
- // Set function arguments
- llvm::Function::const_arg_iterator argItr;
-@@ -673,7 +673,7 @@
- argItr != function->arg_end(); argItr++)
- {
- const llvm::Value *arg = callInst->getArgOperand(argItr->getArgNo());
-- setValue(argItr, m_pool.clone(getOperand(arg)));
-+ setValue(&*argItr, m_pool.clone(getOperand(arg)));
- }
-
- return;
-@@ -1116,7 +1116,11 @@
-
- if (!m_position->callStack.empty())
- {
-+#if LLVM_VERSION < 38
- m_position->currInst = m_position->callStack.top();
-+#else
-+ m_position->currInst.reset(m_position->callStack.top());
-+#endif
- m_position->currBlock = m_position->currInst->getParent();
- m_position->callStack.pop();
-
-@@ -1124,7 +1128,7 @@
- const llvm::Value *returnVal = retInst->getReturnValue();
- if (returnVal)
- {
-- setValue(m_position->currInst, m_pool.clone(getOperand(returnVal)));
-+ setValue(&*m_position->currInst, m_pool.clone(getOperand(returnVal)));
- }
-
- // Clear stack allocations
-@@ -1365,7 +1369,7 @@
- llvm::Module::const_global_iterator G;
- for (G = module->global_begin(); G != module->global_end(); G++)
- {
-- addValueID(G);
-+ addValueID(&*G);
- }
-
-
-@@ -1385,7 +1389,7 @@
- llvm::Function::arg_iterator A;
- for (A = function->arg_begin(); A != function->arg_end(); A++)
- {
-- addValueID(A);
-+ addValueID(&*A);
- }
-
- // Iterate through instructions in function
---- a/src/core/common.cpp
-+++ b/src/core/common.cpp
-@@ -404,9 +404,10 @@
- }
- case llvm::Instruction::ICmp:
- case llvm::Instruction::FCmp:
-- return llvm::CmpInst::Create((llvm::Instruction::OtherOps)opcode,
-- expr->getPredicate(),
-- operands[0], operands[1]);
-+ return llvm::CmpInst::Create(
-+ (llvm::Instruction::OtherOps)opcode,
-+ (llvm::CmpInst::Predicate)expr->getPredicate(),
-+ operands[0], operands[1]);
- default:
- assert(expr->getNumOperands() == 2 && "Must be binary operator?");
-
---- a/src/core/Program.cpp
-+++ b/src/core/Program.cpp
-@@ -129,7 +129,11 @@
- args.push_back("-cl-std=CL1.2");
- args.push_back("-cl-kernel-arg-info");
- args.push_back("-fno-builtin");
-+#if LLVM_VERSION >= 38
-+ args.push_back("-debug-info-kind=standalone");
-+#else
- args.push_back("-g");
-+#endif
- args.push_back("-triple");
- if (sizeof(size_t) == 4)
- args.push_back("spir-unknown-unknown");
-@@ -502,19 +506,29 @@
- {
- llvm::Module *module = new llvm::Module("oclgrind_linked",
- llvm::getGlobalContext());
-+
-+#if LLVM_VERSION < 38
- llvm::Linker linker(module);
-+#else
-+ llvm::Linker linker(*module);
-+#endif
-
- // Link modules
- list<const Program*>::iterator itr;
- for (itr = programs.begin(); itr != programs.end(); itr++)
- {
-- if (linker.linkInModule(CloneModule((*itr)->m_module.get())))
-+#if LLVM_VERSION < 38
-+ llvm::Module *m = llvm::CloneModule((*itr)->m_module.get());
-+#else
-+ unique_ptr<llvm::Module> m = llvm::CloneModule((*itr)->m_module.get());
-+#endif
-+ if (linker.linkInModule(std::move(m)))
- {
- return NULL;
- }
- }
-
-- return new Program(context, linker.getModule());
-+ return new Program(context, module);
- }
-
- Kernel* Program::createKernel(const string name)
-@@ -719,7 +733,8 @@
- set<llvm::Instruction*> intrinsics;
- for (llvm::Module::iterator F = m_module->begin(); F != m_module->end(); F++)
- {
-- for (llvm::inst_iterator I = inst_begin(F), E = inst_end(F); I != E; I++)
-+ llvm::Function *f = &*F;
-+ for (llvm::inst_iterator I = inst_begin(f), E = inst_end(f); I != E; I++)
- {
- if (I->getOpcode() == llvm::Instruction::Call)
- {
---- a/src/plugins/InteractiveDebugger.cpp
-+++ b/src/plugins/InteractiveDebugger.cpp
-@@ -308,7 +308,7 @@
- cout << ", ";
- }
- cout << argItr->getName().str() << "=";
-- m_kernelInvocation->getCurrentWorkItem()->printValue(argItr);
-+ m_kernelInvocation->getCurrentWorkItem()->printValue(&*argItr);
- }
-
- cout << ") at line " << dec << getLineNumber(instruction) << endl;
diff --git a/debian/patches/no-validate-pch.patch b/debian/patches/no-validate-pch.patch
deleted file mode 100644
index 9e665c6..0000000
--- a/debian/patches/no-validate-pch.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix stale PCH issues
-Author: James Price <j.price at bristol.ac.uk>
-Origin: upstream commit:9ae9eaf
-Last-Update: 2016-10-06
---- a/src/core/Program.cpp
-+++ b/src/core/Program.cpp
-@@ -278,6 +278,7 @@
-
- args.push_back("-include-pch");
- args.push_back(pch);
-+ args.push_back("-fno-validate-pch");
- }
- else
- {
diff --git a/debian/patches/pch-location.patch b/debian/patches/pch-location.patch
index b7d5f7f..6f130e4 100644
--- a/debian/patches/pch-location.patch
+++ b/debian/patches/pch-location.patch
@@ -6,26 +6,26 @@ Last-Update: 2015-08-07
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@
project(Oclgrind)
- set(Oclgrind_VERSION_MAJOR 15)
- set(Oclgrind_VERSION_MINOR 5)
+ set(Oclgrind_VERSION_MAJOR 16)
+ set(Oclgrind_VERSION_MINOR 10)
+set(Oclgrind_VERSION "${Oclgrind_VERSION_MAJOR}.${Oclgrind_VERSION_MINOR}")
include(CheckIncludeFiles)
- include(CheckLibraryExists)
-@@ -245,8 +246,8 @@
+ include(CheckIncludeFileCXX)
+@@ -319,8 +320,9 @@
oclgrind oclgrind-rt oclgrind-rt-icd
- DESTINATION lib)
+ DESTINATION "lib${LIBDIR_SUFFIX}")
install(FILES
-- ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h ${CLC_HEADERS}
-- DESTINATION include/oclgrind)
-+ ${CORE_HEADERS} ${CMAKE_BINARY_DIR}/config.h DESTINATION include/oclgrind)
+- ${CORE_HEADERS} ${CLC_HEADERS}
++ ${CORE_HEADERS}
+ DESTINATION include/oclgrind)
+install(FILES ${CLC_HEADERS} DESTINATION lib/oclgrind/${Oclgrind_VERSION})
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
install(FILES
src/CL/cl.h
--- a/src/core/Program.cpp
+++ b/src/core/Program.cpp
-@@ -235,11 +235,11 @@
+@@ -254,11 +254,11 @@
if ((dirend = strrchr(libpath, '/')))
#endif
{
diff --git a/debian/patches/private-library-location.patch b/debian/patches/private-library-location.patch
index 127a945..a321f92 100644
--- a/debian/patches/private-library-location.patch
+++ b/debian/patches/private-library-location.patch
@@ -1,14 +1,14 @@
Description: Update to reflect private lib location
Author: James Price <j.price at bristol.ac.uk>
Last-Update: 2015-08-07
---- a/src/runtime/oclgrind
-+++ b/src/runtime/oclgrind
-@@ -133,7 +133,7 @@
- fi
+--- a/src/runtime/oclgrind.cpp
++++ b/src/runtime/oclgrind.cpp
+@@ -391,7 +391,7 @@
+ }
- # Inject liboclgrind.{so,dylib} and run command
--LIBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../lib"
-+LIBDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../lib/oclgrind"
- if [ "$(uname -s)" == "Darwin" ]
- then
- DYLD_LIBRARY_PATH=$LIBDIR:$DYLD_LIBRARY_PATH \
+ // Append library directory
+- libdir += "/lib" LIBDIR_SUFFIX;
++ libdir += "/lib" LIBDIR_SUFFIX "/oclgrind";
+
+ return libdir;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 097fbc9..74fb111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,5 @@
-typos.patch
private-library-location.patch
-do-not-install-license.patch
-fix-llvm37.patch
library-versions.patch
pch-location.patch
-clang-library-order.patch
-cmake-preserve-flags.patch
-i386-shift-width.patch
use-opencl-headers.patch
altivec-fix.patch
-use-std.patch
-big-endian.patch
-llvm-3.8.patch
-no-validate-pch.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
deleted file mode 100644
index c583fa8..0000000
--- a/debian/patches/typos.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fixed seperated->separated typo in help messages
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-08-11
---- a/src/kernel/oclgrind-kernel.cpp
-+++ b/src/kernel/oclgrind-kernel.cpp
-@@ -210,7 +210,7 @@
- << " --pch-dir DIR "
- "Override directory containing precompiled headers" << endl
- << " --plugins PLUGINS "
-- "Load colon seperated list of plugin libraries" << endl
-+ "Load colon separated list of plugin libraries" << endl
- << " -q --quick "
- "Only run first and last work-group" << endl
- << " --uniform-writes "
---- a/src/runtime/oclgrind
-+++ b/src/runtime/oclgrind
-@@ -39,7 +39,7 @@
- echo -n " --pch-dir DIR "
- echo "Override directory containing precompiled headers"
- echo -n " --plugins PLUGINS "
-- echo "Load colon seperated list of plugin libraries"
-+ echo "Load colon separated list of plugin libraries"
- echo -n " -q --quick "
- echo "Only run first and last work-group"
- echo -n " --uniform-writes "
diff --git a/debian/patches/use-opencl-headers.patch b/debian/patches/use-opencl-headers.patch
index 3857790..fab45ae 100644
--- a/debian/patches/use-opencl-headers.patch
+++ b/debian/patches/use-opencl-headers.patch
@@ -3,7 +3,7 @@ Description: Don't use local copy of CL/ headers
Last-Update: 2015-12-08
--- a/src/core/WorkItemBuiltins.cpp
+++ b/src/core/WorkItemBuiltins.cpp
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
#include "llvm/IR/DebugInfoMetadata.h"
#endif
@@ -14,10 +14,10 @@ Last-Update: 2015-12-08
#include "KernelInvocation.h"
--- a/src/core/common.h
+++ b/src/core/common.h
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
+ #ifndef __common_h_
#define __common_h_
- #include "config.h"
-#include "CL/cl.h"
+#include <CL/cl.h>
#include <cassert>
@@ -49,10 +49,10 @@ Last-Update: 2015-12-08
#endif
namespace oclgrind
---- a/tests/apps/vecadd/vecadd.c
-+++ b/tests/apps/vecadd/vecadd.c
+--- a/tests/common/common.h
++++ b/tests/common/common.h
@@ -1,3 +1,4 @@
+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
#include <CL/cl.h>
- #include <math.h>
- #include <stdio.h>
+
+ typedef struct
diff --git a/debian/patches/use-std.patch b/debian/patches/use-std.patch
deleted file mode 100644
index d2bb6c5..0000000
--- a/debian/patches/use-std.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Take isnan/isinf from std:: instead of global namespace
-Author: James Price <j.price at bristol.ac.uk>
-Origin: upstream commit:038589b
-Last-Update: 2016-03-25
---- a/src/core/WorkItem.cpp
-+++ b/src/core/WorkItem.cpp
-@@ -793,7 +793,7 @@
- }
-
- // Deal with NaN operands
-- if (::isnan(a) || ::isnan(b))
-+ if (std::isnan(a) || std::isnan(b))
- {
- r = !llvm::CmpInst::isOrdered(pred);
- }
---- a/src/core/WorkItemBuiltins.cpp
-+++ b/src/core/WorkItemBuiltins.cpp
-@@ -450,7 +450,7 @@
-
- static double _sign_(double x)
- {
-- if (::isnan(x)) return 0.0;
-+ if (std::isnan(x)) return 0.0;
- if (x > 0.0) return 1.0;
- if (x == -0.0) return -0.0;
- if (x == 0.0) return 0.0;
-@@ -2359,7 +2359,7 @@
- {
- double x = FARGV(0, i);
- double integral = trunc(x);
-- double fractional = copysign(::isinf(x) ? 0.0 : x - integral, x);
-+ double fractional = copysign(std::isinf(x) ? 0.0 : x - integral, x);
-
- size_t offset = i*result.size;
- result.setFloat(integral, i);
-@@ -2488,8 +2488,8 @@
- static int64_t _isle_(double x, double y){ return islessequal(x, y); }
- static int64_t _islg_(double x, double y){ return islessgreater(x, y); }
- static int64_t _isfin_(double x){ return isfinite(x); }
-- static int64_t _isinf_(double x){ return ::isinf(x); }
-- static int64_t _isnan_(double x){ return ::isnan(x); }
-+ static int64_t _isinf_(double x){ return std::isinf(x); }
-+ static int64_t _isnan_(double x){ return std::isnan(x); }
- static int64_t _isnorm_(double x){ return isnormal(x); }
- static int64_t _isord_(double x, double y){ return !isunordered(x, y); }
- static int64_t _isuord_(double x, double y){ return isunordered(x, y); }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git
More information about the Pkg-opencl-commits
mailing list