Add support for kfreebsd-*, armel and armhf archs

2 files changed, 8 insertions, 4 deletions

diff --git a/debian/control b/debian/control
index 85981a1e2..10957dfa1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.1
 Homepage: http://golang.org/
 
 Package: golang-go
-Architecture: i386 amd64
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Recommends: golang-tools
 Provides: go-compiler
@@ -28,7 +28,7 @@ Description: Go programming language compiler
  dynamically typed, interpreted language.
 
 Package: golang-src
-Architecture: i386 amd64
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, golang-go
 Recommends: golang-tools
 Description: Go programming language compiler (.go source files)
@@ -70,7 +70,7 @@ Description: Documentation for Google's Go programming language
  TODO: Pregenerate HTML documentation to /usr/share/doc/golang-doc/html
 
 Package: golang-tools
-Architecture: i386 amd64
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${misc:Depends}
 Recommends: golang-src
 Description: Tools for Google's Go programming language
diff --git a/debian/rules b/debian/rules
index a01fdca08..35f2bf161 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,10 +90,14 @@ else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
     GOARCH := amd64
     GOHOSTARCH := amd64
     GOPREFIX := 6
-else ifeq (,$(findstring $(DEB_HOST_ARCH_CPU), arm armeb armel))
+else ifeq (,$(findstring $(DEB_HOST_ARCH_CPU), armel))
     GOARCH := arm
     GOARM := 5
     GOPREFIX := 5
+else ifeq (,$(findstring $(DEB_HOST_ARCH_CPU), armhf))
+    GOARCH := arm
+    GOARM := 6
+    GOPREFIX := 5
 else
     $(warning unrecognized instruction set $(DEB_HOST_ARCH_CPU)! continuing.)
     GOARCH := $(DEB_HOST_ARCH_CPU)