Applied patch for arm haiku target from Johannes Wischert (bug #3633)

The cross tools build still needs the arm specific headers in Haiku to complete (bug #3763)


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@30652 a95241bf-73f2-0310-859d-f6bbb57e9c96

binutils/bfd/config.bfd

@@ -883,6 +883,10 @@ case "${targ}" in
     targ_defvec=bfd_elf32_tradlittlemips_vec
     targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
     ;;
+  mips*el-*-haiku*)
+    targ_defvec=bfd_elf32_littlemips_vec
+    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
+    ;;
   mips*-*-netbsd*)
     targ_defvec=bfd_elf32_tradbigmips_vec
     targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"

binutils/gas/configure.tgt

@@ -291,6 +291,7 @@ case ${generic_target} in
   mips-*-elf* | mips-*-rtems*)		fmt=elf ;;
   mips-*-netbsd*)			fmt=elf em=tmips ;;
   mips-*-openbsd*)			fmt=elf em=tmips ;;
+  mips*-*-haiku*)			fmt=elf endian=little em=haiku ;;
 
   mmix-*-*)				fmt=elf ;;
 

binutils/ld/Makefile.am

@@ -212,6 +212,7 @@ ALL_EMULATIONS = \
 	eelf_i386_haiku.o \
 	eelf_i386_ldso.o \
 	eelf_ppc_haiku.o \
+	eelf_mipsel_haiku.o \
 	eelf_i386_vxworks.o \
 	eelf_s390.o \
 	egld960.o \
@@ -1039,6 +1040,9 @@ eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
 eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_ppc_haiku "$(tdir_elf_ppc_haiku)"
+eelf_mipsel_haiku.c: $(srcdir)/emulparams/elf_mipsel_haiku.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf_mipsel_haiku "$(tdir_elf_mipsel_haiku)"
 eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}

binutils/ld/Makefile.in

@@ -463,6 +463,7 @@ ALL_EMULATIONS = \
 	eelf_i386_haiku.o \
 	eelf_i386_ldso.o \
 	eelf_ppc_haiku.o \
+	eelf_mipsel_haiku.o \
 	eelf_i386_vxworks.o \
 	eelf_s390.o \
 	egld960.o \
@@ -1866,6 +1867,9 @@ eelf_i386_haiku.c: $(srcdir)/emulparams/elf_i386_haiku.sh \
 eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
+eelf_mipsel_haiku.c:  $(srcdir)/emulparams/elf_mipsel_haiku.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf_mipsel_haiku "$(tdir_elf_mipsel_haiku)"
 eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_ppc_haiku "$(tdir_elf_ppc_haiku)"

binutils/ld/configure.tgt

@@ -369,6 +369,9 @@ mips*-*-ecoff*)		targ_emul=mipsidt ;;
 mips*el-*-netbsd*)	targ_emul=elf32ltsmip
 			targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
 			;;
+mips*el-*-haiku*)	targ_emul=elf_mipsel_haiku
+			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 
+			;;
 mips*-*-netbsd*)	targ_emul=elf32btsmip
 			targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip"
   			;;

binutils/ld/emulparams/elf_mipsel_haiku.sh

@@ -0,0 +1,2 @@
+. ${srcdir}/emulparams/elf32lmip.sh
+

gcc/gcc/config.gcc

@@ -737,7 +737,6 @@ arm*-*-haiku*)
 	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf"
 	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/aout.h arm/haiku.h arm/arm.h"
 	tm_defines="USE_GAS"
-	use_fixproto=yes
 	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
@@ -1128,7 +1127,7 @@ x86_64-*-freebsd*)
 	tmake_file="${tmake_file} i386/t-crtstuff"
 	;;
 i[34567]86-*-haiku*)
-	tmake_file='i386/t-haiku i386/t-crtpic'
+	tmake_file='t-haiku i386/t-crtpic'
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h haiku.h i386/haiku.h"
 	extra_parts='crtbegin.o crtend.o'
 	;;
@@ -1645,6 +1644,8 @@ m68k-*-rtems*)
 	extra_parts="crtbegin.o crtend.o"
 	;;
 m68k-*-haiku*)
+	default_m68k_cpu=68020
+	default_cf_cpu=5206
 	tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-haiku" #??
 	tm_file="${tm_file} dbxelf.h elfos.h haiku.h m68k/haiku.h"
 	tm_defines="MOTOROLA USE_GAS"
@@ -1800,6 +1801,11 @@ mips-*-elf* | mipsel-*-elf*)
 	tmake_file="mips/t-elf mips/t-libgcc-mips16"
 	use_fixproto=yes
 	;;
+mipsel-*-haiku*)
+	tmake_file='mips/t-elf t-haiku'
+	tm_file="elfos.h ${tm_file} haiku.h mips/haiku.h"
+	extra_parts='crtbegin.o crtend.o'
+	;;
 mips64-*-elf* | mips64el-*-elf*)
 	tm_file="elfos.h ${tm_file} mips/elf.h"
 	tmake_file="mips/t-elf mips/t-libgcc-mips16"

gcc/gcc/config/arm/haiku.h

@@ -21,7 +21,8 @@
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (ARM Haiku/ELF)");
-
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START "@"
 /* Unsigned chars produces much better code than signed.  */
 #define DEFAULT_SIGNED_CHAR  0
 

gcc/gcc/config/haiku.h

@@ -62,7 +62,7 @@ Boston, MA 02111-1307, USA.  */
    it was i386-mcount.o, but that doesn't exist in gcc 2.95.3 either. */
 
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart:start_dyn.o%s} init_term_dyn.o%s %{p:mcount.o%s}"
+#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s %{p:mcount.o%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend.o%s crtn.o%s"
@@ -83,6 +83,8 @@ Boston, MA 02111-1307, USA.  */
     { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
     { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
     { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \
+    { "/boot/home/config/include", 0, 0, 0, 0, 0 }, \
+    { "/boot/common/include", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/os", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/os/app", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/os/device", 0, 0, 0, 0, 0 }, \
@@ -106,7 +108,7 @@ Boston, MA 02111-1307, USA.  */
     { "/boot/develop/headers/os/be_apps/Deskbar", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/os/be_apps/NetPositive", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/os/be_apps/Tracker", 0, 0, 0, 0, 0 }, \
-    { "/boot/develop/headers/gnu", 0, 0, 0, 0, 0 }, \
+    { "/boot/develop/headers/3rdparty", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/cpp", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/bsd", 0, 0, 0, 0, 0 }, \
     { "/boot/develop/headers/posix", 0, 0, 0, 0, 0 }, \
@@ -146,7 +148,7 @@ Boston, MA 02111-1307, USA.  */
     { CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 0, 1, 0 }, \
     { CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 0, 1, 0 }, \
     { CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 0, 1, 0 }, \
-    { CROSS_INCLUDE_DIR "/gnu", 0, 0, 0, 1, 0 }, \
+    { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0, 1, 0 }, \
     { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0, 1, 0 }, \
     { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0, 1, 0 }, \
     { CROSS_INCLUDE_DIR "/posix", 0, 0, 0, 1, 0 }, \

gcc/gcc/config/i386/haiku.h

@@ -69,7 +69,7 @@ Boston, MA 02111-1307, USA.  */
 /* If ELF is the default format, we should not use /lib/elf.  */
 
 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m elf_i386_haiku -shared -no-undefined -Bsymbolic %{nostart:-e 0}"
+#define LINK_SPEC "-m elf_i386_haiku -shared -Bsymbolic %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}"
 
 /* A C statement (sans semicolon) to output to the stdio stream
    FILE the assembler definition of uninitialized global DECL named

gcc/gcc/config/mips/haiku.h

@@ -0,0 +1,64 @@
+/* Definitions for MIPS running Haiku
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
+   Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+#undef TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (MIPSEL Haiku/ELF)");
+
+#undef SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+ 
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "short unsigned int"
+   
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 16
+
+#define TARGET_OS_CPP_BUILTINS()					\
+  do									\
+    {									\
+	builtin_define ("__HAIKU__");					\
+	builtin_define ("__MIPS__");					\
+	builtin_define ("__MIPSEL__");					\
+	builtin_define ("_MIPSEL_");					\
+	builtin_define ("__stdcall=__attribute__((__stdcall__))");	\
+	builtin_define ("__cdecl=__attribute__((__cdecl__))");		\
+	builtin_assert ("system=haiku");					\
+	if (flag_pic)							\
+	  {								\
+	    builtin_define ("__PIC__");					\
+	    builtin_define ("__pic__");					\
+	  }								\
+    /* Haiku apparently doesn't support merging of symbols across shared \
+       object boundaries. Hence we need to explicitly specify that \
+       type_infos are not merged, so that they get compared by name \
+       instead of by pointer. */ \
+    	builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0");		\
+	builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); 		\
+    }									\
+  while (0)
+
+#undef	LINK_SPEC
+#define LINK_SPEC "%{!o*:-o %b} -m elf_mipsel_haiku -shared -Bsymbolic %{nostart:-e 0}"
+

gcc/gcc/config/t-haiku

@@ -1,3 +1,4 @@
 # There are system headers elsewhere, but these are the ones that
 # we are most likely to want to apply any fixes to.
-NATIVE_SYSTEM_HEADER_DIR = /boot/develop/headers/posix
+NATIVE_SYSTEM_HEADER_DIR = /boot/develop/headers
+LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/posix/limits.h ]

gcc/gcc/configure.ac

@@ -945,6 +945,15 @@ AC_C_BIGENDIAN
 # --------
 
 
+# Configure -lm usage for host tools that need it
+math_library="-lm"
+case $host in
+  *-*-haiku*)
+    # no separate math library needed
+    math_library=
+    ;;
+esac
+
 # These libraries may be used by collect2.
 # We may need a special search path to get them linked.
 AC_CACHE_CHECK(for collect2 libraries, gcc_cv_collect2_libs,

gcc/libgcc/config.host

@@ -222,6 +222,8 @@ arm*-*-netbsdelf*)
 	;;
 arm*-*-netbsd*)
 	;;
+arm-*-haiku*)
+	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	;;
 arm*-*-uclinux*)		# ARM ucLinux
@@ -313,7 +315,7 @@ i[34567]86-*-freebsd*)
 	;;
 x86_64-*-freebsd*)
 	;;
-i[34567]86-*-haikuelf* | i[34567]86-*-haiku*)
+i[34567]86-*-haiku*)
 	;;
 i[34567]86-*-netbsdelf*)
 	;;
@@ -417,6 +419,8 @@ m68k-*-aout*)
 	;;
 m68k-*-coff*)
 	;;
+m68k-*-haiku*)
+	;;
 m68020-*-elf* | m68k-*-elf*)
 	;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
@@ -445,6 +449,8 @@ mips*-*-linux*)				# Linux MIPS, either endian.
 	;;
 mips*-*-openbsd*)
 	;;
+mips*-*-haiku*)
+	;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
 	;;
 mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
@@ -495,6 +501,8 @@ powerpc64-*-darwin*)
 	;;
 powerpc*-*-freebsd*)
 	;;
+powerpc-*-haiku*)
+	;;
 powerpc-*-netbsd*)
 	;;
 powerpc-*-chorusos*)

gcc/mpfr/Makefile.am

@@ -33,7 +33,7 @@ mpfr_TEXINFOS = fdl.texi
 MAKEINFOFLAGS = --enable-encoding
 
 get_patches.c: PATCHES get_patches.sh
-	./get_patches.sh > $@ || rm -f $@
+	$(srcdir)/get_patches.sh > $@ || rm -f $@
 
 # Do not add get_patches.c to CLEANFILES so that this file doesn't
 # need to be (re)built as long as no patches are applied. Anyway the

gcc/mpfr/config.guess

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-07-22'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -799,6 +799,9 @@ EOF
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -1206,6 +1216,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1474,9 +1487,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

gcc/mpfr/config.sub

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-06-28'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -813,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1021,6 +1049,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;