diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-29 22:42:38 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-29 22:42:38 -0500 |
| commit | 6f60664e8dd64ead7238452a515b1fa914e80793 (patch) | |
| tree | a75d25ea17a5bbe439e0b06f0325484dc0a7a312 | |
| parent | 2552843d964162f7ba105775c05a231d9cdd4ae8 (diff) | |
| download | packages-6f60664e8dd64ead7238452a515b1fa914e80793.tar.gz packages-6f60664e8dd64ead7238452a515b1fa914e80793.tar.bz2 packages-6f60664e8dd64ead7238452a515b1fa914e80793.tar.xz packages-6f60664e8dd64ead7238452a515b1fa914e80793.zip | |
user/qemu: fix build on ppc
| -rw-r--r-- | user/qemu/APKBUILD | 2 | ||||
| -rw-r--r-- | user/qemu/ppc32-musl-support.patch | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index da6bd1ecf..d1717c62f 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -149,6 +149,7 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2 fix-sockios-header.patch test-crypto-ivgen-skip-essiv.patch ppc-Fix-size-of-ppc64-xer-register-fwd.patch + ppc32-musl-support.patch sysinfo-header.patch fix-lm32-underlinking.patch @@ -389,6 +390,7 @@ d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f 39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4 fix-sockios-header.patch 8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff test-crypto-ivgen-skip-essiv.patch a4cbb020d6a839b5a129964027169babff2c1455170c5fec855232d999481eea2cae186fa66ceaa5c8a05f3eb87f9565aaf9bdcc0e56edf3060e39e80c10c782 ppc-Fix-size-of-ppc64-xer-register-fwd.patch +fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55885bc784a96a99b28aeacbc6a5549b2e6750c9d3099a897c ppc32-musl-support.patch 698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch 2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd diff --git a/user/qemu/ppc32-musl-support.patch b/user/qemu/ppc32-musl-support.patch new file mode 100644 index 000000000..4c6ab59eb --- /dev/null +++ b/user/qemu/ppc32-musl-support.patch @@ -0,0 +1,16 @@ +--- qemu-2.12.0/accel/tcg/user-exec.c.old 2018-07-30 03:20:04.910000000 +0000 ++++ qemu-2.12.0/accel/tcg/user-exec.c 2018-07-30 03:38:57.350000000 +0000 +@@ -304,8 +304,13 @@ + #define CR_sig(context) REG_sig(ccr, context) + + #else // Musl ++#if defined(_ARCH_PPC64) + #define REG_sig(reg_num, context) \ + ((context)->uc_mcontext.gp_regs[reg_num]) ++#else ++#define REG_sig(reg_num, context) \ ++ ((context)->uc_mcontext.gregs[reg_num]) ++#endif + /* Gpr Registers access */ + #define GPR_sig(reg_num, context) REG_sig(gpr[reg_num], context) + /* Program counter */ |