summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-06 15:49:17 +0000
committerKarl Berry <karl@freefriends.org>2013-04-06 15:49:17 +0000
commit283cb784aab763554848601e47b470354a1eda95 (patch)
treed6780a624620bbe6af52cf101ed88beddab02f7d /Master/tlpkg
parent2816a1b1966838288488c105a962f0fbf6f90002 (diff)
distinguish armhf-linux (hardware floating point,
e.g., RPI) from armel-linux (software floating point, e.g., Android). git-svn-id: svn://tug.org/texlive/trunk@29695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm11
1 files changed, 8 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index c55d56a4eef..48c9371efa5 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -270,10 +270,15 @@ sub platform_name {
my $OS; # O/S type as reported by config.guess.
($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
$CPU =~ s/^alpha(.*)/alpha/; # alphaev whatever
- $CPU =~ s/armv\dl/armel/; # arm whatever
+ $CPU =~ s/mips64el/mipsel/; # don't distinguish mips64 and 32 el
$CPU =~ s/powerpc64/powerpc/; # don't distinguish ppc64
$CPU =~ s/sparc64/sparc/; # don't distinguish sparc64
- $CPU =~ s/mips64el/mipsel/; # don't distinguish mips64 and 32 el
+
+ # armv6l-unknown-linux-gnueabihf -> armhf-linux (RPi)
+ # armv7l-unknown-linux-gnueabi -> armel-linux (Android)
+ if ($CPU =~ /^arm/) {
+ $CPU = $guessed_platform =~ /hf$/ ? "armhf" : "armel";
+ }
my @OSs = qw(aix cygwin darwin freebsd hpux irix
kfreebsd linux netbsd openbsd solaris);
@@ -313,10 +318,10 @@ sub platform_desc {
my %platform_name = (
'alpha-linux' => 'DEC Alpha with GNU/Linux',
- 'alphaev5-osf' => 'DEC Alphaev5 OSF',
'amd64-freebsd' => 'x86_64 with FreeBSD',
'amd64-kfreebsd' => 'x86_64 with GNU/kFreeBSD',
'armel-linux' => 'ARM with GNU/Linux',
+ 'armhf-linux' => 'ARMhf with GNU/Linux',
'hppa-hpux' => 'HP-UX',
'i386-cygwin' => 'Intel x86 with Cygwin',
'i386-darwin' => 'Intel x86 with MacOSX/Darwin',