switch development to AOMP 0.6-2.  This will be based off of llvm/clang/lld/openmp stable release_80.  We make no changes to lld so it uses the actual release_80 branch.  The other release_80_AOMP branches were created from upstream release_80
# Set the AOMP VERSION STRING.
# After a release, this is changed to the next release under development
AOMP_VERSION=${AOMP_VERSION:-"0.6"}
-AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"}
+AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"2"}
AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"}
export AOMP_VERSION_STRING
@@ -69,13 +69,13 @@ GITKHRONOS="https://github.com/KhronosGroup"
AOMP_REPO_NAME=${AOMP_REPO_NAME:-aomp}
AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-master}
AOMP_LLVM_REPO_NAME=${AOMP_LLVM_REPO_NAME:-llvm}
-AOMP_LLVM_REPO_BRANCH=${AOMP_LLVM_REPO_BRANCH:-AOMP-181213-061}
+AOMP_LLVM_REPO_BRANCH=${AOMP_LLVM_REPO_BRANCH:-release_80_AOMP}
AOMP_CLANG_REPO_NAME=${AOMP_CLANG_REPO_NAME:-clang}
-AOMP_CLANG_REPO_BRANCH=${AOMP_CLANG_REPO_BRANCH:-AOMP-181213-061}
+AOMP_CLANG_REPO_BRANCH=${AOMP_CLANG_REPO_BRANCH:-release_80_AOMP}
AOMP_LLD_REPO_NAME=${AOMP_LLD_REPO_NAME:-lld}
-AOMP_LLD_REPO_BRANCH=${AOMP_LLD_REPO_BRANCH:-AOMP-181213-061}
+AOMP_LLD_REPO_BRANCH=${AOMP_LLD_REPO_BRANCH:-release_80}
AOMP_OPENMP_REPO_NAME=${AOMP_OPENMP_REPO_NAME:-openmp}
-AOMP_OPENMP_REPO_BRANCH=${AOMP_OPENMP_REPO_BRANCH:-AOMP-181213-061}
+AOMP_OPENMP_REPO_BRANCH=${AOMP_OPENMP_REPO_BRANCH:-release_80_AOMP}
AOMP_LIBDEVICE_REPO_NAME=${AOMP_LIBDEVICE_REPO_NAME:-rocm-device-libs}
AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-AOMP-181210}
AOMP_OCLRUNTIME_REPO_NAME=${AOMP_OCLRUNTIME_REPO_NAME:-rocm-opencl-runtime}
