Skip to content

Commit 12072fc

Browse files
committed
Fix for wasm
1 parent bd48503 commit 12072fc

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

overlays/patches/wasm/llvm/haskell-wasm-llvm-project.patch

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,6 @@ index 5054868b5ff4..e4fcd949ff71 100644
9494
}
9595
}
9696

97-
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
98-
index fb2aee8e42ee..a5de2dca1bc9 100644
99-
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
100-
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
101-
@@ -390,8 +390,8 @@ function(add_compiler_rt_runtime name type)
102-
target_link_libraries(${libname} PRIVATE ${builtins_${libname}})
103-
endif()
104-
if(${type} STREQUAL "SHARED")
105-
- if(APPLE OR WIN32)
106-
- set_property(TARGET ${libname} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
107-
+ if(COMMAND llvm_setup_rpath)
108-
+ llvm_setup_rpath(${libname})
109-
endif()
110-
if(WIN32 AND NOT CYGWIN AND NOT MINGW)
111-
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
11297
diff --git a/lld/wasm/InputChunks.cpp b/lld/wasm/InputChunks.cpp
11398
index 181221a77b10..c813e62e7b93 100644
11499
--- a/lld/wasm/InputChunks.cpp
@@ -301,25 +286,6 @@ index 83772ed8d2b1..0a7360d9357a 100644
301286
if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
302287
set_property(TARGET ${name} APPEND_STRING PROPERTY
303288
LINK_FLAGS " -Wl,-z,origin ")
304-
@@ -2562,16 +2561,9 @@ function(llvm_setup_rpath name)
305-
return()
306-
endif()
307-
308-
- # Enable BUILD_WITH_INSTALL_RPATH unless CMAKE_BUILD_RPATH is set and not
309-
- # building for macOS or AIX, as those platforms seemingly require it.
310-
- # On AIX, the tool chain doesn't support modifying rpaths/libpaths for XCOFF
311-
- # on install at the moment, so BUILD_WITH_INSTALL_RPATH is required.
312-
+ # Enable BUILD_WITH_INSTALL_RPATH unless CMAKE_BUILD_RPATH is set.
313-
if("${CMAKE_BUILD_RPATH}" STREQUAL "")
314-
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin|AIX")
315-
- set_property(TARGET ${name} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
316-
- else()
317-
- set_property(TARGET ${name} APPEND PROPERTY BUILD_RPATH "${_build_rpath}")
318-
- endif()
319-
+ set_property(TARGET ${name} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
320-
endif()
321-
322-
set_target_properties(${name} PROPERTIES
323289
diff --git a/llvm/lib/MC/MCParser/WasmAsmParser.cpp b/llvm/lib/MC/MCParser/WasmAsmParser.cpp
324290
index 1f824b80bcd4..1025d3ee3026 100644
325291
--- a/llvm/lib/MC/MCParser/WasmAsmParser.cpp

0 commit comments

Comments
 (0)