[aomp-amdgpu] New upstream release 11.9-0 (#423)

5 files changed, 37 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7d7f2d47ab1..c356be0dfeea 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.8.0
+	pkgver = 11.9.0
 	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/aomp
 	arch = x86_64
@@ -28,14 +28,12 @@ pkgbase = aomp-amdgpu
 	depends = mpfr
 	depends = source-highlight
 	depends = babeltrace
-	source = aomp-amdgpu-11.8.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.8-0.tar.gz
+	source = aomp-amdgpu-11.9.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.9-0.tar.gz
 	source = disable_ocl_tests.patch
-	source = adjust_rpath.patch
 	source = remove_gcc_logic.patch
-	sha256sums = a708c02ab6acd0cd7a56cb7cf684a53ebe5f63a7e17fe2a1cf878343259a59b3
-	sha256sums = bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170
-	sha256sums = 94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44
-	sha256sums = d1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722
+	sha256sums = ee404f80120a1339bd7fde0557e510f6e9b1f5633d8bfeb895085ce2fa75bf53
+	sha256sums = 10450211c4ee15a39d3ce9d85403b11174430b17bafd229019cf5ed5840a8b7a
+	sha256sums = 3498568b9f34aebe9e0d32acf07d8d0d14124500a5a4347ed70c41f9848eaaf3
 
 pkgname = aomp-amdgpu
 
diff --git a/PKGBUILD b/PKGBUILD
index 37ac71ffe70d..ac60d0f05569 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.8-0
-pkgver=11.8.0
+_pkgver=11.9-0
+pkgver=11.9.0
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/aomp'
@@ -15,12 +15,10 @@ makedepends=(git cmake
     mesa texinfo)
 source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rel_$_pkgver.tar.gz"
         'disable_ocl_tests.patch'
-        'adjust_rpath.patch'
         'remove_gcc_logic.patch')
-sha256sums=('a708c02ab6acd0cd7a56cb7cf684a53ebe5f63a7e17fe2a1cf878343259a59b3'
-            'bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170'
-            '94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44'
-            'd1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722')
+sha256sums=('ee404f80120a1339bd7fde0557e510f6e9b1f5633d8bfeb895085ce2fa75bf53'
+            '10450211c4ee15a39d3ce9d85403b11174430b17bafd229019cf5ed5840a8b7a'
+            '3498568b9f34aebe9e0d32acf07d8d0d14124500a5a4347ed70c41f9848eaaf3')
 _dirname="$(basename "$url")-$(basename ${source[0]} .tar.gz)"
 
 prepare() {
@@ -34,7 +32,6 @@ prepare() {
     patch -Np1 -i "$srcdir/disable_ocl_tests.patch"
 
     cd "$srcdir/aomp"
-    patch -Np1 -i "$srcdir/adjust_rpath.patch"
     patch -p1  -i "$srcdir/remove_gcc_logic.patch"
 }
 
diff --git a/adjust_rpath.patch b/adjust_rpath.patch
deleted file mode 100644
index 8431f713edf0..000000000000
--- a/adjust_rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** aomp/bin/aomp_common_vars.bak	2020-07-04 10:03:07.970529403 +0200
---- aomp/bin/aomp_common_vars	2020-07-04 10:03:39.017229414 +0200
-***************
-*** 43,49 ****
-  AOMP_APPLY_ROCM_PATCHES=${AOMP_APPLY_ROCM_PATCHES:-1}
-  
-  #Set common rpath for build scripts
-! AOMP_ORIGIN_RPATH_NO_DTAGS="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_RPATH=\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/../hsa/lib:\$ORIGIN/../../lib64:\$ORIGIN/../../hsa/lib:$AOMP_INSTALL_DIR/lib:$AOMP_INSTALL_DIR/hsa/lib"
-  AOMP_ORIGIN_RPATH="-DCMAKE_SHARED_LINKER_FLAGS='-Wl,--disable-new-dtags' $AOMP_ORIGIN_RPATH_NO_DTAGS"
-  
-  CUDA=${CUDA:-/usr/local/cuda}
---- 43,49 ----
-  AOMP_APPLY_ROCM_PATCHES=${AOMP_APPLY_ROCM_PATCHES:-1}
-  
-  #Set common rpath for build scripts
-! AOMP_ORIGIN_RPATH_NO_DTAGS="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_RPATH=\$ORIGIN:\$ORIGIN/../lib:\$ORIGIN/../hsa/lib:\$ORIGIN/../../lib64:\$ORIGIN/../../hsa/lib:/opt/rocm/aomp/lib:/opt/rocm/aomp/hsa/lib"
-  AOMP_ORIGIN_RPATH="-DCMAKE_SHARED_LINKER_FLAGS='-Wl,--disable-new-dtags' $AOMP_ORIGIN_RPATH_NO_DTAGS"
-  
-  CUDA=${CUDA:-/usr/local/cuda}
diff --git a/disable_ocl_tests.patch b/disable_ocl_tests.patch
index 854bd4ce8ab8..c8f7559b6c3d 100644
--- a/disable_ocl_tests.patch
+++ b/disable_ocl_tests.patch
@@ -1,5 +1,5 @@
-*** opencl-on-vdi/khronos/icd/CMakeLists.txt.bak	2020-07-04 09:58:27.756892980 +0200
---- opencl-on-vdi/khronos/icd/CMakeLists.txt	2020-07-04 09:58:43.310243549 +0200
+*** opencl-on-vdi/khronos/icd/CMakeLists.txt.bak	2020-09-18 13:38:14.648707090 +0200
+--- opencl-on-vdi/khronos/icd/CMakeLists.txt	2020-09-18 13:38:24.378418746 +0200
 ***************
 *** 127,137 ****
   target_include_directories (OpenCL PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
diff --git a/remove_gcc_logic.patch b/remove_gcc_logic.patch
index e8da183b0fbf..cb65b4c71393 100644
--- a/remove_gcc_logic.patch
+++ b/remove_gcc_logic.patch
@@ -1,11 +1,11 @@
-*** aomp/bin/build_openmp.sh.bak	2020-07-11 16:55:42.995876206 +0200
---- aomp/bin/build_openmp.sh	2020-07-11 16:56:14.952367513 +0200
+*** 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
 ***************
-*** 73,106 ****
+*** 73,117 ****
      $SUDO rm $INSTALL_OPENMP/testfile
   fi
   
-! GCCMIN=7
+! GCCMIN=8
 ! 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 getgcc7orless(){
+! function getgcc8orless(){
 !    _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 getgxx7orless(){
+! function getgxx8orless(){
 !    _loc=`which g++`
 !    [ "$_loc" == "" ] && return
 !    gxxver=`$_loc --version | grep g++ | cut -d")" -f2 | cut -d"." -f1`
@@ -31,17 +31,28 @@
 !    echo $_loc
 ! }
 ! 
-! GCCLOC=$(getgcc7orless)
-! GXXLOC=$(getgxx7orless)
-  if [ "$GCCLOC" == "" ] ; then
-     echo "ERROR: NO ADEQUATE gcc"
-     echo "       Please install gcc-5 or gcc-7"
+! 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
 --- 73,80 ----
      $SUDO rm $INSTALL_OPENMP/testfile
   fi
   
 ! GCCLOC=/usr/bin/gcc
 ! GXXLOC=/usr/bin/g++
-  if [ "$GCCLOC" == "" ] ; then
-     echo "ERROR: NO ADEQUATE gcc"
-     echo "       Please install gcc-5 or gcc-7"
+  export LLVM_DIR=$AOMP_INSTALL_DIR
+  GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' `
+  COMMON_CMAKE_OPTS="-DOPENMP_ENABLE_LIBOMPTARGET=1