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.

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

build: compatible for unsupportted go images #701

Merged
merged 7 commits into from
Oct 15, 2024
Merged

build: compatible for unsupportted go images #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f53ef4
build:(loader) make loader buildable under unsupported version
AsterDY Sep 9, 2024
dcdd2dd
fix: base64x
AsterDY Sep 10, 2024
09f25ea
tmp
AsterDY Sep 10, 2024
83842ae
fix
AsterDY Sep 10, 2024
8058b4d
Merge branch 'main' into build/loader_compat
AsterDY Oct 15, 2024
04197e7
compatible for other cpu
AsterDY Oct 15, 2024
e55bd38
build: fixed golang.org/x/tools/cmd/file2fuzz to v0.10.0
AsterDY Oct 15, 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 fuzz/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fuzz:
mkdir -p ${corpusdir}
rm -rf ./go-fuzz-corpus
git clone https://github.com/dvyukov/go-fuzz-corpus.git ./go-fuzz-corpus/
go install golang.org/x/tools/cmd/file2fuzz@latest
go install golang.org/x/tools/cmd/file2fuzz@v0.10.0
file2fuzz -o ${corpusdir} ./go-fuzz-corpus/json/corpus/* ./corpus/*

run:
Expand Down
2 changes: 1 addition & 1 deletion internal/base64/b64_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build amd64,go1.16
// +build amd64,go1.17,!go1.24

/**
* Copyright 2023 ByteDance Inc.
Expand Down
2 changes: 1 addition & 1 deletion internal/base64/b64_compat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !amd64 !go1.16
// +build !amd64 !go1.17 go1.24

/*
* Copyright 2022 ByteDance Inc.
Expand Down
2 changes: 1 addition & 1 deletion internal/rt/asm_amd64.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !noasm !appengine
// +build !noasm,amd64 !appengine,amd64
// Code generated by asm2asm, DO NOT EDIT·

#include "go_asm.h"
Expand Down
2 changes: 1 addition & 1 deletion internal/rt/asm_arm64.s → internal/rt/asm_compat.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !noasm !appengine
// +build !noasm,!amd64 !appengine,!amd64
// Code generated by asm2asm, DO NOT EDIT.

#include "go_asm.h"
Expand Down
4 changes: 2 additions & 2 deletions loader/funcdata_compat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !go1.17
// +build !go1.17
//go:build !go1.17 || go1.24
// +build !go1.17 go1.24

/*
* Copyright 2021 ByteDance Inc.
Expand Down
0 loader/funcdata_go116.go → loader/funcdata_go117.go
View file
Open in desktop
File renamed without changes.
146 changes: 0 additions & 146 deletions loader/loader_go116_test.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion loader/loader_latest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// +build go1.17,!go1.24

/*
* Copyright 2021 ByteDance Inc.
Expand Down
Loading