Skip to content

Commit eb60143

Browse files
authored
[llvm][objdump] Remove support for printing the embedded Bitcode section in MachO files. (#68457)
It's no longer possible to submit bitcode apps to the Apple App Store. The tools used to create xar archived bitcode sections inside MachO files have been discontinued. Additionally, the xar APIs have been deprecated since macOS 12, so this change removes unnecessary code from objdump and all dependencies on libxar. This fixes rdar://116600767
1 parent bc34a83 commit eb60143

File tree

12 files changed

+0
-463
lines changed

12 files changed

+0
-463
lines changed

llvm/cmake/config-ix.cmake

-11
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,6 @@ else()
252252
set(LLVM_ENABLE_TERMINFO 0)
253253
endif()
254254

255-
check_library_exists(xar xar_open "" LLVM_HAVE_LIBXAR)
256-
if(LLVM_HAVE_LIBXAR)
257-
message(STATUS "The xar file format has been deprecated: LLVM_HAVE_LIBXAR might be removed in the future.")
258-
# The xar file format has been deprecated since macOS 12.0.
259-
if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 12)
260-
set(LLVM_HAVE_LIBXAR 0)
261-
else()
262-
set(XAR_LIB xar)
263-
endif()
264-
endif()
265-
266255
# function checks
267256
check_symbol_exists(arc4random "stdlib.h" HAVE_DECL_ARC4RANDOM)
268257
find_package(Backtrace)

llvm/cmake/modules/LLVMConfig.cmake.in

-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ set(LLVM_ENABLE_SHARED_LIBS @BUILD_SHARED_LIBS@)
140140
set(LLVM_DEFAULT_EXTERNAL_LIT "@LLVM_CONFIG_DEFAULT_EXTERNAL_LIT@")
141141
set(LLVM_LIT_ARGS "@LLVM_LIT_ARGS@")
142142

143-
set(LLVM_HAVE_LIBXAR "@LLVM_HAVE_LIBXAR@")
144-
145143
if(NOT TARGET LLVMSupport)
146144
@LLVM_CONFIG_INCLUDE_EXPORTS@
147145
@llvm_config_include_buildtree_only_exports@

llvm/include/llvm/Config/llvm-config.h.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@
104104
/* Define to 1 if you have the <sysexits.h> header file. */
105105
#cmakedefine HAVE_SYSEXITS_H ${HAVE_SYSEXITS_H}
106106

107-
/* Define if the xar_open() function is supported on this platform. */
108-
#cmakedefine LLVM_HAVE_LIBXAR ${LLVM_HAVE_LIBXAR}
109-
110107
/* Define if building libLLVM shared library */
111108
#cmakedefine LLVM_BUILD_LLVM_DYLIB
112109

llvm/test/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
llvm_canonicalize_cmake_booleans(
22
BUILD_SHARED_LIBS
3-
LLVM_HAVE_LIBXAR
43
HAVE_OCAMLOPT
54
LLVM_ENABLE_DIA_SDK
65
LLVM_ENABLE_FFI

llvm/test/lit.cfg.py

-3
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,6 @@ def have_ld64_plugin_support():
583583
) and not re.match(r"^arm64(e)?-apple-(macos|darwin)", config.target_triple):
584584
config.available_features.add("debug_frame")
585585

586-
if config.have_libxar:
587-
config.available_features.add("xar")
588-
589586
if config.enable_threads:
590587
config.available_features.add("thread_support")
591588

llvm/test/lit.site.cfg.py.in

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ config.llvm_use_intel_jitevents = @LLVM_USE_INTEL_JITEVENTS@
3535
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
3636
config.have_zlib = @LLVM_ENABLE_ZLIB@
3737
config.have_zstd = @LLVM_ENABLE_ZSTD@
38-
config.have_libxar = @LLVM_HAVE_LIBXAR@
3938
config.have_libxml2 = @LLVM_ENABLE_LIBXML2@
4039
config.have_curl = @LLVM_ENABLE_CURL@
4140
config.have_httplib = @LLVM_ENABLE_HTTPLIB@

llvm/tools/llvm-driver/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ set_target_properties(llvm-driver PROPERTIES OUTPUT_NAME llvm)
2727
target_link_libraries(llvm-driver PUBLIC ${LLVM_DRIVER_OBJLIBS})
2828
target_link_libraries(llvm-driver PUBLIC LLVMDebuginfod)
2929

30-
if(LLVM_HAVE_LIBXAR)
31-
# used by llvm-objdump
32-
target_link_libraries(llvm-driver PUBLIC ${XAR_LIB})
33-
endif()
34-
3530
if(APPLE)
3631
# dsymutil uses some CoreFoundation stuff on Darwin...
3732
target_link_libraries(llvm-driver PRIVATE "-framework CoreFoundation")

llvm/tools/llvm-objdump/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ if(NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
4242
target_link_libraries(llvm-objdump PRIVATE LLVMDebuginfod)
4343
endif()
4444

45-
if(LLVM_HAVE_LIBXAR AND NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
46-
target_link_libraries(llvm-objdump PRIVATE ${XAR_LIB})
47-
endif()
48-
4945
add_llvm_tool_symlink(llvm-otool llvm-objdump)
5046

5147
if(LLVM_INSTALL_BINUTILS_SYMLINKS)

0 commit comments

Comments
 (0)