From 5285ac2b5789cc2719eecb811b12616953d4788b Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Tue, 18 Jan 2022 11:32:03 +0100 Subject: [PATCH] runtime: -Wl,--s390-pgste for s390x for linking. Required for basic KVM checks on some kernels (e.g. the one RHEL is currently shipping), cf. https://github.com/qemu/qemu/blob/6621441db50d5bae7e34dbd04bf3c57a27a71b32/target/s390x/kvm/meson.build#L15-L16. Fixes: #3469 Signed-off-by: Jakob Naucke --- src/runtime/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index fefd31a0b3..a729644801 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -487,7 +487,11 @@ BUILDFLAGS := -buildmode=pie -mod=vendor ${BUILDTAGS} # whether stipping the binary ifeq ($(STRIP),yes) - KATA_LDFLAGS := -ldflags "-w -s" + KATA_LDFLAGS = -w -s +endif + +ifeq ($(ARCH),s390x) + KATA_LDFLAGS += -extldflags=-Wl,--s390-pgste endif # Return non-empty string if specified directory exists @@ -550,10 +554,10 @@ endef GENERATED_FILES += pkg/katautils/config-settings.go $(RUNTIME_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary - $(QUIET_BUILD)(cd $(RUNTIME_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) + $(QUIET_BUILD)(cd $(RUNTIME_DIR) && go build -ldflags $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) - $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) + $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build -ldflags $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(MONITOR_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) .git-commit $(QUIET_BUILD)(cd $(MONITOR_DIR)/ && CGO_ENABLED=0 go build \