@@ -453,8 +453,6 @@ function(add_integration_test test_name)
453
453
add_executable (
454
454
${fq_build_target_name}
455
455
EXCLUDE_FROM_ALL
456
- # The NVIDIA 'nvlink' linker does not currently support static libraries.
457
- $<$<BOOL :${LIBC_TARGET_ARCHITECTURE_IS_NVPTX} >:${link_object_files} >
458
456
${INTEGRATION_TEST_SRCS}
459
457
${INTEGRATION_TEST_HDRS}
460
458
)
@@ -473,8 +471,6 @@ function(add_integration_test test_name)
473
471
"-Wl,-mllvm,-amdgpu-lower-global-ctor-dtor=0" -nostdlib -static
474
472
"-Wl,-mllvm,-amdhsa-code-object-version=${LIBC_GPU_CODE_OBJECT_VERSION} " )
475
473
elseif (LIBC_TARGET_ARCHITECTURE_IS_NVPTX)
476
- # We need to use the internal object versions for NVPTX.
477
- set (internal_suffix ".__internal__" )
478
474
target_link_options (${fq_build_target_name} PRIVATE
479
475
${LIBC_COMPILE_OPTIONS_DEFAULT} -Wno-multi-gpu
480
476
"-Wl,--suppress-stack-size-warning"
@@ -490,10 +486,9 @@ function(add_integration_test test_name)
490
486
endif ()
491
487
target_link_libraries (
492
488
${fq_build_target_name}
493
- # The NVIDIA 'nvlink' linker does not currently support static libraries.
494
- $<$<NOT :$<BOOL :${LIBC_TARGET_ARCHITECTURE_IS_NVPTX} >>:${fq_target_name} .__libc__>
495
- libc.startup.${LIBC_TARGET_OS} .crt1${internal_suffix}
496
- libc.test .IntegrationTest.test ${internal_suffix}
489
+ ${fq_target_name} .__libc__
490
+ libc.startup.${LIBC_TARGET_OS} .crt1
491
+ libc.test .IntegrationTest.test
497
492
)
498
493
add_dependencies (${fq_build_target_name}
499
494
libc.test .IntegrationTest.test
@@ -628,8 +623,6 @@ function(add_libc_hermetic test_name)
628
623
add_executable (
629
624
${fq_build_target_name}
630
625
EXCLUDE_FROM_ALL
631
- # The NVIDIA 'nvlink' linker does not currently support static libraries.
632
- $<$<BOOL :${LIBC_TARGET_ARCHITECTURE_IS_NVPTX} >:${link_object_files} >
633
626
${HERMETIC_TEST_SRCS}
634
627
${HERMETIC_TEST_HDRS}
635
628
)
@@ -656,13 +649,12 @@ function(add_libc_hermetic test_name)
656
649
657
650
if (LIBC_TARGET_ARCHITECTURE_IS_AMDGPU)
658
651
target_link_options (${fq_build_target_name} PRIVATE
659
- ${LIBC_COMPILE_OPTIONS_DEFAULT}
660
- -mcpu=${LIBC_GPU_TARGET_ARCHITECTURE} -flto -Wno-multi-gpu
652
+ ${LIBC_COMPILE_OPTIONS_DEFAULT} -Wno-multi-gpu
653
+ -mcpu=${LIBC_GPU_TARGET_ARCHITECTURE} -flto
654
+ "-Wl,-asdfasdfasdf"
661
655
"-Wl,-mllvm,-amdgpu-lower-global-ctor-dtor=0" -nostdlib -static
662
656
"-Wl,-mllvm,-amdhsa-code-object-version=${LIBC_GPU_CODE_OBJECT_VERSION} " )
663
657
elseif (LIBC_TARGET_ARCHITECTURE_IS_NVPTX)
664
- # We need to use the internal object versions for NVPTX.
665
- set (internal_suffix ".__internal__" )
666
658
target_link_options (${fq_build_target_name} PRIVATE
667
659
${LIBC_COMPILE_OPTIONS_DEFAULT} -Wno-multi-gpu
668
660
"-Wl,--suppress-stack-size-warning"
@@ -679,11 +671,10 @@ function(add_libc_hermetic test_name)
679
671
target_link_libraries (
680
672
${fq_build_target_name}
681
673
PRIVATE
682
- libc.startup.${LIBC_TARGET_OS} .crt1${internal_suffix}
674
+ libc.startup.${LIBC_TARGET_OS} .crt1
683
675
${link_libraries}
684
676
LibcHermeticTestSupport.hermetic
685
- # The NVIDIA 'nvlink' linker does not currently support static libraries.
686
- $<$<NOT :$<BOOL :${LIBC_TARGET_ARCHITECTURE_IS_NVPTX} >>:${fq_target_name} .__libc__>)
677
+ ${fq_target_name} .__libc__)
687
678
add_dependencies (${fq_build_target_name}
688
679
LibcTest.hermetic
689
680
libc.test .UnitTest.ErrnoSetterMatcher
0 commit comments