OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get size_t typedef using gcc, not cc 

From-SVN: r5133
This commit is contained in:
Ian Lance Taylor 1993-08-11 13:22:45 +00:00
parent 64e026bced
commit cc08b87dab
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/Makefile.in
View File

@ -1381,7 +1381,7 @@ stmp-headers: stmp-int-hdrs gfloat.h
touch stmp-headers touch stmp-headers
# Build fixed copies of system files. # Build fixed copies of system files.
stmp-fixinc: $(srcdir)/$(FIXINCLUDES) gsyslimits.h stmp-fixinc: $(srcdir)/$(FIXINCLUDES) gsyslimits.h xgcc cpp
rm -rf include rm -rf include
mkdir include mkdir include
if [ x$(FIXINCLUDES) != xMakefile.in ]; \ if [ x$(FIXINCLUDES) != xMakefile.in ]; \
@ -1389,7 +1389,7 @@ stmp-fixinc: $(srcdir)/$(FIXINCLUDES) gsyslimits.h
for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \ for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
if [ -d $$dir ]; \ if [ -d $$dir ]; \
then \ then \
$(srcdir)/$(FIXINCLUDES) include $$dir $(srcdir); \ $(srcdir)/$(FIXINCLUDES) include $$dir $(srcdir) "`pwd`/xgcc -B`pwd`/"; \
else true; fi; \ else true; fi; \
done; \ done; \
else true; \ else true; \

12
gcc/fixincludes
View File

@ -5,6 +5,9 @@
# See README-fixinc for more information. # See README-fixinc for more information.
# Command to run gcc.
GCCCMD=${4-${GCCCMD-gcc}}
# Directory where gcc sources (and sometimes special include files) live. # Directory where gcc sources (and sometimes special include files) live.
# fixincludes doesn't use this, but fixinc.svr4 does, and I want to make # fixincludes doesn't use this, but fixinc.svr4 does, and I want to make
# sure somebody doesn't try to use arg3 for something incompatible. -- gumby # sure somebody doesn't try to use arg3 for something incompatible. -- gumby
@ -340,14 +343,13 @@ for file in sys/types.h stdlib.h sys/stdtypes.h; do
if [ -r ${LIB}/$file ]; then if [ -r ${LIB}/$file ]; then
echo Fixing $file comment echo Fixing $file comment
# Extract the definition of SIZE_TYPE, if any. # Get the definition of __SIZE_TYPE__, if any.
# (This file must be called something.c). # (This file must be called something.c).
echo "#include \"tm.h\" echo "__SIZE_TYPE__" > ${LIB}/types.c
gobblegobble SIZE_TYPE" > ${LIB}/types.c foo=`${GCCCMD} -E -P ${LIB}/types.c`
foo=`cd ${LIB}; cc -E -I${ORIGDIR} -I${SRCDIR} -I${SRCDIR}/config types.c | grep gobblegobble | sed -e "s/gobblegobble[ ]*//"`
rm -f ${LIB}/types.c rm -f ${LIB}/types.c
# Default to our preferred type. # Default to our preferred type.
if [ "$foo" = SIZE_TYPE ]; then foo="unsigned long int"; else foo=`echo $foo | sed -e 's/^.*"\(.*\)".*$/\1/'`; fi if [ "$foo" = __SIZE_TYPE__ ]; then foo="unsigned long int"; fi
sed -e "s/typedef[ a-z_]*[ ]size_t/typedef $foo size_t/" ${LIB}/$file > ${LIB}/${file}.sed sed -e "s/typedef[ a-z_]*[ ]size_t/typedef $foo size_t/" ${LIB}/$file > ${LIB}/${file}.sed
rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
if cmp $file ${LIB}/$file >/dev/null 2>&1; then if cmp $file ${LIB}/$file >/dev/null 2>&1; then