commit: c068f68557e6a0d7d2f5232221900205076429aa Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Jul 6 22:32:25 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Jul 6 22:33:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c068f685
games-emulation/zsnes: apply stack realignment to more functions Expand existing stack realignment hack to more C functions that get called from early init assembly. Fixes zsnes startup for me. Bug: https://bugs.gentoo.org/503138 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../zsnes/files/zsnes-1.51-stack-align-v2.patch | 56 ++++++++++ games-emulation/zsnes/zsnes-1.51-r7.ebuild | 122 +++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch new file mode 100644 index 00000000000..35613a95359 --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch @@ -0,0 +1,56 @@ +zsnes call C initialization code from assembler. + +Example backtrace: + + Thread 1 "zsnes" received signal SIGSEGV, Segmentation fault. + => 0xf7550275 <+37>: vmovdqa (%esp),%xmm1 + ... + #13 0x5699ef82 in InitSound () at linux/audio.c:336 + #14 0x569a25af in initwinvideo () at linux/sdllink.c:1080 + #15 0x5699fc13 in initvideo () at linux/sdllink.c:1298 + #16 0x56f9d5bc in regptwa () + #17 0x56a34b50 in SA1tableG () + #18 0x56f84788 in selcB800 () + ... + +Call to 'initwinvideo' (first C function) looks like that: + NEWSYM InitPreGame ; Executes before starting/continuing a game + mov byte[pressed+1],2 + pushad + call Start60HZ + %ifdef __OPENGL__ + call drawscreenwin + %endif + call initwinvideo + +Note: pushad / call does not 16-byte maintain stack alignment +and breaks i386 ABI. + +We apply realignment attribute to all functions noticed by users. +Bug: https://bugs.gentoo.org/503138 +--- src/linux/sdllink.c.old ++++ src/linux/sdllink.c +@@ -773,11 +773,11 @@ BOOL InitInput() + { + InitJoystickInput(); + return TRUE; + } + +-int startgame() ++int __attribute__((force_align_arg_pointer)) startgame() + { + static bool ranonce = false; + int status; + + if (!ranonce) +--- a/linux/sdllink.c ++++ b/linux/sdllink.c +@@ -897,7 +897,7 @@ bool OGLModeCheck() + return(cvidmode > 4); + } + +-void initwinvideo(void) ++void __attribute__((force_align_arg_pointer)) initwinvideo(void) + { + DWORD newmode = 0; + diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild new file mode 100644 index 00000000000..9613a4888e8 --- /dev/null +++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools desktop flag-o-matic toolchain-funcs pax-utils + +DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" +HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"; +SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="ao custom-cflags +debug opengl pax_kernel png" + +RDEPEND=" + media-libs/libsdl[sound,video,abi_x86_32(-)] + >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] + ao? ( media-libs/libao[abi_x86_32(-)] ) + debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) + opengl? ( virtual/opengl[abi_x86_32(-)] ) + png? ( media-libs/libpng:0=[abi_x86_32(-)] ) +" +DEPEND="${RDEPEND} + dev-lang/nasm + debug? ( virtual/pkgconfig ) +" + +S="${WORKDIR}/${PN}_${PV//./_}/src" + +PATCHES=( + # Fixing compilation without libpng installed + "${FILESDIR}"/${P}-libpng.patch + + # Fix bug #186111 + # Fix bug #214697 + # Fix bug #170108 + # Fix bug #260247 + "${FILESDIR}"/${P}-archopt-july-23-update.patch + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-libao-thread.patch + "${FILESDIR}"/${P}-depbuild.patch + "${FILESDIR}"/${P}-CC-quotes.patch + + # Fix compability with libpng15 wrt #378735 + "${FILESDIR}"/${P}-libpng15.patch + + # Fix buffer overwrite #257963 + "${FILESDIR}"/${P}-buffer.patch + # Fix gcc47 compile #419635 + "${FILESDIR}"/${P}-gcc47.patch + # Fix stack alignment issue #503138 + "${FILESDIR}"/${P}-stack-align-v2.patch + + "${FILESDIR}"/${P}-cross-compile.patch + "${FILESDIR}"/${P}-arch.patch +) + +src_prepare() { + default + + # The sdl detection logic uses AC_PROG_PATH instead of + # AC_PROG_TOOL, so force the var to get set the way we + # need for things to work correctly. + tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config + + sed -i -e '67i#define OF(x) x' zip/zunzip.h || die + + # Remove hardcoded CFLAGS and LDFLAGS + sed -i \ + -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \ + -e '/^LDFLAGS=.*local/d' \ + -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \ + -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \ + -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \ + configure.in || die + sed -i \ + -e 's/configure.in/configure.ac/' \ + Makefile.in || die + mv configure.in configure.ac || die + eautoreconf +} + +src_configure() { + tc-export CC + export BUILD_CXX=$(tc-getBUILD_CXX) + export NFLAGS=-O1 + use amd64 && multilib_toolchain_setup x86 + use custom-cflags || strip-flags + + append-cppflags -U_FORTIFY_SOURCE #257963 + + econf \ + $(use_enable ao libao) \ + $(use_enable debug debugger) \ + $(use_enable png libpng) \ + $(use_enable opengl) \ + --disable-debug \ + --disable-cpucheck +} + +src_compile() { + emake makefile.dep + emake +} + +src_install() { + dobin zsnes + if use pax_kernel; then + pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die + fi + + newman linux/zsnes.1 zsnes.6 + + dodoc \ + ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \ + ../docs/readme.txt/* + HTML_DOCS="../docs/readme.htm/*" einstalldocs + + make_desktop_entry zsnes ZSNES + newicon icons/48x48x32.png ${PN}.png +}
