[atlas] 01/01: Update archdef for armhf.
Sébastien Villemot
sebastien at debian.org
Fri Aug 5 20:51:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository atlas.
commit 490c98f6d532cae10c432df920585d05ce93c9bc
Author: Sébastien Villemot <sebastien at debian.org>
Date: Fri Aug 5 22:50:10 2016 +0200
Update archdef for armhf.
---
debian/archdefs/README | 5 +----
debian/archdefs/arm/ARMa732.tar.bz2 | Bin 0 -> 8086 bytes
debian/archdefs/arm/ARMv732.tar.bz2 | Bin 7732 -> 0 bytes
debian/archdefs/arm/ARMv732NEON.tar.bz2 | Bin 7630 -> 0 bytes
debian/rules | 17 -----------------
debian/source/include-binaries | 3 +--
6 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/debian/archdefs/README b/debian/archdefs/README
index 65e1678..ad94c7b 100644
--- a/debian/archdefs/README
+++ b/debian/archdefs/README
@@ -8,10 +8,7 @@ generated (other details are in README.source):
- amd64: ATLAS 3.10.1 / karaba.cepremap.org / wheezy / 2013-06-04
- arm:
+ GENERIC32.tar.bz2 (for armel): ATLAS 3.10.1 / vamana.villemot.name (Raspberry Pi) / sid / 2013-07-01
- + ARMv732 (for armhf): from ATLAS 3.10.1 tarball, modified for removing all
- the "-mfloat-abi=armhf" and "-mfpu=vfpv3" flags
- + ARMv732NEON (for armhf): same than ARMv732; note that this one is not used
- for the generic package, but only for the custom one
+ + ARMa732.tar.bz2 (for armhf): ATLAS 3.10.3 / asachi.debian.org / sid / 2016-08-05
- arm64: ATLAS 3.10.3 / asachi.debian.org / sid / 2016-08-05
- i386: from ATLAS 3.10.1 tarball
- mips: ATLAS 3.10.1 / gabrielli.debian.org / sid / 2013-07-27
diff --git a/debian/archdefs/arm/ARMa732.tar.bz2 b/debian/archdefs/arm/ARMa732.tar.bz2
new file mode 100644
index 0000000..68484ba
Binary files /dev/null and b/debian/archdefs/arm/ARMa732.tar.bz2 differ
diff --git a/debian/archdefs/arm/ARMv732.tar.bz2 b/debian/archdefs/arm/ARMv732.tar.bz2
deleted file mode 100644
index b6b41e7..0000000
Binary files a/debian/archdefs/arm/ARMv732.tar.bz2 and /dev/null differ
diff --git a/debian/archdefs/arm/ARMv732NEON.tar.bz2 b/debian/archdefs/arm/ARMv732NEON.tar.bz2
deleted file mode 100644
index abe1be2..0000000
Binary files a/debian/archdefs/arm/ARMv732NEON.tar.bz2 and /dev/null differ
diff --git a/debian/rules b/debian/rules
index 9735efa..e514c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,23 +70,6 @@ GENERIC_CONFIG_PARAMS := \
-Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU) \
--cripple-atlas-performance
-# The archdefs provided by ATLAS are unsuitable for armhf, because
-# they use the -mfpu=vfpv3 flag, while some armhf machines have only vfpv3-d16
-# (i.e. 16 FPU registers instead of 32).
-#
-# Hence we replace them by new ones without the problematic flags. They are
-# located under debian/archdefs/arm, and used for the generic package.
-#
-# The following rules ensure that these new archdefs are also used for the
-# custom package.
-use-my-armhf-archdef:
- test -f CONFIG/ARCHS/ARMv732.tar.bz2.old || (mv CONFIG/ARCHS/ARMv732.tar.bz2 CONFIG/ARCHS/ARMv732.tar.bz2.old && cp debian/archdefs/arm/ARMv732.tar.bz2 CONFIG/ARCHS/ARMv732.tar.bz2)
- test -f CONFIG/ARCHS/ARMv732NEON.tar.bz2.old || (mv CONFIG/ARCHS/ARMv732NEON.tar.bz2 CONFIG/ARCHS/ARMv732NEON.tar.bz2.old && cp debian/archdefs/arm/ARMv732NEON.tar.bz2 CONFIG/ARCHS/ARMv732NEON.tar.bz2)
-
-restore-armhf-archdef:
- (test -f CONFIG/ARCHS/ARMv732.tar.bz2.old && mv CONFIG/ARCHS/ARMv732.tar.bz2.old CONFIG/ARCHS/ARMv732.tar.bz2) || true
- (test -f CONFIG/ARCHS/ARMv732NEON.tar.bz2.old && mv CONFIG/ARCHS/ARMv732NEON.tar.bz2.old CONFIG/ARCHS/ARMv732NEON.tar.bz2) || true
-
# Build a custom package optimized for the current arch
custom: custom-stamp
.PHONY: custom
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 5bdf0ec..1f592ff 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,7 +1,6 @@
debian/archdefs/amd64/x86SSE264SSE2.tar.bz2
debian/archdefs/arm/GENERIC32.tar.bz2
-debian/archdefs/arm/ARMv732.tar.bz2
-debian/archdefs/arm/ARMv732NEON.tar.bz2
+debian/archdefs/arm/ARMa732.tar.bz2
debian/archdefs/arm64/GENERIC64.tar.bz2
debian/archdefs/i386/x86x8732.tar.bz2
debian/archdefs/mips/GENERIC32.tar.bz2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git
More information about the debian-science-commits
mailing list