[dev.fuzz] Merge remote-tracking branch 'origin/dev.fuzz' into merge-fuzz

Change-Id: I3976e624fe2817d06b708005c994f6832f6d4357

diff --cc src/internal/fuzz/trace.go
index 0000000000000000000000000000000000000000,f70b1a6f5ba8a6fd929991ef2934560fc3f01732..ab0aeb41bdd66005e3d3356aa2d1303f0a5f99d4
mode 000000,100644..100644
--- /dev/null
--- 2/src/internal/fuzz/trace.go
+++ b/src/internal/fuzz/trace.go
@@@ -1,0 -1,29 +1,30 @@@
+ // Copyright 2021 The Go Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
++//go:build !libfuzzer
+ // +build !libfuzzer
+ 
+ package fuzz
+ 
+ import _ "unsafe" // for go:linkname
+ 
+ //go:linkname libfuzzerTraceCmp1 runtime.libfuzzerTraceCmp1
+ //go:linkname libfuzzerTraceCmp2 runtime.libfuzzerTraceCmp2
+ //go:linkname libfuzzerTraceCmp4 runtime.libfuzzerTraceCmp4
+ //go:linkname libfuzzerTraceCmp8 runtime.libfuzzerTraceCmp8
+ 
+ //go:linkname libfuzzerTraceConstCmp1 runtime.libfuzzerTraceConstCmp1
+ //go:linkname libfuzzerTraceConstCmp2 runtime.libfuzzerTraceConstCmp2
+ //go:linkname libfuzzerTraceConstCmp4 runtime.libfuzzerTraceConstCmp4
+ //go:linkname libfuzzerTraceConstCmp8 runtime.libfuzzerTraceConstCmp8
+ 
+ func libfuzzerTraceCmp1(arg0, arg1 uint8)  {}
+ func libfuzzerTraceCmp2(arg0, arg1 uint16) {}
+ func libfuzzerTraceCmp4(arg0, arg1 uint32) {}
+ func libfuzzerTraceCmp8(arg0, arg1 uint64) {}
+ 
+ func libfuzzerTraceConstCmp1(arg0, arg1 uint8)  {}
+ func libfuzzerTraceConstCmp2(arg0, arg1 uint16) {}
+ func libfuzzerTraceConstCmp4(arg0, arg1 uint32) {}
+ func libfuzzerTraceConstCmp8(arg0, arg1 uint64) {}