From c83eee3f2b6864b4a8a9ba2a64c975ca73570066 Mon Sep 17 00:00:00 2001 From: David Yat Sin Date: Wed, 31 May 2023 15:00:56 +0000 Subject: [PATCH] Removing __linux__ definition in CMake Removing this definition as this should already be defined by compiler. This is causing compile errors on newer versions of llvm because the macro is being redefined. Change-Id: Ica6a06f46a14e16d3f52e83b9b5ee8cfd7359510 [ROCm/ROCR-Runtime commit: e4fffa140a0fc7079747c3cff50813b8d45fc797] --- projects/rocr-runtime/rocrtst/samples/CMakeLists.txt | 2 +- projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt | 2 +- projects/rocr-runtime/runtime/hsa-ext-finalize/CMakeLists.txt | 2 +- projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt | 2 +- projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/rocr-runtime/rocrtst/samples/CMakeLists.txt b/projects/rocr-runtime/rocrtst/samples/CMakeLists.txt index fa74c44eef..607b561292 100755 --- a/projects/rocr-runtime/rocrtst/samples/CMakeLists.txt +++ b/projects/rocr-runtime/rocrtst/samples/CMakeLists.txt @@ -173,7 +173,7 @@ if(${BUILD_TYPE} STREQUAL "Debug") add_definitions(-DDEBUG) endif() -add_definitions(-D__linux__) +#add_definitions(-D__linux__) add_definitions(-DLITTLEENDIAN_CPU=1) # diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt index 919ebf3ca8..486cc32c41 100755 --- a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt +++ b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt @@ -212,7 +212,7 @@ add_definitions(-DROCRTST_EMULATOR_BUILD=1) endif() -add_definitions(-D__linux__) +#add_definitions(-D__linux__) add_definitions(-DLITTLEENDIAN_CPU=1) # diff --git a/projects/rocr-runtime/runtime/hsa-ext-finalize/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-ext-finalize/CMakeLists.txt index 700ad04346..6c6dbdcba2 100755 --- a/projects/rocr-runtime/runtime/hsa-ext-finalize/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-ext-finalize/CMakeLists.txt @@ -25,7 +25,7 @@ list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules" ) include ( utils ) ## Compiler preproc definitions. -add_definitions ( -D__linux__ ) +#add_definitions ( -D__linux__ ) add_definitions ( -DUNIX_OS ) add_definitions ( -DLINUX ) add_definitions ( -D__AMD64__ ) diff --git a/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt index 9ca3348703..6c286e3d06 100644 --- a/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt @@ -22,7 +22,7 @@ list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules" ) include ( utils ) ## Compiler preproc definitions. -add_definitions ( -D__linux__ ) +#add_definitions ( -D__linux__ ) add_definitions ( -DUNIX_OS ) add_definitions ( -DLINUX ) add_definitions ( -D__AMD64__ ) diff --git a/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt index 87463f513f..ac8bccdfa2 100755 --- a/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime-tools/CMakeLists.txt @@ -22,7 +22,7 @@ list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules" ) include ( utils ) ## Compiler preproc definitions. -add_definitions ( -D__linux__ ) +#add_definitions ( -D__linux__ ) add_definitions ( -DUNIX_OS ) add_definitions ( -DLINUX ) add_definitions ( -D__AMD64__ )