[aomp-amdgpu] Update to 11.11.0

3 files changed, 22 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c356be0dfeea..d5db33652335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aomp-amdgpu
 	pkgdesc = Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs
-	pkgver = 11.9.0
+	pkgver = 11.11.0
 	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/aomp
 	arch = x86_64
@@ -28,12 +28,12 @@ pkgbase = aomp-amdgpu
 	depends = mpfr
 	depends = source-highlight
 	depends = babeltrace
-	source = aomp-amdgpu-11.9.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.9-0.tar.gz
+	source = aomp-amdgpu-11.11.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.11-0.tar.gz
 	source = disable_ocl_tests.patch
 	source = remove_gcc_logic.patch
-	sha256sums = ee404f80120a1339bd7fde0557e510f6e9b1f5633d8bfeb895085ce2fa75bf53
+	sha256sums = 7d9cea6b8944f110dfdb307fdd7e11809168a5a8f6502ffbd8dbf1e711e20707
 	sha256sums = 10450211c4ee15a39d3ce9d85403b11174430b17bafd229019cf5ed5840a8b7a
-	sha256sums = 3498568b9f34aebe9e0d32acf07d8d0d14124500a5a4347ed70c41f9848eaaf3
+	sha256sums = 5cf8144d9f3e42feecdb12aaef013921fed5e4e61b4bf8e3c1960dced26d13ae
 
 pkgname = aomp-amdgpu
 
diff --git a/PKGBUILD b/PKGBUILD
index ac60d0f05569..622f7eb88852 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=aomp-amdgpu
 pkgdesc='Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs'
-_pkgver=11.9-0
-pkgver=11.9.0
+_pkgver=11.11-0
+pkgver=11.11.0
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/aomp'
@@ -16,9 +16,9 @@ makedepends=(git cmake
 source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rel_$_pkgver.tar.gz"
         'disable_ocl_tests.patch'
         'remove_gcc_logic.patch')
-sha256sums=('ee404f80120a1339bd7fde0557e510f6e9b1f5633d8bfeb895085ce2fa75bf53'
+sha256sums=('7d9cea6b8944f110dfdb307fdd7e11809168a5a8f6502ffbd8dbf1e711e20707'
             '10450211c4ee15a39d3ce9d85403b11174430b17bafd229019cf5ed5840a8b7a'
-            '3498568b9f34aebe9e0d32acf07d8d0d14124500a5a4347ed70c41f9848eaaf3')
+            '5cf8144d9f3e42feecdb12aaef013921fed5e4e61b4bf8e3c1960dced26d13ae')
 _dirname="$(basename "$url")-$(basename ${source[0]} .tar.gz)"
 
 prepare() {
diff --git a/remove_gcc_logic.patch b/remove_gcc_logic.patch
index cb65b4c71393..63f58046ec5c 100644
--- a/remove_gcc_logic.patch
+++ b/remove_gcc_logic.patch
@@ -1,11 +1,11 @@
-*** aomp/bin/build_openmp.sh.bak	2020-09-17 17:07:31.393892767 +0200
---- aomp/bin/build_openmp.sh	2020-09-17 17:08:19.766760059 +0200
+*** aomp/bin/build_openmp.sh.bak	2020-11-01 12:16:24.042929154 +0100
+--- aomp/bin/build_openmp.sh	2020-11-01 12:16:54.366096090 +0100
 ***************
-*** 73,117 ****
+*** 73,106 ****
      $SUDO rm $INSTALL_OPENMP/testfile
   fi
   
-! GCCMIN=8
+! GCCMIN=9
 ! if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
 !    if [ -f $CUDABIN/nvcc ] ; then
 !       CUDAVER=`$CUDABIN/nvcc --version | grep compilation | cut -d" " -f5 | cut -d"." -f1 `
@@ -16,14 +16,14 @@
 !    fi
 ! fi
 ! 
-! function getgcc8orless(){
+! function getgcc9orless(){
 !    _loc=`which gcc`
 !    [ "$_loc" == "" ] && return
 !    gccver=`$_loc --version | grep gcc | cut -d")" -f2 | cut -d"." -f1`
 !    [ $gccver -gt $GCCMIN ] && _loc=`which gcc-$GCCMIN`
 !    echo $_loc
 ! }
-! function getgxx8orless(){
+! function getgxx9orless(){
 !    _loc=`which g++`
 !    [ "$_loc" == "" ] && return
 !    gxxver=`$_loc --version | grep g++ | cut -d")" -f2 | cut -d"." -f1`
@@ -31,28 +31,17 @@
 !    echo $_loc
 ! }
 ! 
-! GCCLOC=$(getgcc8orless)
-! GXXLOC=$(getgxx8orless)
-! if [ "$GCCLOC" == "" ] ; then
-!    echo "ERROR: NO ADEQUATE gcc"
-!    echo "       Please install gcc-5, gcc-7, or gcc-8"
-!    exit 1
-! fi
-! if [ "$GXXLOC" == "" ] ; then
-!    echo "ERROR: NO ADEQUATE g++"
-!    echo "       Please install g++-5, g++-7, or g++-8"
-!    exit 1
-! fi
-! 
-  export LLVM_DIR=$AOMP_INSTALL_DIR
-  GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' `
-  COMMON_CMAKE_OPTS="-DOPENMP_ENABLE_LIBOMPTARGET=1
+! GCCLOC=$(getgcc9orless)
+! GXXLOC=$(getgxx9orless)
+  if [ "$GCCLOC" == "" ] ; then
+     echo "ERROR: NO ADEQUATE gcc"
+     echo "       Please install gcc-5, gcc-7, gcc-8 or gcc-9"
 --- 73,80 ----
      $SUDO rm $INSTALL_OPENMP/testfile
   fi
   
 ! GCCLOC=/usr/bin/gcc
 ! GXXLOC=/usr/bin/g++
-  export LLVM_DIR=$AOMP_INSTALL_DIR
-  GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' `
-  COMMON_CMAKE_OPTS="-DOPENMP_ENABLE_LIBOMPTARGET=1
+  if [ "$GCCLOC" == "" ] ; then
+     echo "ERROR: NO ADEQUATE gcc"
+     echo "       Please install gcc-5, gcc-7, gcc-8 or gcc-9"