Skip to content

Yocto build compatibility #5627

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
a-nogikh merged 3 commits into from
Jan 14, 2025
Merged

Yocto build compatibility #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d1fa7
Makefile: rename CFLAGS to CXXFLAGS and add LDFLAGS
sephalon Nov 29, 2024
a72c1aa
sys/targets: allow users to override hardcoded cross-compilers
sephalon Nov 28, 2024
8cb5aaa
sys/targets: remove hardcoded CFlags for ARM
sephalon Dec 17, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ifneq ("$(NO_CROSS_COMPILER)", "")
else
mkdir -p ./bin/$(TARGETOS)_$(TARGETARCH)
$(CXX) -o ./bin/$(TARGETOS)_$(TARGETARCH)/syz-executor$(EXE) executor/executor.cc \
$(ADDCXXFLAGS) $(CFLAGS) -DGOOS_$(TARGETOS)=1 -DGOARCH_$(TARGETARCH)=1 \
$(ADDCXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -DGOOS_$(TARGETOS)=1 -DGOARCH_$(TARGETARCH)=1 \
-DHOSTGOOS_$(HOSTOS)=1 -DGIT_REVISION=\"$(REV)\"
endif
endif
Expand Down
11 changes: 10 additions & 1 deletion sys/targets/targets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ var List = map[string]map[string]*Target{
VMArch: ARM64,
PtrSize: 4,
PageSize: 4 << 10,
CFlags: []string{"-D__LINUX_ARM_ARCH__=6", "-march=armv6"},
Triple: "arm-linux-gnueabi",
KernelArch: "arm",
KernelHeaderArch: "arm",
Expand Down Expand Up @@ -715,6 +714,16 @@ func initTarget(target *Target, OS, arch string) {
for i := range target.CFlags {
target.replaceSourceDir(&target.CFlags[i], sourceDir)
}

if cc := os.Getenv("SYZ_CC_" + OS + "_" + arch); cc != "" {
target.CCompiler = strings.Fields(cc)[0]
target.CFlags = append(target.CFlags, strings.Fields(cc)[1:]...)
}
if cxx := os.Getenv("SYZ_CXX_" + OS + "_" + arch); cxx != "" {
target.CxxCompiler = strings.Fields(cxx)[0]
target.CxxFlags = append(target.CxxFlags, strings.Fields(cxx)[1:]...)
}

if OS == Linux && arch == runtime.GOARCH {
// Don't use cross-compiler for native compilation, there are cases when this does not work:
// https://github.com/google/syzkaller/pull/619
Expand Down
Loading