From 03affdf59a5c1b1d45a11caf0deaf2be4d57fe25 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Wed, 10 Mar 1999 07:49:54 +0000 Subject: [PATCH] Patches from superior directory From-SVN: r25664 --- gcc/fixinc/fixinc.dgux | 2 +- gcc/fixinc/fixinc.irix | 2 +- gcc/fixinc/fixinc.sco | 4 ++-- gcc/fixinc/fixinc.svr4 | 36 ++++++++++++++++++++++++++++++++- gcc/fixinc/fixinc.wrap | 29 ++++++++++++++++++++++++++ gcc/fixinc/fixinc.x86-linux-gnu | 9 ++++++++- 6 files changed, 76 insertions(+), 6 deletions(-) diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux index b70e3ec99e0..71365c4fa9d 100755 --- a/gcc/fixinc/fixinc.dgux +++ b/gcc/fixinc/fixinc.dgux @@ -1,4 +1,4 @@ -# !/bin/sh +#!/bin/sh # # modified for dgux by hassey@dg-rtp.dg.com based on # diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix index 58e1585d809..1fa53a7b90f 100755 --- a/gcc/fixinc/fixinc.irix +++ b/gcc/fixinc/fixinc.irix @@ -2,7 +2,7 @@ # Install modified versions of certain problematic Irix include files. # If possible, create a wrapper (see fixinc.wrap) instead of copying files. # -# Copyright (C) 1997 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998 Free Software Foundation, Inc. # Contributed by Brendan Kehoe (brendan@cygnus.com). # # This file is part of GNU CC. diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco index 67189029cc0..e580956b17c 100755 --- a/gcc/fixinc/fixinc.sco +++ b/gcc/fixinc/fixinc.sco @@ -6,7 +6,7 @@ # Based on fixinc.svr4 script by Ron Guilmette (rfg@ncd.com) (SCO # modifications by Ian Lance Taylor (ian@airs.com)). # -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # # This file is part of GNU CC. # @@ -404,7 +404,7 @@ __EOF__ # Define _CURSES_H_WRAPPER at the end of the wrapper, not the start, # so that if #include_next gets another instance of the wrapper, # this will follow the #include_next chain until we arrive at - # the real . + # the real system include file. chmod a+r $LIB/$file fi fi diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4 index 46dec852f0d..840a7d471f0 100755 --- a/gcc/fixinc/fixinc.svr4 +++ b/gcc/fixinc/fixinc.svr4 @@ -1,7 +1,7 @@ #! /bin/sh # Install modified versions of certain ANSI-incompatible # native System V Release 4 system include files. -# Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996, 1997, 1998 Free Software Foundation, Inc. # Contributed by Ron Guilmette (rfg@monkeys.com). # # This file is part of GNU CC. @@ -1536,6 +1536,40 @@ if [ \! -z "$file_to_fix" ]; then rm -f /tmp/$base fi +# Similarly for struct queue in sys/stream.h. +file=sys/stream.h +base=`basename $file` +if [ -r ${LIB}/$file ]; then + file_to_fix=${LIB}/$file +else + if [ -r ${INPUT}/$file ]; then + file_to_fix=${INPUT}/$file + else + file_to_fix="" + fi +fi +if [ \! -z "$file_to_fix" ]; then + echo Checking $file_to_fix + sed -e '/struct[ ]*queue/i\ +#ifdef __cplusplus\ +#define queue __stream_queue\ +#endif'\ + -e '/struct[ ]*queue/a\ +#ifdef __cplusplus\ +#undef queue\ +#endif' $file_to_fix > /tmp/$base + if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \ + true + else + echo Fixed $file_to_fix + mkdir -p $LIB/`dirname $file` + rm -f ${LIB}/$file + cp /tmp/$base ${LIB}/$file + chmod a+r ${LIB}/$file + fi + rm -f /tmp/$base +fi + echo 'Removing unneeded directories:' cd $LIB files=`find . -type d -print | sort -r` diff --git a/gcc/fixinc/fixinc.wrap b/gcc/fixinc/fixinc.wrap index 4be9f132a1a..ac9b5c92861 100755 --- a/gcc/fixinc/fixinc.wrap +++ b/gcc/fixinc/fixinc.wrap @@ -72,6 +72,35 @@ __EOF__ fi fi +# Similarly for struct queue in sys/stream.h. +file=sys/stream.h +if [ -r $INPUT/$file ]; then + echo Checking $INPUT/$file + if grep 'struct[ ]*queue' $INPUT/$file >/dev/null + then + echo Fixed $file + mkdir -p $LIB/`dirname $file` + rm -f $LIB/$file + cat <<'__EOF__' >$LIB/$file +#ifndef _SYS_STREAM_H_WRAPPER +#ifdef __cplusplus +# define queue __stream_queue +#endif +#include_next +#ifdef __cplusplus +# undef queue +#endif +#define _SYS_STREAM_H_WRAPPER +#endif /* _SYS_STREAM_H_WRAPPER */ +__EOF__ + # Define _SYS_STREAM_H_WRAPPER at the end of the wrapper, not the start, + # so that if #include_next gets another instance of the wrapper, + # this will follow the #include_next chain until we arrive at + # the real . + chmod a+r $LIB/$file + fi +fi + # Avoid the definition of the bool type in the Solaris 2.x curses.h when using # g++, since it's now an official type in the C++ language. file=curses.h diff --git a/gcc/fixinc/fixinc.x86-linux-gnu b/gcc/fixinc/fixinc.x86-linux-gnu index 9e32586ef2b..679933a1a96 100644 --- a/gcc/fixinc/fixinc.x86-linux-gnu +++ b/gcc/fixinc/fixinc.x86-linux-gnu @@ -136,5 +136,12 @@ __EOF__ # the real . chmod a+r $LIB/$file -exit 0 +if [ x${INSTALL_ASSERT_H} != x ] ; +then + cd ${ORIG_DIR} + rm -f include/assert.h; + cp $(srcdir)/assert.h include/assert.h; + chmod a+r include/assert.h; +fi +exit 0 -- 2.30.2