Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict resolution.

Browse Source
This commit is contained in:
tv 1998-09-13 16:20:35 +00:00
parent b37a043772
commit c893c988b3
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/dist/gcc/configure vendored
View File

@ -3685,7 +3685,7 @@ for machine in $build $host $target; do
xmake_file=mips/x-iris6
tmake_file=mips/t-iris6
if [ x$enable_threads = xyes ]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-wrs-vxworks)
@ -3706,7 +3706,7 @@ for machine in $build $host $target; do
# See comment in mips/iris[56].h files.
use_collect2=yes
if [ x$enable_threads = xyes ]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sni-sysv4)
@ -3749,7 +3749,7 @@ for machine in $build $host $target; do
# See comment in mips/iris5.h file.
use_collect2=yes
if [ x$enable_threads = xyes ]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-irix4loser*) # Mostly like a MIPS.
@ -3770,7 +3770,7 @@ for machine in $build $host $target; do
use_collect2=yes
fi
if [ x$enable_threads = xyes ]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-irix4*) # Mostly like a MIPS.
@ -3791,7 +3791,7 @@ for machine in $build $host $target; do
use_collect2=yes
fi
if [ x$enable_threads = xyes ]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-*) # Mostly like a MIPS.
@ -4401,7 +4401,7 @@ for machine in $build $host $target; do
fi
use_collect2=yes
;;
rs6000-ibm-aix4.[12].* | powerpc-ibm-aix4.[12].*)
rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
tm_file=rs6000/aix41.h
if [ x$host != x$target ]
then

12
gnu/dist/gcc/configure.in vendored
View File

@ -1783,7 +1783,7 @@ for machine in $build $host $target; do
xmake_file=mips/x-iris6
tmake_file=mips/t-iris6
if [[ x$enable_threads = xyes ]]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-wrs-vxworks)
@ -1804,7 +1804,7 @@ for machine in $build $host $target; do
# See comment in mips/iris[56].h files.
use_collect2=yes
if [[ x$enable_threads = xyes ]]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sni-sysv4)
@ -1847,7 +1847,7 @@ for machine in $build $host $target; do
# See comment in mips/iris5.h file.
use_collect2=yes
if [[ x$enable_threads = xyes ]]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-irix4loser*) # Mostly like a MIPS.
@ -1868,7 +1868,7 @@ for machine in $build $host $target; do
use_collect2=yes
fi
if [[ x$enable_threads = xyes ]]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-irix4*) # Mostly like a MIPS.
@ -1889,7 +1889,7 @@ for machine in $build $host $target; do
use_collect2=yes
fi
if [[ x$enable_threads = xyes ]]; then
thread_file='irix'
: not ported yet thread_file='irix'
fi
;;
mips-sgi-*) # Mostly like a MIPS.
@ -2499,7 +2499,7 @@ for machine in $build $host $target; do
fi
use_collect2=yes
;;
rs6000-ibm-aix4.[[12]].* | powerpc-ibm-aix4.[[12]].*)
rs6000-ibm-aix4.[[12]]* | powerpc-ibm-aix4.[[12]]*)
tm_file=rs6000/aix41.h
if [[ x$host != x$target ]]
then

2
gnu/dist/gcc/gcc.1 vendored
View File

@ -22,7 +22,7 @@
..
.TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools"
.SH NAME
gcc, g++ \- GNU project C and C++ Compiler (egcs-1.0)
gcc, g++ \- GNU project C and C++ Compiler (egcs-1.1)
.SH SYNOPSIS
.B gcc
.RI "[ " option " | " filename " ].\|.\|."