rpmrc.in, macros.in, installplatform: introduce armh arch

This commit is contained in:
Sergey Bolshakov 2012-08-05 18:34:32 +04:00
parent dd6ab30865
commit d289faa950
3 changed files with 14 additions and 10 deletions

View File

@ -36,8 +36,11 @@ case "$arch" in
alpha*)
SUBSTS='s,alpha,alpha, s,alpha,alphaev5, s,alpha,alphaev56, s,alpha,alphapca56, s,alpha,alphaev6, s,alpha,alphaev67,'
;;
armv7*)
SUBSTS='s,arm.*,armh, s,arm.*,armv7l, s,arm.*,noarch,'
;;
arm*)
SUBSTS='s,arm.*,arm, s,arm.*,armeb, s,arm.*,armv3l, s,arm.*,armv4l, s,arm.*,armv4b, s,arm.*,armv5l, s,arm.*,armv5tel, s,arm.*,armv5tejl, s,arm.*,armv5b, s,arm.*,noarch,'
SUBSTS='s,arm.*,arm, s,arm.*,armv3l, s,arm.*,armv4l, s,arm.*,armv5l, s,arm.*,armv5tel, s,arm.*,armv5tejl, s,arm.*,armv6l, s,arm.*,noarch,'
;;
sparc*)
SUBSTS='s,sparc\(64\|v9\),sparc, s,sparc64,sparcv9,;s,sparc\([^v]\|$\),sparcv9\1, s,sparcv9,sparc64,;s,sparc\([^6]\|$\),sparc64\1,'

View File

@ -790,7 +790,7 @@
#------------------------------------------------------------------------------
# arch macro for all ARM processors
#
%arm arm armeb armv3l armv4l armv4b armv5l armv5l armv5tel armv5tejl
%arm arm armv3l armv4l armv5l armv5tel armv5tejl armv6l armv7l armh
#------------------------------------------------------------------------
# Use in %install to generate locale specific file lists. For example,

View File

@ -60,14 +60,12 @@ optflags: mipsel %optflags_default
optflags: armv3l %optflags_default -fomit-frame-pointer -march=armv3
optflags: armv4l %optflags_default -fomit-frame-pointer -march=armv4
optflags: armv5l %optflags_default -fomit-frame-pointer -march=armv5
optflags: armeb %optflags_default -march=armv4 -mno-thumb-interwork
optflags: armv4l %optflags_default -fomit-frame-pointer -march=armv4
optflags: armv5l %optflags_default -fomit-frame-pointer -march=armv5
optflags: arm %optflags_default -fomit-frame-pointer -march=armv5te
optflags: armv5tel %optflags_default -fomit-frame-pointer -march=armv5te
optflags: armv5tejl %optflags_default -fomit-frame-pointer -march=armv5te
optflags: armv6l %optflags_default -fomit-frame-pointer -march=armv6
optflags: armv7l %optflags_default -fomit-frame-pointer -march=armv7
optflags: arm %optflags_default -fomit-frame-pointer -march=armv5te
optflags: armv7l %optflags_default -fomit-frame-pointer -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
optflags: armh %optflags_default -fomit-frame-pointer -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
optflags: atarist %optflags_default -fomit-frame-pointer
optflags: atariste %optflags_default -fomit-frame-pointer
@ -127,7 +125,6 @@ arch_canon: sparc64:sparc64 10
arch_canon: sun4u: sparc64 10
arch_canon: mipsel: mipsel 11
arch_canon: armv7l: arm 12
arch_canon: armv6l: arm 12
arch_canon: armv5tejl: armv5tejl 12
arch_canon: armv5tel: armv5tel 12
@ -296,8 +293,9 @@ arch_compat: hppa1.1: hppa1.0
arch_compat: hppa1.0: parisc
arch_compat: parisc: noarch
arch_compat: armv7l: armv6l
arch_compat: armv6l: armv5l
arch_compat: armv7l: armh
arch_compat: armh: noarch
arch_compat: armv6l: armv5tejl
arch_compat: armv5tejl: armv5tel
arch_compat: armv5tel: armv5l
arch_compat: armv5l: arm
@ -396,6 +394,9 @@ buildarch_compat: ppc64: noarch
buildarch_compat: mips: noarch
buildarch_compat: mipsel: noarch
buildarch_compat: armv7l: armh
buildarch_compat: armh: noarch
buildarch_compat: armv6l: armv5tejl
buildarch_compat: armv5tejl: armv5tel
buildarch_compat: armv5tel: armv5l
buildarch_compat: armv5l: armv4l