[atlas] 06/10: d/rules: update architecture/ISA names/enums.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository atlas.

commit 07f267bbb958a2a524ceddba2e4f77da3a7ff4df
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 29 15:27:31 2016 +0200

    d/rules: update architecture/ISA names/enums.
---
 debian/rules | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4d640a4..a632ccc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,32 +3,25 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-# NB: the following numbers come from xprint_enums (compilable from the build
+# NB: the following strings and numbers come from xprint_enums (compilable from the build
 # directory with "make xprint_enums); they can change across releases
 #
-# First number in ARCHS:
-# - 0 means Unknown CPU: leave ATLAS find out; used for archs where a more specific choice is not available
-# - 9 means IBMz9: for s390x
-# - 12 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults: for *i386
-#   See http://math-atlas.sourceforge.net/atlas_install/node28.html
-# - 14 means generic libraries for P4 and later, with SSE2: for *amd64
-#   See: http://math-atlas.sourceforge.net/atlas_install/node30.html
-# - 51 means ARMv7: for armhf (but not for armel, which is ARM >= v4)
-# - 52 means GENERIC: the same than 0 (UNKNOWN), except that it does not try autodetection
-#   See debian/patches/generic.diff
-# Second number in ARCHS:
+# The trailing number in ARCHS corresponds to the instruction set (ISA):
 # - 1 means no instruction set extension
-# - 384 means SSE1+SSE2 (always available on amd64)
+# - 768 means SSE1+SSE2 (always available on amd64)
 ifeq ($(DEB_HOST_ARCH),s390x)
-ARCHS=base_9_1
+ARCHS=base_IBMz9_1
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
-ARCHS=base_12_1
+# See http://math-atlas.sourceforge.net/atlas_install/node32.html
+ARCHS=base_x86x87_1
 else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-ARCHS=base_14_384
+ARCHS=base_x86SSE2_768
 else ifeq ($(DEB_HOST_ARCH),armhf)
-ARCHS=base_51_1
+ARCHS=base_ARMa7_1
 else
-ARCHS=base_52_1
+# The same as 0 (UNKNOWN), except that it does not try autodetection
+# See debian/patches/generic.diff
+ARCHS=base_GENERIC_1
 endif
 
 # Pointer bitwidth

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git