diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff0ebecd908..d08336eeed9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-16  Matthias Klose  <doko@ubuntu.com>
+
+	* config/pa/t-linux: New file; define MULTIARCH_DIRNAME.
+	* config.gcc <hppa*64*-*-linux*, hppa*-*-linux*> (tmake_file):
+	Include pa/t-linux.
+
 2012-11-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/54073
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 372d4dceb56..8c2617078e1 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1047,6 +1047,7 @@ hppa*64*-*-linux*)
 	tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h gnu-user.h linux.h \
 		 glibc-stdint.h pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h \
 		 pa/pa64-linux.h"
+	tmake_file="${tmake_file} pa/t-linux"
 	gas=yes gnu_ld=yes
 	need_64bit_hwint=yes
 	;;
@@ -1054,6 +1055,7 @@ hppa*-*-linux*)
 	target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
+	tmake_file="${tmake_file} pa/t-linux"
 	;;
 hppa*-*-openbsd*)
 	target_cpu_default="MASK_PA_11"
diff --git a/gcc/config/pa/t-linux b/gcc/config/pa/t-linux
new file mode 100644
index 00000000000..f9f2b0a3cec
--- /dev/null
+++ b/gcc/config/pa/t-linux
@@ -0,0 +1 @@
+MULTIARCH_DIRNAME = $(call if_multiarch,hppa-linux-gnu)