Merge branch 'master' into debian-master

[deb/packages.git] / templates / config / architectures.tmpl

diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 02b7e8ea6837ab558192bcfe79b1b6f6666cd6a1..607e98d2cf80abe2e9ab49fb15662c8939ab420b 100644 (file)
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -12,12 +12,14 @@ architectures = {
         mips    => g('MIPS (big-endian)'),
         mipsel  => g('MIPS (little-endian)'),
         s390    => g('IBM S/390'),
+        s390x   => g('IBM System z'),
         "hurd-i386" => g('Hurd (i386)'),
         amd64   => g('AMD64'),
         armel   => g('EABI ARM'),
         "kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
         "kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
         avr32   => g('AVR32'),
+        armhf   => g('ARM Hard Float'),
         powerpcspe => g('PowerPC SPE (e500 core)'),
         sh4     => g('SH4'),
         sparc64 => g('Sparc64'),