Skip to content

Fix clang2whirl build with LLVM 11 #45

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.

Sign up for GitHub

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

Merged
laijx03 merged 1 commit into from
Mar 3, 2026
Merged

Fix clang2whirl build with LLVM 11 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions osprey/clang2whirl/Makefile.gbase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,10 @@ COMUTIL_OBJS = $(TARG_COMUTIL_DIR)/libcomutil.a
#----------------------------------------------------------------------
CLANG_LIBS = -lclangFrontendTool -lclangEdit -lclangSerialization -lclangRewrite -lclangRewriteFrontend \
-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema \
-lclangAnalysis -lclangTooling -lclangAST -lclangLex -lclangBasic
-lclangAnalysis -lclangTooling -lclangAST -lclangLex -lclangBasic \
-lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers \
-lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangASTMatchers \
-lclangToolingCore

LLVM_LIBS = -lLLVMProfileData -lLLVMBitReader -lLLVMMC -lLLVMMCParser \
-lLLVMBinaryFormat -lLLVMCore -lLLVMOption -lLLVMSupport
Expand Down Expand Up @@ -327,7 +330,7 @@ ifneq ($(BUILD_OS),DARWIN)
LLDOPTS = -Wl,--export-dynamic
endif
LLDLIBS = -Wl,--start-group $(CLANG_LIBS) $(LLVM_LIBS) -Wl,--end-group $(COMUTIL_OBJS) $(LIBIBERTY_OBJS)
LLDLIBS += -lm $(CMPLRS_OBJS) -ldl
LLDLIBS += -lm $(CMPLRS_OBJS) -ldl -lz -ltinfo
LDIRT += $(TARGETS) build_version.h

# .PHONY: default first last install build_version.h
Expand Down
2 changes: 2 additions & 0 deletions osprey/clang2whirl/c2w_builtin.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,9 @@ WhirlExprBuilder::ConvertBuiltinExpr(const CallExpr *expr, const FunctionDecl *d
case Builtin::BIindex ... Builtin::BIstrncasecmp: // POSIX strings.h
case Builtin::BI_exit ... Builtin::BIvfork: // POSIX unistd.h
case Builtin::BI_setjmp ... Builtin::BIsiglongjmp:// POSIX setjmp.h
#if LLVM_VERSION_MAJOR >= 14
case Builtin::BIstrlcpy ... Builtin::BIstrlcat: // non-std
#endif
return Result::nwNone();

// ignore ObjC builtins
Expand Down