Skip to content

merge aomp-dev into amd-staging #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronlieb merged 3 commits into from
Feb 28, 2026
+5 −5
Merged

merge aomp-dev into amd-staging #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8c6d41
[aomp] Add SPIRV to LLVM_TARGETS_TO_BUILD (#2010)
dpalermo Feb 27, 2026
29f9a4f
add -lm to clang-358841 Makefile (#2011)
ronlieb Feb 28, 2026
19eb153
merge aomp-dev into amd-staging
z1-cciauto Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/build_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ else
COMPILERS=(-DCMAKE_C_COMPILER="$AOMP_CC_COMPILER"
-DCMAKE_CXX_COMPILER="$AOMP_CXX_COMPILER")
if [ "$AOMP_PROC" == "aarch64" ] ; then
TARGETS_TO_BUILD="AMDGPU;${AOMP_NVPTX_TARGET}AArch64"
TARGETS_TO_BUILD="AMDGPU;${AOMP_NVPTX_TARGET}AArch64;SPIRV"
_qmathopt=()
else
TARGETS_TO_BUILD="AMDGPU;${AOMP_NVPTX_TARGET}X86"
TARGETS_TO_BUILD="AMDGPU;${AOMP_NVPTX_TARGET}X86;SPIRV"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion test/smoke/clang-358841/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TESTSRC_MAIN = clang-358841.c
TESTSRC_AUX =
TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX)

CLANG = clang
CLANG = clang -lm

OMP_BIN = $(AOMP)/bin/$(CLANG)
CC = $(OMP_BIN) $(VERBOSE)
Expand Down
4 changes: 2 additions & 2 deletions trunk/build_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ else
fi
if [ "$TRUNK_BUILD_CUDA" == 0 ] ; then
_cuda_plugin="-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
_targets_to_build="-DLLVM_TARGETS_TO_BUILD='X86;AMDGPU'"
_targets_to_build="-DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;SPIRV'"
_plugins_to_build="-DLIBOMPTARGET_PLUGINS_TO_BUILD='amdgpu;host'"
AOMP_NVPTX_CAPS_OPT=""
else
_cuda_plugin="-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=ON"
_targets_to_build="-DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;NVPTX'"
_targets_to_build="-DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;NVPTX;SPIRV'"
_plugins_to_build="-DLIBOMPTARGET_PLUGINS_TO_BUILD='amdgpu;cuda;host'"
fi

Expand Down
Loading