Skip to content

Conversation

@xingxue-ibm
Copy link
Contributor

Commit eaa0a21 has fixed the build problem already so the change in #117342 does not make sense any more. I am reverting it.

@xingxue-ibm xingxue-ibm added the clang Clang issues not falling into any other category label Nov 23, 2024
@xingxue-ibm xingxue-ibm self-assigned this Nov 23, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 23, 2024

@llvm/pr-subscribers-clang

Author: Xing Xue (xingxue-ibm)

Changes

Commit eaa0a21 has fixed the build problem already so the change in llvm/llvm-project#117342 does not make sense any more. I am reverting it.


Full diff: https://github.com/llvm/llvm-project/pull/117444.diff

1 Files Affected:

  • (modified) clang/tools/clang-shlib/CMakeLists.txt (+4-6)
diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
index 2d97347ea7f828..31484ec49c7739 100644
--- a/clang/tools/clang-shlib/CMakeLists.txt
+++ b/clang/tools/clang-shlib/CMakeLists.txt
@@ -48,13 +48,11 @@ add_clang_library(clang-cpp
                   ${_OBJECTS}
                   LINK_LIBS
                   ${_DEPS})
-# AIX linker does not support version script
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-  configure_file(simple_version_script.map.in simple_version_script.map)
 
-  if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    target_link_options(clang-cpp PRIVATE LINKER:--version-script,${CMAKE_CURRENT_BINARY_DIR}/simple_version_script.map)
-  endif()
+configure_file(simple_version_script.map.in simple_version_script.map)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  target_link_options(clang-cpp PRIVATE LINKER:--version-script,${CMAKE_CURRENT_BINARY_DIR}/simple_version_script.map)
 endif()
 
 # Optimize function calls for default visibility definitions to avoid PLT and

Copy link
Contributor

@DanielCChen DanielCChen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
Thanks for reverting it.

Copy link
Member

@aaronpuchert aaronpuchert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@xingxue-ibm xingxue-ibm merged commit 08bf901 into main Nov 24, 2024
10 checks passed
@xingxue-ibm xingxue-ibm deleted the revert-117342-daniel_aix branch November 24, 2024 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang Clang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants