build: compatible for unsupportted go images (#701)

bytedance · Oct 15, 2024 · 8bfed73 · 8bfed73
1 parent edc70ff
commit 8bfed73
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 154 deletions.
diff --git a/fuzz/Makefile b/fuzz/Makefile
@@ -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:

diff --git a/internal/base64/b64_amd64.go b/internal/base64/b64_amd64.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.16
+// +build amd64,go1.17,!go1.24
 
 /**
  * Copyright 2023 ByteDance Inc.

diff --git a/internal/base64/b64_compat.go b/internal/base64/b64_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64 !go1.16
+// +build !amd64 !go1.17 go1.24
 
 /*
  * Copyright 2022 ByteDance Inc.

diff --git a/internal/rt/asm_amd64.s b/internal/rt/asm_amd64.s
@@ -1,4 +1,4 @@
-// +build !noasm !appengine
+// +build !noasm,amd64 !appengine,amd64
 // Code generated by asm2asm, DO NOT EDIT·
 
 #include "go_asm.h"

diff --git a/internal/rt/asm_arm64.s → internal/rt/asm_compat.s b/internal/rt/asm_arm64.s → internal/rt/asm_compat.s
@@ -1,4 +1,4 @@
-// +build !noasm !appengine
+// +build !noasm,!amd64 !appengine,!amd64
 // Code generated by asm2asm, DO NOT EDIT.
 
 #include "go_asm.h"

diff --git a/loader/funcdata_compat.go b/loader/funcdata_compat.go
@@ -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.

diff --git a/loader/funcdata_go116.go → loader/funcdata_go117.go b/loader/funcdata_go116.go → loader/funcdata_go117.go
diff --git a/loader/loader_go116_test.go b/loader/loader_go116_test.go
diff --git a/loader/loader_latest.go b/loader/loader_latest.go
@@ -1,4 +1,3 @@
-// +build go1.17,!go1.24
 
 /*
  * Copyright 2021 ByteDance Inc.