From f0df8029725de327adb209d5f9cc4948f5456ab1 Mon Sep 17 00:00:00 2001 From: Douglas B Rupp Date: Sun, 13 Jan 2002 07:28:40 -0500 Subject: [PATCH] Makefile.in (LIB2FUNCS): Split into LIB2FUNCS_1 and LIB2FUNCS_2. * Makefile.in (LIB2FUNCS): Split into LIB2FUNCS_1 and LIB2FUNCS_2. * mklibgcc.in (LIB2FUNCS): Split into LIB2FUNCS_1 and LIB2FUNCS_2. From-SVN: r48816 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 22 +++++++++++----------- gcc/mklibgcc.in | 16 ++++++++++------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae2f1f9de35b..f58701aa4f48 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 13 07:23:01 2002 Douglas B Rupp + + * Makefile.in (LIB2FUNCS): Split into LIB2FUNCS_1 and LIB2FUNCS_2. + * mklibgcc.in (LIB2FUNCS): Split into LIB2FUNCS_1 and LIB2FUNCS_2. + Sun Jan 13 06:55:31 2002 Richard Kenner * dwarf2out.c (mem_loc_descriptor, case ADDRESSOF): New case. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6ebbb2e87d16..ab4ad8a30969 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1,7 +1,6 @@ # Makefile for GNU C compiler. -# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995 -# 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 +# 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. #This file is part of GCC. @@ -759,14 +758,14 @@ STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \ $(LANG_STAGESTUFF) # Library members defined in libgcc2.c. -LIB2FUNCS = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 _clz \ +# Variable length limited to 255 charactes when passed to a shell script. +LIB2FUNCS_1 = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 _clz \ _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \ - _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi \ - _fixxfdi _fixunsxfdi _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi \ - _floatditf \ - _clear_cache _trampoline __main _exit \ - _absvsi2 _absvdi2 _addvsi3 _addvdi3 _subvsi3 _subvdi3 \ - _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors + _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi + +LIB2FUNCS_2 = _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf \ + _clear_cache _trampoline __main _exit _absvsi2 _absvdi2 _addvsi3 \ + _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors # Defined in libgcc2.c, included only in the static library. LIB2FUNCS_ST = _eprintf _bb __gcc_bcmp @@ -979,7 +978,8 @@ LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext) objext='$(objext)' \ LIB1ASMFUNCS='$(LIB1ASMFUNCS)' \ - LIB2FUNCS='$(LIB2FUNCS)' \ + LIB2FUNCS_1='$(LIB2FUNCS_1)' \ + LIB2FUNCS_2='$(LIB2FUNCS_2)' \ LIB2FUNCS_ST='$(LIB2FUNCS_ST)' \ LIB2ADD='$(LIB2ADD)' \ LIB2ADD_ST='$(LIB2ADD_ST)' \ diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 8f9174a0f5d6..bcc03e26c3b0 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -1,6 +1,6 @@ #!/bin/sh # Construct makefile for libgcc. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002 Free Software Foundation, Inc. # # This file is part of GCC. @@ -9,7 +9,8 @@ # # objext # LIB1ASMFUNCS -# LIB2FUNCS +# LIB2FUNCS_1 +# LIB2FUNCS_2 # LIB2FUNCS_ST # LIB2ADD # LIB2ADD_ST @@ -81,9 +82,12 @@ for name in $LIB1ASMFUNCS; do # Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are # defined as optimized assembly code in LIB1ASMFUNCS. - LIB2FUNCS=`echo $LIB2FUNCS | sed -e 's/^'$name' //' \ - -e 's/ '$name' / /' \ - -e 's/ '$name'$//'` + LIB2FUNCS_1=`echo $LIB2FUNCS_1 | sed -e 's/^'$name' //' \ + -e 's/ '$name' / /' \ + -e 's/ '$name'$//'` + LIB2FUNCS_2=`echo $LIB2FUNCS_2 | sed -e 's/^'$name' //' \ + -e 's/ '$name' / /' \ + -e 's/ '$name'$//'` LIB2_DIVMOD_FUNCS=`echo $LIB2_DIVMOD_FUNCS | sed -e 's/^'$name' //' \ -e 's/ '$name' / /' \ -e 's/ '$name'$//'` @@ -99,7 +103,7 @@ libgcc2_objs="" libgcc2_st_objs="" libgcc2_eh_objs="" -for name in $LIB2FUNCS; do +for name in $LIB2FUNCS_1 $LIB2FUNCS_2; do for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;