commit eb5300f2d1c5002e57b51de5924b9a21e615b8b3
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Jan 25 09:44:05 2015 +0000
- updated x32 macros with sensible values
cpu-os-macros.a | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/cpu-os-macros.a b/cpu-os-macros.a
index 010963e..d0915df 100644
--- a/cpu-os-macros.a
+++ b/cpu-os-macros.a
@@ -632,28 +632,33 @@ k6-linux.macros/0 0 0 644 708
`
# Multilibs
%_multilibno 1
%_multilibpatt
(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/668 0 0 0 644 791 `
+/668 0 0 0 644 1014 `
# Per-platform rpm configuration file.
#==============================================================================
# ---- per-platform macros.
#
-%_arch x86_64
+%_arch x32
%_os linux
-%_gnu -gnu
-%_target_platform %{_arch}-%{_target_vendor}-%{_target_os}%{?_gnu}
-%optflags %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp}
-fPIC}%{!?__common_cflags_with_ssp:-Os -g -mx32 -march=atom -mtune=core-avx-i}
%{!?nospecflags:%{?specflags_x32}}
+%_gnu -gnux32
+%_target_platform x86_64-%{_target_vendor}-%{_target_os}%{?_gnu}
+%optflags %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp}
-fPIC}%{!?__common_cflags_with_ssp:-O2 -g} -mtune=generic -march=x86-64
%{!?nospecflags:%{?specflags_x32}}
+
+#==============================================================================
+# ---- x86_64 cross-compilation macros.
+#__cc x86_64-pld-linux-gcc -mx32
+#__cpp x86_64-pld-linux-gcc -mx32 -E
+#__cxx x86_64-pld-linux-g++ -mx32
#==============================================================================
# ---- configure macros.
#
-%_lib lib32
+%_lib libx32
#---------------------------------------------------------------------
# Multilibs
-%_multilibno 1
+%_multilibno 3
%_multilibpatt
(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
/686 0 0 0 644 725 `
# Per-platform rpm configuration file.
@@ -672,6 +677,6 @@ k6-linux.macros/0 0 0 644 708 `
#---------------------------------------------------------------------
# Multilibs
-%_multilibno 2
+%_multilibno 3
%_multilibpatt
(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/eb5300f2d1c5002e57b51de5924b9a21e615b8b3
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
