Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

* fixed: broken VM compilation of old code with recent clang-1500.3.9.4 #773

Merged
merged 4 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/llvm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ endif()
set(C_CXX_FLAGS "${C_CXX_FLAGS} -fvisibility=hidden -fdata-sections -ffunction-sections")

ExternalProject_Add(extclang
GIT_REPOSITORY git://github.com/mobivm/clang.git
GIT_REPOSITORY https://github.com/mobivm/clang.git
GIT_TAG 7b389564897bc6c0431c42f8f1825f04624ff4e3
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
Expand All @@ -59,7 +59,7 @@ set(LLVM_C_FLAGS "${C_CXX_FLAGS} -fvisibility=hidden -fdata-sections -ffunction-
set(LLVM_CXX_FLAGS "${C_CXX_FLAGS} -fvisibility=hidden -fdata-sections -ffunction-sections")
ExternalProject_Add(extllvm
DEPENDS extclang
GIT_REPOSITORY git://github.com/mobivm/llvm.git
GIT_REPOSITORY https://github.com/mobivm/llvm.git
GIT_TAG aceb47b80838681fe65a1d01aac7aae7b863ac5a
PATCH_COMMAND bash -c "rm -rf tools/clang && ln -s ../../../../extclang-prefix/src/extclang tools/clang && ${CMAKE_SOURCE_DIR}/patches/apply-patches"
LIST_SEPARATOR ^^
Expand Down
2 changes: 2 additions & 0 deletions compiler/vm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ else()
endif()

set(EXTGC_C_FLAGS "${C_CXX_FLAGS} -DGC_DISABLE_INCREMENTAL -DGC_DISCOVER_TASK_THREADS -DGC_FORCE_UNMAP_ON_GCOLLECT -DMARK_DESCR_OFFSET=${EXTGC_MARK_DESCR_OFFSET}")
# disable errors on clang clang-1500.3.9.4
set(EXTGC_C_FLAGS "${EXTGC_C_FLAGS} -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion")
set(EXTGC_LD_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
if(DARWIN)
set(EXTGC_C_FLAGS "${EXTGC_C_FLAGS} -DNO_DYLD_BIND_FULLY_IMAGE --sysroot=${SYSROOT}")
Expand Down
2 changes: 2 additions & 0 deletions compiler/vm/rt/robovm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ if(DARWIN)
if(IOS)
set(OBJC_FLAGS "${OBJC_FLAGS} -fobjc-abi-version=2")
endif()
# disable errors on clang clang-1500.3.9.4
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion")
# disable XCode14 objc-msgsend stubs to allow this lib to be linked with XCode13 and bellow
set(OBJC_FLAGS "${OBJC_FLAGS} -fno-objc-msgsend-selector-stubs")
set_property(SOURCE ${OBJC_SRC} PROPERTY LANGUAGE C)
Expand Down
Loading