gkeating 02/11/22 18:13:42 Modified: live/gcc3/more-hdrs synthesize-float Log: Fix a merge-related problem with float.h. Revision Changes Path 1.4 +5 -30 src/live/gcc3/more-hdrs/synthesize-float Index: synthesize-float =================================================================== RCS file: /cvs/Darwin/src/live/gcc3/more-hdrs/synthesize-float,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- synthesize-float 2002/03/05 01:57:26 1.3 +++ synthesize-float 2002/11/23 02:13:42 1.4 @@ -2,50 +2,25 @@ # # Synthesize float.h to be installed in the the system. # -# This is a combined header made up gcc3's config/float-i64.h and -# float-i386.h. +# This used to do all sorts of things, but now it just makes one change +# to support FLT_ROUNDS. # # This script is only called from the top-level GNUmakefile. It # is called as follows: # # synthesize_float $(SRCROOT) file $(RC_RELEASE) # -# i.e., it will combine $(SRCROOT)/gcc/config/float-i64.h and -# $(SRCROOT)/gcc/config/float-i386.h and output the header into -# the file. +# i.e., it will process $(SRCROOT)/gcc/config/float.h and +# and output the header into the file. # -# Note that there is some additional C99-compatible definitions for -# FLT_ROUNDS based on whether __fegetfltrounds() is available to -# the system or not. It is definitely not for Proton. And we -# dynamically test for it for other releases. Hence the third -# argument to this script. Probably in the future we can always -# assume __fegetfltrounds() exists and just unconditionally -# generate the additional definitions. But until then... -# cat <<EOF >"$2" /* float.h */ #ifndef _FLOAT_H_ #define _FLOAT_H_ -/* This is a combined header derived from gcc/config/float-i64.h for - ppc and gcc/config/float-i386.h for the x86. */ - -#ifdef __i386__ - EOF - -cat "$1"/gcc/config/float-i386.h | grep -v _FLOAT_H___ | grep -v _FLOAT_H_ >>"$2" - -cat <<EOF >>"$2" -#else /* !__i386__ */ -EOF - -cat "$1"/gcc/config/float-i64.h | grep -v _FLOAT_H___ | grep -v _FLOAT_H_ >>"$2" - -cat <<EOF >>"$2" -#endif /* !__i386__ */ -EOF +cat "$1"/gcc/ginclude/float.h | grep -v _FLOAT_H___ >>"$2" cat <<EOF >/tmp/fegetfltrounds$$.c extern int __fegetfltrounds (void);