Thu Oct 13 19:52:33 2011 UTC ()
Fix PPC _SOFT_FLOAT


(matt)
diff -r1.64 -r1.65 src/tools/gcc/mknative-gcc
cvs diff -r1.64 -r1.65 src/tools/gcc/mknative-gcc (expand / switch to unified diff)

--- src/tools/gcc/mknative-gcc 2011/09/23 06:43:46 1.64
+++ src/tools/gcc/mknative-gcc 2011/10/13 19:52:33 1.65
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh 1#!/bin/sh
2# $NetBSD: mknative-gcc,v 1.64 2011/09/23 06:43:46 mrg Exp $ 2# $NetBSD: mknative-gcc,v 1.65 2011/10/13 19:52:33 matt Exp $
3# 3#
4# Shell script for generating all the constants needed for a native 4# Shell script for generating all the constants needed for a native
5# platform build of src/gnu/dist/gcc. 5# platform build of src/gnu/dist/gcc.
6# 6#
7 7
8# initialise 8# initialise
9 9
10_TMPDIR=$2 10_TMPDIR=$2
11_TOP=$3 11_TOP=$3
12_PLATFORM=$4 12_PLATFORM=$4
13_DESTDIR=$5 13_DESTDIR=$5
14_ABI=$6 14_ABI=$6
15_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'` 15_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
@@ -627,38 +627,38 @@ get_gcc () { @@ -627,38 +627,38 @@ get_gcc () {
627 gcc) 627 gcc)
628 write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h 628 write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
629 hfiles='auto-host configargs gthr-default tm bconfig config multilib bversion plugin-version' 629 hfiles='auto-host configargs gthr-default tm bconfig config multilib bversion plugin-version'
630 ;; 630 ;;
631 esac 631 esac
632 for f in $hfiles; do 632 for f in $hfiles; do
633 write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h 633 write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
634 if [ "${MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ] 634 if [ "${MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
635 then 635 then
636 ex <<__EOF__ $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h 636 ex <<__EOF__ $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
637/configuration_arguments/ s/$// 637/configuration_arguments/ s/$//
638ya 638ya
639i 639i
640#ifdef _SOFT_FLOAT_ 640#ifdef _SOFT_FLOAT
641. 641.
642pu 642pu
643s/";$/ -with-float=soft";/ 643s/";$/ -with-float=soft";/
644a 644a
645#else 645#else
646#endif 646#endif
647. 647.
648. m +1 648. m +1
649/configure_default_options/ s/{ NULL.*$// 649/configure_default_options/ s/{ NULL.*$//
650a 650a
651#ifdef _SOFT_FLOAT_ 651#ifdef _SOFT_FLOAT
652 { "float", "soft" }, 652 { "float", "soft" },
653#endif 653#endif
654 { NULL, NULL } 654 { NULL, NULL }
655}; 655};
656. 656.
657wq 657wq
658__EOF__ 658__EOF__
659 fi 659 fi
660 done 660 done
661 661
662 # keep identical 662 # keep identical
663 for f in all-tree.def; do 663 for f in all-tree.def; do
664 cp $_TMPDIR/gcc/$f $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f 664 cp $_TMPDIR/gcc/$f $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f