vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644

full diff: 60c3aa43f4...4032b1d8aa

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

vendor/github.com/cilium/ebpf/linker.go

@@ -2,23 +2,35 @@ package ebpf
 
 import (
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/internal/btf"
+	"github.com/pkg/errors"
 )
 
 // link resolves bpf-to-bpf calls.
 //
-// Each section may contain multiple functions / labels, and is only linked
+// Each library may contain multiple functions / labels, and is only linked
 // if the program being edited references one of these functions.
 //
-// Sections must not require linking themselves.
-func link(insns asm.Instructions, sections ...asm.Instructions) (asm.Instructions, error) {
-	for _, section := range sections {
-		var err error
-		insns, err = linkSection(insns, section)
+// Libraries must not require linking themselves.
+func link(prog *ProgramSpec, libs []*ProgramSpec) error {
+	for _, lib := range libs {
+		insns, err := linkSection(prog.Instructions, lib.Instructions)
 		if err != nil {
-			return nil, err
+			return errors.Wrapf(err, "linking %s", lib.Name)
+		}
+
+		if len(insns) == len(prog.Instructions) {
+			continue
+		}
+
+		prog.Instructions = insns
+		if prog.BTF != nil && lib.BTF != nil {
+			if err := btf.ProgramAppend(prog.BTF, lib.BTF); err != nil {
+				return errors.Wrapf(err, "linking BTF of %s", lib.Name)
+			}
 		}
 	}
-	return insns, nil
+	return nil
 }
 
 func linkSection(insns, section asm.Instructions) (asm.Instructions, error) {