Skip to content

Commit 2cd090a

Browse files
authored
[compiler-rt] Fix amdgcn -> amdgpu conversion for compiler-rt (#209765)
Summary: We are apparently transitioning to using `amdgpu` everywhere, so these need to be updated.
1 parent 4b415b1 commit 2cd090a

5 files changed

Lines changed: 5 additions & 4 deletions

File tree

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(ALPHA alpha)
2-
set(AMDGPU amdgcn)
2+
set(AMDGPU amdgcn amdgpu)
33
set(ARM64 aarch64)
44
set(ARM32 arm armhf)
55
set(HEXAGON hexagon)

compiler-rt/cmake/Modules/CompilerRTUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ macro(detect_target_arch)
170170
check_symbol_exists(__wasm64__ "" __WEBASSEMBLY64)
171171
check_symbol_exists(__ve__ "" __VE)
172172
if(__AMDGPU)
173-
add_default_target_arch(amdgcn)
173+
add_default_target_arch(amdgpu)
174174
elseif(__ARM)
175175
add_default_target_arch(arm)
176176
elseif(__AVR)

compiler-rt/cmake/base-config-ix.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ macro(test_targets)
250250
endif()
251251
endif()
252252
elseif(COMPILER_RT_TARGET_AMDGPU)
253-
test_target_arch(amdgcn "" "--target=amdgcn-amd-amdhsa" "-nogpulib"
253+
test_target_arch(amdgpu "" "--target=amdgpu-amd-amdhsa" "-nogpulib"
254254
"-flto" "-Xclang -mcode-object-version=none")
255255
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "hexagon")
256256
test_target_arch(hexagon "" "")

compiler-rt/cmake/builtin-config-ix.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ else()
7777
set(OS_NAME "${CMAKE_SYSTEM_NAME}")
7878
endif()
7979

80-
set(AMDGPU amdgcn)
80+
set(AMDGPU amdgcn amdgpu)
8181
set(ARM64 aarch64 arm64ec aarch64_lfi)
8282
set(ARM32 arm armhf armv4t armv5te armv6 armv6m armv7m armv7em armv7 armv7s armv7k armv8m.base armv8m.main armv8.1m.main)
8383
set(AVR avr)

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ if (APPLE)
832832
endif()
833833

834834
set(amdgcn_SOURCES ${GENERIC_SOURCES})
835+
set(amdgpu_SOURCES ${GENERIC_SOURCES})
835836

836837
set(armv4t_SOURCES ${arm_min_SOURCES})
837838
set(armv5te_SOURCES ${arm_min_SOURCES})

0 commit comments

Comments
 (0)