Wed Oct 5 19:25:49 2016 UTC ()
revert our changes; softfloat removal is now done in libgcc/config.host


(christos)
diff -r1.88 -r1.89 src/tools/gcc/mknative-gcc
cvs diff -r1.88 -r1.89 src/tools/gcc/mknative-gcc (expand / switch to unified diff)

--- src/tools/gcc/mknative-gcc 2016/10/05 14:16:12 1.88
+++ src/tools/gcc/mknative-gcc 2016/10/05 19:25:49 1.89
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh 1#!/bin/sh
2# $NetBSD: mknative-gcc,v 1.88 2016/10/05 14:16:12 christos Exp $ 2# $NetBSD: mknative-gcc,v 1.89 2016/10/05 19:25:49 christos 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 gcc. 5# platform build of gcc.
6# 6#
7# This version is for GCC 5.3 7# This version is for GCC 5.3
8 8
9# initialise 9# initialise
10 10
11_TMPDIR=$2 11_TMPDIR=$2
12_TOP=$3 12_TOP=$3
13_SRC=$4 13_SRC=$4
14_PLATFORM=$5 14_PLATFORM=$5
15_DESTDIR=$6 15_DESTDIR=$6
@@ -49,50 +49,45 @@ get_libg2c () { @@ -49,50 +49,45 @@ get_libg2c () {
49 getvars $_PLATFORM/libf2c/Makefile \ 49 getvars $_PLATFORM/libf2c/Makefile \
50 F2CEXT 50 F2CEXT
51 getvars $_PLATFORM/libf2c/libF77/Makefile \ 51 getvars $_PLATFORM/libf2c/libF77/Makefile \
52 ALL_CFLAGS OBJS 52 ALL_CFLAGS OBJS
53 getvars $_PLATFORM/libf2c/libI77/Makefile \ 53 getvars $_PLATFORM/libf2c/libI77/Makefile \
54 ALL_CFLAGS OBJS | sed 's,=,+=,' 54 ALL_CFLAGS OBJS | sed 's,=,+=,'
55 getvars $_PLATFORM/libf2c/libU77/Makefile \ 55 getvars $_PLATFORM/libf2c/libU77/Makefile \
56 ALL_CFLAGS OBJS | sed 's,=,+=,' 56 ALL_CFLAGS OBJS | sed 's,=,+=,'
57 } | write_mk $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/defs.mk 57 } | write_mk $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/defs.mk
58} 58}
59 59
60##### lib/libgcc ##### 60##### lib/libgcc #####
61 61
62skipsoftfloat() { 
63 sed -e 's@${GNUHOSTDIST}/libgcc/soft-fp/[a-z0-9]*.c@@g' -e 's@ @@g' 
64} 
65 
66get_libgcc () { 62get_libgcc () {
67 _subdir="$1" 63 _subdir="$1"
68 mkdir -p $_OUTDIR/lib/lib$_subdir/arch 64 mkdir -p $_OUTDIR/lib/lib$_subdir/arch
69 65
70 # DPBIT, FPBIT only used on mn10[23]00, we don't need them. 66 # DPBIT, FPBIT only used on mn10[23]00, we don't need them.
71 # XXX we should probably grab everything Just In Case for 67 # XXX we should probably grab everything Just In Case for
72 # the future. 68 # the future.
73 69
74 mkdir -p $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH 70 mkdir -p $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH
75 cd $_TMPDIR/$_PLATFORM/libgcc 71 cd $_TMPDIR/$_PLATFORM/libgcc
76 { 72 {
77 getvars $_PLATFORM/libgcc/Makefile \ 73 getvars $_PLATFORM/libgcc/Makefile \
78 INCLUDES LIB2ADDEH LIB2ADD_ST \ 74 INCLUDES LIB2ADD LIB2ADDEH LIB2ADD_ST \
79 LIB1ASMFUNCS LIB1ASMSRC \ 75 LIB1ASMFUNCS LIB1ASMSRC \
80 LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \ 76 LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
81 LIB2FUNCS_EXTRA \ 77 LIB2FUNCS_EXTRA \
82 LIBGCC2_CFLAGS \ 78 LIBGCC2_CFLAGS \
83 SHLIB_MKMAP SHLIB_MKMAP_OPTS \ 79 SHLIB_MKMAP SHLIB_MKMAP_OPTS \
84 SHLIB_MAPFILES SHLIB_NM_FLAGS 80 SHLIB_MAPFILES SHLIB_NM_FLAGS
85 getvars $_PLATFORM/libgcc/Makefile LIB2ADD | skipsoftfloat 
86 getvars gcc/Makefile \ 81 getvars gcc/Makefile \
87 NOEXCEPTION_FLAGS EXTRA_HEADERS 82 NOEXCEPTION_FLAGS EXTRA_HEADERS
88 getlinks config.status libgcc 83 getlinks config.status libgcc
89 } | sanitise_includes \ 84 } | sanitise_includes \
90 | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk 85 | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
91 86
92 if [ "${MACHINE_ARCH}" = "m68000" ] 87 if [ "${MACHINE_ARCH}" = "m68000" ]
93 then 88 then
94 ex <<__EOF__ $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk 89 ex <<__EOF__ $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
95/G_LIBGCC2_CFLAGS/ s/-fPIC// 90/G_LIBGCC2_CFLAGS/ s/-fPIC//
96wq 91wq
97__EOF__ 92__EOF__
98 fi 93 fi