Revert "KVM: arm64: Remove unnecessary sections from hyp objects"
This reverts commit 8e3f586e6e23fc269b77715dbbd956e5c3cbdd86.
Signed-off-by: Will Deacon <willdeacon@google.com
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 342ea28..e2b75fd 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -52,24 +52,12 @@
echo "$@: function reordering not supported in nVHE hyp code" >&2; \
/bin/false; \
fi; \
- $(OBJCOPY) --prefix-symbols=__kvm_nvhe_ \
- --remove-section=!.text \
- --rename-section=.text=.hyp.text \
- --remove-section=!.bss \
- --rename-section=.bss=.hyp.bss \
- --remove-section=!.data..percpu \
- --rename-section=.data..percpu=.hyp.data..percpu \
- --remove-section=!.data..percpu..read_mostly \
- --rename-section=.data..percpu..read_mostly=.hyp.data..percpu..read_mostly \
- --remove-section=!.hyp.* \
- --remove-section=!.altinst* \
- --remove-section=!.rodata* \
- --remove-section=!.rela* \
- --remove-section=!.shstrtab \
- --remove-section=!.strtab \
- --remove-section=!.symtab \
- --remove-section=.* \
- $< $@
+ $(OBJCOPY) --prefix-symbols=__kvm_nvhe_ \
+ --rename-section=.text=.hyp.text \
+ --rename-section=.bss=.hyp.bss \
+ --rename-section=.data..percpu=.hyp.data..percpu \
+ --rename-section=.data..percpu..read_mostly=.hyp.data..percpu..read_mostly \
+ $< $@
# Remove ftrace and Shadow Call Stack CFLAGS.
# This is equivalent to the 'notrace' and '__noscs' annotations.