| Message ID | 20191002231430.5839-1-skhan@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6e06983dde969c15eb4fdab77f0eda8b18ea28e6 |
| Headers | show |
| Series | [v3] selftests: kvm: Fix libkvm build error | expand |
On 03/10/19 01:14, Shuah Khan wrote: > Fix the following build error from "make TARGETS=kvm kselftest": > > libkvm.a(assert.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a PIE object; recompile with -fPIC > > This error is seen when build is done from the main Makefile using > kselftest target. In this case KBUILD_CPPFLAGS and CC_OPTION_CFLAGS > are defined. > > When build is invoked using: > > "make -C tools/testing/selftests/kvm" KBUILD_CPPFLAGS and CC_OPTION_CFLAGS > aren't defined. > > There is no need to pass in KBUILD_CPPFLAGS and CC_OPTION_CFLAGS for the > check to determine if --no-pie is necessary, which is the case when these > two aren't defined when "make -C tools/testing/selftests/kvm" runs. > > Fix it by simplifying the no-pie-option logic. With this change, both > build variations work. > > "make TARGETS=kvm kselftest" > "make -C tools/testing/selftests/kvm" > > Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> > --- > Changes since v2: > -- Removed extra blank line added by accident. > -- Fixed commit log. > > tools/testing/selftests/kvm/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > index 62c591f87dab..7ee097658ef0 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -48,7 +48,7 @@ CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ > -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I.. > > no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \ > - $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie) > + $(CC) -Werror -no-pie -x c - -o "$$TMP", -no-pie) > > # On s390, build the testcases KVM-enabled > pgste-option = $(call try-run, echo 'int main() { return 0; }' | \ > Queued, thanks. Paolo
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 62c591f87dab..7ee097658ef0 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -48,7 +48,7 @@ CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I.. no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \ - $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie) + $(CC) -Werror -no-pie -x c - -o "$$TMP", -no-pie) # On s390, build the testcases KVM-enabled pgste-option = $(call try-run, echo 'int main() { return 0; }' | \
Fix the following build error from "make TARGETS=kvm kselftest": libkvm.a(assert.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a PIE object; recompile with -fPIC This error is seen when build is done from the main Makefile using kselftest target. In this case KBUILD_CPPFLAGS and CC_OPTION_CFLAGS are defined. When build is invoked using: "make -C tools/testing/selftests/kvm" KBUILD_CPPFLAGS and CC_OPTION_CFLAGS aren't defined. There is no need to pass in KBUILD_CPPFLAGS and CC_OPTION_CFLAGS for the check to determine if --no-pie is necessary, which is the case when these two aren't defined when "make -C tools/testing/selftests/kvm" runs. Fix it by simplifying the no-pie-option logic. With this change, both build variations work. "make TARGETS=kvm kselftest" "make -C tools/testing/selftests/kvm" Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> --- Changes since v2: -- Removed extra blank line added by accident. -- Fixed commit log. tools/testing/selftests/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)