Date: Thursday, February 7, 2019 @ 15:09:39 Author: archange Revision: 430076
upgpkg: ispc 1.10.0-1 Modified: ispc/trunk/0001-Remove-uses-of-LLVM-dump-functions.patch ispc/trunk/Makefile.patch ispc/trunk/PKGBUILD -----------------------------------------------+ 0001-Remove-uses-of-LLVM-dump-functions.patch | 40 +++++++----------------- Makefile.patch | 30 +++++++++--------- PKGBUILD | 30 +++--------------- 3 files changed, 34 insertions(+), 66 deletions(-) Modified: 0001-Remove-uses-of-LLVM-dump-functions.patch =================================================================== --- 0001-Remove-uses-of-LLVM-dump-functions.patch 2019-02-07 15:05:28 UTC (rev 430075) +++ 0001-Remove-uses-of-LLVM-dump-functions.patch 2019-02-07 15:09:39 UTC (rev 430076) @@ -1,18 +1,6 @@ -From 758e152a4832311818ea5b2bff0ac2e438b7a88a Mon Sep 17 00:00:00 2001 -From: Tom Stellard <[email protected]> -Date: Tue, 24 Oct 2017 09:45:53 -0700 -Subject: [PATCH] Remove uses of LLVM dump() functions - -These aren't exposed in release builds. ---- - llvmutil.cpp | 3 ++- - opt.cpp | 10 +++++----- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/llvmutil.cpp b/llvmutil.cpp -index 02bd729..b98b5f1 100644 ---- a/llvmutil.cpp -+++ b/llvmutil.cpp +diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp +--- a/src/llvmutil.cpp ++++ b/src/llvmutil.cpp @@ -45,6 +45,7 @@ #include <llvm/IR/Instructions.h> #include <llvm/IR/BasicBlock.h> @@ -21,7 +9,7 @@ #include <set> #include <map> -@@ -1516,7 +1517,7 @@ lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) { +@@ -1550,7 +1551,7 @@ lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) { return; fprintf(stderr, " "); @@ -30,11 +18,10 @@ done.insert(v); if (inst == NULL) -diff --git a/opt.cpp b/opt.cpp -index ef9e4c5..48106f4 100644 ---- a/opt.cpp -+++ b/opt.cpp -@@ -169,7 +169,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass(); +diff --git a/src/opt.cpp b/src/opt.cpp +--- a/src/opt.cpp ++++ b/src/opt.cpp +@@ -173,7 +173,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass(); strlen(getenv("FUNC"))))) { \ fprintf(stderr, "Start of " NAME "\n"); \ fprintf(stderr, "---------------\n"); \ @@ -43,7 +30,7 @@ fprintf(stderr, "---------------\n\n"); \ } else /* eat semicolon */ -@@ -180,7 +180,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass(); +@@ -184,7 +184,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass(); strlen(getenv("FUNC"))))) { \ fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ fprintf(stderr, "---------------\n"); \ @@ -52,7 +39,7 @@ fprintf(stderr, "---------------\n\n"); \ } else /* eat semicolon */ -@@ -533,7 +533,7 @@ void +@@ -537,7 +537,7 @@ void Optimize(llvm::Module *module, int optLevel) { if (g->debugPrint) { printf("*** Code going into optimization ***\n"); @@ -61,7 +48,7 @@ } DebugPassManager optPM; optPM.add(llvm::createVerifierPass(),0); -@@ -928,7 +928,7 @@ Optimize(llvm::Module *module, int optLevel) { +@@ -932,7 +932,7 @@ Optimize(llvm::Module *module, int optLevel) { if (g->debugPrint) { printf("\n*****\nFINAL OUTPUT\n*****\n"); @@ -70,7 +57,7 @@ } } -@@ -4859,7 +4859,7 @@ bool +@@ -4895,7 +4895,7 @@ bool DebugPass::runOnModule(llvm::Module &module) { fprintf(stderr, "%s", str_output); fflush(stderr); @@ -79,6 +66,3 @@ return true; } --- -1.8.3.1 - Modified: Makefile.patch =================================================================== --- Makefile.patch 2019-02-07 15:05:28 UTC (rev 430075) +++ Makefile.patch 2019-02-07 15:09:39 UTC (rev 430076) @@ -1,6 +1,6 @@ ---- a/Makefile 2017-11-10 15:07:30.000000000 -0800 -+++ b/Makefile 2018-03-02 22:43:18.144747339 -0800 -@@ -167,11 +167,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -175,11 +175,11 @@ $(LLVM_VERSION_DEF) \ -Wall \ -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_VERSION="\"$(BUILD_VERSION)\"" \ @@ -14,7 +14,7 @@ endif ifneq ($(ARM_ENABLED), 0) CXXFLAGS+=-DISPC_ARM_ENABLED -@@ -233,7 +233,7 @@ +@@ -240,7 +240,7 @@ depend: llvm_check $(CXX_SRC) $(HEADERS) @echo Updating dependencies @@ -23,9 +23,9 @@ -include depend -@@ -263,7 +263,7 @@ +@@ -273,7 +273,7 @@ - ispc: print_llvm_src dirs $(OBJS) + ispc: print_deprecation_msg print_llvm_src dirs $(OBJS) @echo Creating ispc executable - @$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS) + $(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS) @@ -32,19 +32,19 @@ # Use clang as a default compiler, instead of gcc # This is default now. -@@ -285,19 +285,19 @@ +@@ -295,77 +295,77 @@ - objs/%.o: %.cpp + objs/%.o: ${SRC_DIR}/%.cpp @echo Compiling $< - @$(CXX) $(CXXFLAGS) -o $@ -c $< + $(CXX) $(CXXFLAGS) -o $@ -c $< - objs/cbackend.o: cbackend.cpp + objs/cbackend.o: ${SRC_DIR}/cbackend.cpp @echo Compiling $< - @$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $< + $(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $< - objs/opt.o: opt.cpp + objs/opt.o: ${SRC_DIR}/opt.cpp @echo Compiling $< - @$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $< + $(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $< @@ -54,9 +54,10 @@ - @$(CXX) $(CXXFLAGS) -o $@ -c $< + $(CXX) $(CXXFLAGS) -o $@ -c $< - objs/parse.cc: parse.yy + objs/parse.cc: $(SRC_DIR)/parse.yy @echo Running bison on $< -@@ -305,7 +305,7 @@ +- @$(YACC) -o $@ $< ++ $(YACC) -o $@ $< objs/parse.o: objs/parse.cc $(HEADERS) @echo Compiling $< @@ -63,9 +64,10 @@ - @$(CXX) $(CXXFLAGS) -o $@ -c $< + $(CXX) $(CXXFLAGS) -o $@ -c $< - objs/lex.cpp: lex.ll + objs/lex.cpp: $(SRC_DIR)/lex.ll @echo Running flex on $< -@@ -313,49 +313,49 @@ +- @$(LEX) -o $@ $< ++ $(LEX) -o $@ $< objs/lex.o: objs/lex.cpp $(HEADERS) objs/parse.cc @echo Compiling $< Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-07 15:05:28 UTC (rev 430075) +++ PKGBUILD 2019-02-07 15:09:39 UTC (rev 430076) @@ -2,8 +2,8 @@ # Maintainer: Bruno Pagani <[email protected]> pkgname=ispc -pkgver=1.9.2 -pkgrel=5 +pkgver=1.10.0 +pkgrel=1 pkgdesc="A compiler for high-performance SIMD programming on the CPU" arch=('x86_64') url="https://ispc.github.io/"; @@ -12,33 +12,15 @@ makedepends=('llvm' 'python' 'lib32-glibc') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz"; '0001-Remove-uses-of-LLVM-dump-functions.patch' # Borrowed from Fedora - 'Makefile.patch' # Borrowed from Fedora - LLVM6-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1307.patch"; - LLVM6-2.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1315.patch"; - LLVM7-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1312.patch"; - LLVM7-2.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1316.patch"; - LLVM7-3.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1325.patch"; - LLVM7-4.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1330.patch";) -sha256sums=('76a14e22f05a52fb0b30142686a6cb144b0415b39be6c9fcd3f17ac23447f0b2' - 'aed52cba60197bd20b2aef12e93e2e640d3ef2596bf154fe4a6e0980cfe78cca' - '95fbfd84e0da1fca3fabbfbcab597a7756599ddc1539ac98e49b6e269f5bc538' - 'e0846b0b7793bec1522a87696330bfdbd5c6b976d2f77389f5fe93c9de92386d' - '205468666cf985dd0634103c00a727e942ab330bddd2520f0d89e98e662cc495' - 'ac02472507690def70643b96d01bf70a6dfab7e465351c6f4588696679f5fb61' - '3cb8a31ea5228972e2ecc3bd9c51d934fbd31f96babb93c2ef5d16e7f4e8aabd' - '0a8b878aa6e07c2cc561e9f60e9ecea274d1f77bf46a6413f151cdc0489a7ce2' - '39d2b606b4bfdd0c59ad384facc0d51894e6856439fe6fe4c2a09edaf4145f8b') + 'Makefile.patch') # Borrowed from Fedora +sha256sums=('0aa30e989f8d446b2680c9078d5c5db70634f40b9aa07db387aa35aa08dd0b81' + '2cd47ff285b2a16053ee6b10fb9e7042b1c4e33cc195f00ecb0127a16cb1f737' + 'c3bcbe52472973afa445989723f16f047cadda980b0adf11ba7ab4bf30e746f2') prepare() { cd ${pkgname}-${pkgver} patch -p1 -i ../0001-Remove-uses-of-LLVM-dump-functions.patch patch -p1 -i ../Makefile.patch - patch -p1 -i ../LLVM6-1.patch - patch -p1 -i ../LLVM6-2.patch - patch -p1 -i ../LLVM7-1.patch - patch -p1 -i ../LLVM7-2.patch - patch -p1 -i ../LLVM7-3.patch - patch -p1 -i ../LLVM7-4.patch } build() {
