summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-09-19 15:31:38 +0200
committerLW-archlinux2019-09-19 15:31:38 +0200
commit5473ba77709e9587758b848d311406e67a751e2c (patch)
tree5ddd1c3226446564eaf066b1024d4222cf71abc1
parent65cebdfc333733d4cb0c7067b0116646f3aeee2e (diff)
downloadaur-5473ba77709e9587758b848d311406e67a751e2c.tar.gz
patch for building with gcc9 removed since it is now in master
-rw-r--r--.SRCINFO41
-rw-r--r--PKGBUILD18
-rw-r--r--always-initialize-all-members-in-ABIArgInfo.patch27
3 files changed, 31 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 69b08773bce..fc16cbfed9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = llvm-git
- pkgver = 10.0.0_r325028.b43923da5bb
+ pkgver = 10.0.0_r327286.eb231d15825
pkgrel = 1
url = https://llvm.org/
arch = x86_64
@@ -22,32 +22,33 @@ pkgbase = llvm-git
source = llvm-project::git+https://github.com/llvm/llvm-project.git
source = llvm-config.h
source = enable-SSP-and-PIE-by-default.patch
- source = always-initialize-all-members-in-ABIArgInfo.patch
- sha256sums = SKIP
- sha256sums = 597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48
- sha256sums = 58f86da25eb230ed6d423b5b61870cbf3bef88f38103ca676a2c7f34b2372171
- sha256sums = 355553ff360002000d57fc00cd5c753a261c85aafbb9c8b328bef7b8b5a403c1
+ md5sums = SKIP
+ md5sums = 295c343dcd457dc534662f011d7cff1a
+ md5sums = 5e9b3822e6b7de45f0ecb0ad71b3f7d3
+ sha512sums = SKIP
+ sha512sums = 75e743dea28b280943b3cc7f8bbb871b57d110a7f2b9da2e6845c1c36bf170dd883fca54e463f5f49e0c3effe07fbd0db0f8cf5a12a2469d3f792af21a73fcdd
+ sha512sums = 2fdbae0b62d33411beaf191920ff280f83fa80fd505a71077671027f27ed8c61c5867de3e6ee6f26734c7605037e86796404212182f8ffa71f4af6ed2c316a40
pkgname = llvm-git
pkgdesc = LLVM development version. includes clang and many other tools
- depends = llvm-libs-git=10.0.0_r325028.b43923da5bb-1
+ depends = llvm-libs-git=10.0.0_r327286.eb231d15825-1
depends = perl
optdepends = python: for scripts
optdepends = python-setuptools: for using lit (LLVM Integrated Tester)
optdepends = ocaml: for ocaml support
provides = aur-llvm-git
- provides = compiler-rt-git=10.0.0_r325028.b43923da5bb-1
- provides = clang-git=10.0.0_r325028.b43923da5bb-1
- provides = lld-git=10.0.0_r325028.b43923da5bb-1
- provides = lldb-git=10.0.0_r325028.b43923da5bb-1
- provides = polly-git=10.0.0_r325028.b43923da5bb-1
- provides = llvm-ocaml-git=10.0.0_r325028.b43923da5bb-1
- provides = compiler-rt=10.0.0_r325028.b43923da5bb-1
- provides = clang=10.0.0_r325028.b43923da5bb-1
- provides = lld=10.0.0_r325028.b43923da5bb-1
- provides = lldb=10.0.0_r325028.b43923da5bb-1
- provides = polly=10.0.0_r325028.b43923da5bb-1
- provides = llvm-ocaml=10.0.0_r325028.b43923da5bb-1
+ provides = compiler-rt-git=10.0.0_r327286.eb231d15825-1
+ provides = clang-git=10.0.0_r327286.eb231d15825-1
+ provides = lld-git=10.0.0_r327286.eb231d15825-1
+ provides = lldb-git=10.0.0_r327286.eb231d15825-1
+ provides = polly-git=10.0.0_r327286.eb231d15825-1
+ provides = llvm-ocaml-git=10.0.0_r327286.eb231d15825-1
+ provides = compiler-rt=10.0.0_r327286.eb231d15825-1
+ provides = clang=10.0.0_r327286.eb231d15825-1
+ provides = lld=10.0.0_r327286.eb231d15825-1
+ provides = lldb=10.0.0_r327286.eb231d15825-1
+ provides = polly=10.0.0_r327286.eb231d15825-1
+ provides = llvm-ocaml=10.0.0_r327286.eb231d15825-1
conflicts = llvm
conflicts = compiler-rt
conflicts = clang
@@ -65,6 +66,6 @@ pkgname = llvm-libs-git
depends = ncurses
depends = libxml2
provides = aur-llvm-libs-git
- provides = llvm-libs=10.0.0_r325028.b43923da5bb-1
+ provides = llvm-libs=10.0.0_r327286.eb231d15825-1
conflicts = llvm-libs
diff --git a/PKGBUILD b/PKGBUILD
index e0e61717a31..8dc97486b7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgname=('llvm-git' 'llvm-libs-git')
-pkgver=10.0.0_r325028.b43923da5bb
+pkgver=10.0.0_r327286.eb231d15825
pkgrel=1
arch=('x86_64')
url="https://llvm.org/"
@@ -26,12 +26,14 @@ makedepends=( 'git' 'cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' 'py
source=("llvm-project::git+https://github.com/llvm/llvm-project.git"
'llvm-config.h'
- 'enable-SSP-and-PIE-by-default.patch'
- 'always-initialize-all-members-in-ABIArgInfo.patch')
-sha256sums=('SKIP'
- '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
- '58f86da25eb230ed6d423b5b61870cbf3bef88f38103ca676a2c7f34b2372171'
- '355553ff360002000d57fc00cd5c753a261c85aafbb9c8b328bef7b8b5a403c1')
+ 'enable-SSP-and-PIE-by-default.patch')
+
+md5sums=('SKIP'
+ '295c343dcd457dc534662f011d7cff1a'
+ '5e9b3822e6b7de45f0ecb0ad71b3f7d3')
+sha512sums=('SKIP'
+ '75e743dea28b280943b3cc7f8bbb871b57d110a7f2b9da2e6845c1c36bf170dd883fca54e463f5f49e0c3effe07fbd0db0f8cf5a12a2469d3f792af21a73fcdd'
+ '2fdbae0b62d33411beaf191920ff280f83fa80fd505a71077671027f27ed8c61c5867de3e6ee6f26734c7605037e86796404212182f8ffa71f4af6ed2c316a40')
# NINJAFLAGS is an env var used to pass commandline options to ninja
# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
@@ -70,7 +72,7 @@ prepare() {
# GCC 7; however, we need it to pass the test suite when building with GCC 9
# https://bugs.llvm.org/show_bug.cgi?id=40547
# manually adapted to apply cleanly with latest master
- patch --forward --strip=1 --input="$srcdir"/always-initialize-all-members-in-ABIArgInfo.patch
+# patch --forward --strip=1 --input="$srcdir"/always-initialize-all-members-in-ABIArgInfo.patch
cd clang
patch --forward --strip=1 --input="$srcdir"/enable-SSP-and-PIE-by-default.patch
diff --git a/always-initialize-all-members-in-ABIArgInfo.patch b/always-initialize-all-members-in-ABIArgInfo.patch
deleted file mode 100644
index bcad2e978e5..00000000000
--- a/always-initialize-all-members-in-ABIArgInfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --unified --recursive --text llvm-project.orig/clang/include/clang/CodeGen/CGFunctionInfo.h llvm-project.new/clang/include/clang/CodeGen/CGFunctionInfo.h
---- llvm-project.orig/clang/include/clang/CodeGen/CGFunctionInfo.h 2019-08-15 21:40:05.816836459 +0200
-+++ llvm-project.new/clang/include/clang/CodeGen/CGFunctionInfo.h 2019-08-15 21:46:13.650020726 +0200
-@@ -110,14 +110,16 @@
- }
-
- ABIArgInfo(Kind K)
-- : TheKind(K), PaddingInReg(false), InReg(false) {
-- }
--
--public:
-- ABIArgInfo()
-- : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
-- TheKind(Direct), PaddingInReg(false), InReg(false) {}
-+ : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), TheKind(K),
-+ PaddingInReg(false), InAllocaSRet(false), IndirectByVal(false),
-+ IndirectRealign(false), SRetAfterThis(false), InReg(false),
-+ CanBeFlattened(false), SignExt(false) {}
-
-+public:
-+ ABIArgInfo()
-+ : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
-+ TheKind(Direct), PaddingInReg(false), InReg(false) {}
-+
- static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0,
- llvm::Type *Padding = nullptr,
- bool CanBeFlattened = true) {