Only set -malign-functions=2 -malign-jumps=2 -malign-loops=2 on i386

architecture, as pointed out by pk.

1 files changed, 21 insertions, 14 deletions

diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 6dc1d5cfffb..c3cb6ca8ba4 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,5 +1,5 @@
---- makefile.unix.orig	Thu Jan 29 07:21:09 1998
-+++ makefile.unix	Mon Mar 16 00:51:58 1998
+--- makefile.unix.orig	Thu Jan 29 12:21:09 1998
++++ makefile.unix	Tue May 12 21:57:05 1998
 @@ -36,18 +36,18 @@
  # GNU MAKE is MANDATORY !!!
  # so please give me the path...
@@ -22,7 +22,7 @@
  # for IRIX systems seems that DCC gets better code than GNU. so use it:
  # CC	= DCC
  #
-@@ -73,8 +73,11 @@
+@@ -73,10 +73,18 @@
  ### normal optimization flags
  # OPTFLAGS    = -O2
  # OPTFLAGS    = -O2 -m486 -Wall
@@ -31,11 +31,18 @@
 +endif
  ### to get full optimization under gcc/x Intel based OS's.. ( !!else comment!! )
 -OPTFLAGS     = -O3 -m486 -Wall -Wno-parentheses -funroll-loops \
++ifeq ($(ARCH),i386)
 +OPTFLAGS     = -O2 $(ARCHOPS) -Wall -Wno-parentheses -funroll-loops \
    -fstrength-reduce -fomit-frame-pointer -ffast-math -malign-functions=2 \
    -malign-jumps=2 -malign-loops=2
++else
++OPTFLAGS     = -O2 $(ARCHOPS) -Wall -Wno-parentheses -funroll-loops \
++  -fstrength-reduce -fomit-frame-pointer -ffast-math 
++endif
  ### for Linux/X11/PowerPC use following opts
-@@ -92,7 +95,9 @@
+ # OPTFLAGS     = -O3 -Wall -Wno-parentheses -funroll-loops \
+ #  -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
+@@ -92,7 +100,9 @@
  ##############################################################################
  
  # *** To disable joystick support comment next line
@@ -45,7 +52,7 @@
  
  # *** To disable  mouse support comment next line
  MOUSE		= -DUSE_MOUSE
-@@ -114,7 +119,9 @@
+@@ -114,7 +124,9 @@
  # JSLIB   = -lXi
  
  # On iX86 based OS's, if supported, you can use standard joystick driver
@@ -55,7 +62,7 @@
  
  # Linux FM-TOWNS game PAD joystick emulation support
  # Thanks to Osamu Kurati for provided patch
-@@ -156,8 +163,8 @@
+@@ -156,8 +168,8 @@
  # *** where does your X11 source tree resides ?? use aproppiate switch 
  
  # standard location for X11 
@@ -66,7 +73,7 @@
  # standard location for XFree86
  X11INC		= -I/usr/X11R6/include
  X11LIB		= -L/usr/X11R6/lib
-@@ -175,18 +182,18 @@
+@@ -175,18 +187,18 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
  # ( only needed to install, not to compile... )
@@ -91,7 +98,7 @@
  
  # *** Use this definition as default X Display
  DP = \":0.0\"
-@@ -209,8 +216,8 @@
+@@ -209,8 +221,8 @@
  # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item
  #
  # DONTUSE_TIMER is mandatory for SVGALIB -else you'll get a compile error-
@@ -102,7 +109,7 @@
  
  # *** When using timer, you should provide the frequency to generate audio sample
  # frames in your system. See readme.unix notes about these item
-@@ -232,7 +239,7 @@
+@@ -232,7 +244,7 @@
  ######## Alpha/Linux/X11
  # ARCH  = linux_alpha
  ######## ix86/Linux/X11
@@ -111,7 +118,7 @@
  ######## ix86/Linux/SVGALIB
  # ARCH	= svgalib
  ######## ix86/Linux/GGI *New* *New* *New* Please test - no mouse or joy yet
-@@ -321,12 +328,12 @@
+@@ -321,12 +333,12 @@
  #If you want sound add to DEFS.netbsd_i386  "-DUSE_AUDIO" and 
  #set STIM=-DUSE_TIMER above
  #
@@ -128,7 +135,7 @@
  
  # SunOS
  #####################
-@@ -414,7 +421,7 @@
+@@ -414,7 +426,7 @@
  # Perhaps one day original mame sources will use POSIX strcasecmp and M_PI
  # instead MS-DOS counterparts... ( a long and sad history ...)
  CFLAGS	= $(CAPABILITIES) $(SOUND_OPTS) $(DBGFLAGS) $(OPTFLAGS) \
@@ -137,7 +144,7 @@
  
  OBJOSDEP = obj/unix/osdepend.a
  
-@@ -585,13 +592,13 @@
+@@ -585,13 +597,13 @@
  # not sure why, but was in original xmame makefile long time ago...
  VPATH = src src/Z80 src/M6502 src/I86 src/M6809 src/M68000 src/unix src/zipfiles
  
@@ -157,7 +164,7 @@
  
  $(OBJDIRS):
  	-mkdir $@
-@@ -600,36 +607,36 @@
+@@ -600,36 +612,36 @@
  
  objlnk:
  	-rm -fR obj
@@ -203,7 +210,7 @@
  
  sndtest: sndtest.c
  	gcc -o sndtest sndtest.c
-@@ -647,33 +654,33 @@
+@@ -647,33 +659,33 @@
  			src/I86/instr.h
  
  install: install-bin install-man