kexec-tools: fox build on ppc64 BE, fix relocations on ppc-musl

This commit is contained in:
q66 2019-12-13 14:17:00 +01:00
parent 5cd4fa8bbc
commit 9050d9a33d
2 changed files with 19 additions and 0 deletions

View file

@ -0,0 +1,15 @@
Use ELFv2 ABI for big endian.
--- purgatory/arch/ppc64/Makefile
+++ purgatory/arch/ppc64/Makefile
@@ -14,8 +14,8 @@ ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float \
ppc64_PURGATORY_EXTRA_ASFLAGS += -m64
ifeq ($(SUBARCH),BE)
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64ppc
- ppc64_PURGATORY_EXTRA_CFLAGS += -mcall-aixdesc
- ppc64_PURGATORY_EXTRA_ASFLAGS += -mcall-aixdesc
+ ppc64_PURGATORY_EXTRA_CFLAGS += -mabi=elfv2
+ ppc64_PURGATORY_EXTRA_ASFLAGS += -mabi=elfv2
else
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64lppc
ppc64_PURGATORY_EXTRA_CFLAGS += -mlittle-endian

View file

@ -15,6 +15,10 @@ case "$XBPS_TARGET_MACHINE" in
i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/19200/steps/shell_3/logs/stdio" ;;
esac
case "$XBPS_TARGET_MACHINE" in
ppc-musl) nopie=yes;; # textrels not supported
esac
pre_build() {
rm ${XBPS_WRAPPERDIR}/strip
case "$XBPS_TARGET_MACHINE" in