From 84d07b425fcf5436443630c796593832f91d98de Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 1 Apr 2015 21:45:07 -0400
Subject: fix biarch definitions for the midipix targets.

signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
---
 gcc/config.gcc | 23 ++++++++++++++++++++---
 gcc/configure  |  4 ++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 47dd26e37..c301f9e11 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2794,14 +2794,31 @@ m32c-*-elf*)
 	cxx_target_objs="m32c-pragma.o"
  	;;
 *-*-midipix*)
+	if [ x"$with_arch_32" = x ]; then
+		with_arch_32=pentium4
+	fi
+
+	if [ x"$with_arch_64" = x ]; then
+		with_arch_64=x86-64
+	fi
+
 	native_system_header_dir="/include"
 	local_includedir="/local/include"
 
+	case ${target} in
+		i?86-*-*)
+			biarch_header=
+			;;
+		x86_64-*-*)
+			biarch_header=i386/biarch64.h
+			;;
+	esac
+
 	xm_file=
-	tm_file="vxworks-dummy.h i386/biarch64.h i386/i386.h i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/midipix.h glibc-stdint.h"
+	tm_file="vxworks-dummy.h $biarch_header i386/i386.h i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/midipix.h glibc-stdint.h"
 
-	xm_defines="HAVE_GAS_ALIGNED_COMM=1 __TARGET_SYMVER_REJECTED=1"
-	tm_defines="HAVE_GAS_ALIGNED_COMM=1 __TARGET_SYMVER_REJECTED=1"
+	xm_defines=
+	tm_defines=
 
 	tmake_file="i386/t-midipix t-slibgcc i386/t-gmm_malloc i386/t-i386 i386/t-fprules-softfp soft-fp/t-softfp"
 
diff --git a/gcc/configure b/gcc/configure
index da02181b1..9607d6796 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6928,7 +6928,7 @@ else
 
   case $target in
     powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
-    i?86*-*-mingw* | x86_64*-*-mingw* | \
+    i?86*-*-mingw* | x86_64*-*-mingw* | i?86*-*-midipix* | x86_64*-*-midipix* | \
     i?86*-*-cygwin*)
       enable_decimal_float=yes
       ;;
@@ -23564,7 +23564,7 @@ _ACEOF
 
     esac
     case $target_os in
-      cygwin* | pe | mingw32*)
+      cygwin* | pe | mingw32* | midipix*)
 	# Recent binutils allows the three-operand form of ".comm" on PE.  This
 	# definition is used unconditionally to initialise the default state of
 	# the target option variable that governs usage of the feature.
-- 
cgit v1.2.3