summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/optflags.patch41
1 files changed, 15 insertions, 26 deletions
diff --git a/packaging/optflags.patch b/packaging/optflags.patch
index ac89f49..eb90e94 100644
--- a/packaging/optflags.patch
+++ b/packaging/optflags.patch
@@ -1,7 +1,7 @@
-Index: rpm-4.9.1/rpmrc.in
+Index: rpm-4.9.0/rpmrc.in
===================================================================
---- rpm-4.9.1.orig/rpmrc.in
-+++ rpm-4.9.1/rpmrc.in
+--- rpm-4.9.0.orig/rpmrc.in
++++ rpm-4.9.0/rpmrc.in
@@ -12,10 +12,10 @@
# "fat" binary with both archs, for Darwin
optflags: fat -O2 -g -arch i386 -arch ppc
@@ -12,8 +12,8 @@ Index: rpm-4.9.1/rpmrc.in
-optflags: i686 -O2 -g -march=i686
+Optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
+Optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
-+Optflags: i586 %{__global_cflags} -m32 -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
-+Optflags: i686 %{__global_cflags} -m32 -march=core2 -mssse3 -mtune=atom -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer
++Optflags: i586 %{__global_cflags} -m32 -march=core2 -msse3 -mno-ssse3 -mfpmath=sse -mtune=generic -fasynchronous-unwind-tables -fno-omit-frame-pointer
++Optflags: i686 %{__global_cflags} -m32 -march=core2 -msse3 -mno-ssse3 -mfpmath=sse -mtune=generic -fasynchronous-unwind-tables -fno-omit-frame-pointer
optflags: pentium3 -O2 -g -march=pentium3
optflags: pentium4 -O2 -g -march=pentium4
optflags: athlon -O2 -g -march=athlon
@@ -49,29 +49,18 @@ Index: rpm-4.9.1/rpmrc.in
optflags: atarist -O2 -g -fomit-frame-pointer
optflags: atariste -O2 -g -fomit-frame-pointer
-@@ -209,17 +210,17 @@ os_canon: MacOSX: macosx 21
- #############################################################
- # For a given uname().machine, the default build arch
-
--buildarchtranslate: osfmach3_i686: i386
--buildarchtranslate: osfmach3_i586: i386
-+buildarchtranslate: osfmach3_i686: i586
-+buildarchtranslate: osfmach3_i586: i586
- buildarchtranslate: osfmach3_i486: i386
- buildarchtranslate: osfmach3_i386: i386
-
--buildarchtranslate: athlon: i386
--buildarchtranslate: geode: i386
--buildarchtranslate: pentium4: i386
--buildarchtranslate: pentium3: i386
+@@ -218,10 +219,10 @@ buildarchtranslate: athlon: i386
+ buildarchtranslate: geode: i386
+ buildarchtranslate: pentium4: i386
+ buildarchtranslate: pentium3: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
-+buildarchtranslate: athlon: i586
-+buildarchtranslate: geode: i586
-+buildarchtranslate: pentium4: i586
-+buildarchtranslate: pentium3: i586
+-buildarchtranslate: i486: i386
+-buildarchtranslate: i386: i386
+buildarchtranslate: i686: i586
+buildarchtranslate: i586: i586
- buildarchtranslate: i486: i386
- buildarchtranslate: i386: i386
++buildarchtranslate: i486: i586
++buildarchtranslate: i386: i586
+ buildarchtranslate: alphaev5: alpha
+ buildarchtranslate: alphaev56: alpha