Skip to content

R
riscv-gcc-1
Commit f2682362 by Geoff Keating Committed by Geoffrey Keating
Options

In gcc/: 

	* fixinc/gnu-regex.c: Change 'CYGNUS LOCAL' to 'EGCS LOCAL'.

In gcc/ch/:
	* Make-lang.in: Remove 'CYGNUS LOCAL' markers.
	* Makefile.in: Likewise.
	* configure: Likewise.

From-SVN: r37236
parent 25f80eae
Showing with 22 additions and 23 deletions
gcc/ChangeLog
2000-11-02 Geoffrey Keating <geoffk@cygnus.com>
* fixinc/gnu-regex.c: Change 'CYGNUS LOCAL' to 'EGCS LOCAL'.
Fri Nov 3 13:41:04 2000 Mark P Mitchell <mark@codesourcery.com> Fri Nov 3 13:41:04 2000 Mark P Mitchell <mark@codesourcery.com>
* config/mips/iris6.h (SUBTARGET_CC1_SPEC): Remove -static * config/mips/iris6.h (SUBTARGET_CC1_SPEC): Remove -static
......
gcc/ch/ChangeLog
2000-11-02 Geoffrey Keating <geoffk@cygnus.com>
* Make-lang.in: Remove 'CYGNUS LOCAL' markers.
* Makefile.in: Likewise.
* configure: Likewise.
2000-10-07 Joseph S. Myers <jsm28@cam.ac.uk> 2000-10-07 Joseph S. Myers <jsm28@cam.ac.uk>
* Makefile.in ($(srcdir)/hash.h): Refer to GNU FTP site for * Makefile.in ($(srcdir)/hash.h): Refer to GNU FTP site for
......
gcc/ch/Make-lang.in
...@@ -170,7 +170,7 @@ CHILL.extraclean: ...@@ -170,7 +170,7 @@ CHILL.extraclean:
CHILL.maintainer-clean: CHILL.maintainer-clean:
-rm -f ch/TAGS -rm -f ch/TAGS
-rm -f ch/chill.info* ch/chill.dvi ch/chill.??s ch/chill.*aux -rm -f ch/chill.info* ch/chill.dvi ch/chill.??s ch/chill.*aux
# CYGNUS LOCAL: Delete locally created file. # Delete locally created file.
-rm -f ch/hash.h -rm -f ch/hash.h
# #
# Stage hooks: # Stage hooks:
......
gcc/ch/Makefile.in
...@@ -75,7 +75,7 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) ...@@ -75,7 +75,7 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS)
# These are used because `configure' appends `cross-make' # These are used because `configure' appends `cross-make'
# to the makefile when making a cross-compiler. # to the makefile when making a cross-compiler.
# CYGNUS LOCAL: we don't use cross-make. Instead we use the tools # We don't use cross-make. Instead we use the tools
# from the build tree, if they are available. # from the build tree, if they are available.
# program_transform_name and objdir are set by configure.in. # program_transform_name and objdir are set by configure.in.
program_transform_name = program_transform_name =
...@@ -91,7 +91,6 @@ tmake_file=@dep_tmake_file@ ...@@ -91,7 +91,6 @@ tmake_file=@dep_tmake_file@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
# CYGNUS LOCAL
# Directory where texinfo.tex lives # Directory where texinfo.tex lives
# texidir = $(srcdir)/../../texinfo # texidir = $(srcdir)/../../texinfo
......
gcc/ch/configure
...@@ -75,13 +75,12 @@ prefix=/usr/local ...@@ -75,13 +75,12 @@ prefix=/usr/local
# Think THREE TIMES before specifying any other value for this! # Think THREE TIMES before specifying any other value for this!
# DO NOT make this use $prefix! # DO NOT make this use $prefix!
local_prefix=/usr/local local_prefix=/usr/local
# CYGNUS LOCAL: for our purposes, this must be prefix. This is apparently # For our purposes, this must be prefix. This is apparently
# only done for the benefit of glibc, and we don't use glibc. # only done for the benefit of glibc, and we don't use glibc.
local_prefix='$(prefix)' local_prefix='$(prefix)'
# Default is to let the Makefile set exec_prefix from $(prefix) # Default is to let the Makefile set exec_prefix from $(prefix)
exec_prefix='$(prefix)' exec_prefix='$(prefix)'
# CYGNUS LOCAL. Default to nothing.
program_transform_name= program_transform_name=
program_transform_set= program_transform_set=
site= site=
...@@ -134,7 +133,7 @@ do ...@@ -134,7 +133,7 @@ do
exec_prefix=$arg exec_prefix=$arg
next_arg= next_arg=
;; ;;
--program-transform-name) # CYGNUS LOCAL --program-transform-name)
# Double any backslashes or dollar signs in the argument. # Double any backslashes or dollar signs in the argument.
if [ -n "${arg}" ] ; then if [ -n "${arg}" ] ; then
program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
...@@ -142,21 +141,21 @@ do ...@@ -142,21 +141,21 @@ do
program_transform_set=yes program_transform_set=yes
next_arg= next_arg=
;; ;;
--program-prefix) # CYGNUS LOCAL --program-prefix)
if [ -n "${arg}" ]; then if [ -n "${arg}" ]; then
program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`,"
fi fi
program_transform_set=yes program_transform_set=yes
next_arg= next_arg=
;; ;;
--program-suffix) # CYGNUS LOCAL --program-suffix)
if [ -n "${arg}" ]; then if [ -n "${arg}" ]; then
program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`,"
fi fi
program_transform_set=yes program_transform_set=yes
next_arg= next_arg=
;; ;;
--site) # CYGNUS LOCAL --site)
site=${arg} site=${arg}
next_arg= next_arg=
;; ;;
...@@ -220,7 +219,6 @@ do ...@@ -220,7 +219,6 @@ do
| --program-trans | --program-tran | --program-tra \ | --program-trans | --program-tran | --program-tra \
| --program-tr | --program-t) | --program-tr | --program-t)
next_arg=--program-transform-name next_arg=--program-transform-name
# CYGNUS LOCAL
;; ;;
-program-transform-name=* | --program-transform-name=* \ -program-transform-name=* | --program-transform-name=* \
| --program-transform-nam=* | --program-transform-na=* \ | --program-transform-nam=* | --program-transform-na=* \
...@@ -228,7 +226,6 @@ do ...@@ -228,7 +226,6 @@ do
| --program-transform=* | --program-transfor=* | --program-transfo=* \ | --program-transform=* | --program-transfor=* | --program-transfo=* \
| --program-transf=* | --program-trans=* | --program-tran=* \ | --program-transf=* | --program-trans=* | --program-tran=* \
| --program-tra=* | --program-tr=* | --program-t=*) | --program-tra=* | --program-tr=* | --program-t=*)
# CYGNUS LOCAL
arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'`
# Double any \ or $ in the argument. # Double any \ or $ in the argument.
if [ -n "${arg}" ] ; then if [ -n "${arg}" ] ; then
...@@ -240,12 +237,10 @@ do ...@@ -240,12 +237,10 @@ do
| --program-pref | --program-pre | --program-pr \ | --program-pref | --program-pre | --program-pr \
| --program-p) | --program-p)
next_arg=--program-prefix next_arg=--program-prefix
# CYGNUS LOCAL
;; ;;
-program-prefix=* | --program-prefix=* | --program-prefi=* \ -program-prefix=* | --program-prefix=* | --program-prefi=* \
| --program-pref=* | --program-pre=* | --program-pr=* \ | --program-pref=* | --program-pre=* | --program-pr=* \
| --program-p=*) | --program-p=*)
# CYGNUS LOCAL
arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'`
if [ -n "${arg}" ]; then if [ -n "${arg}" ]; then
program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`,"
...@@ -256,22 +251,20 @@ do ...@@ -256,22 +251,20 @@ do
| --program-suff | --program-suf | --program-su \ | --program-suff | --program-suf | --program-su \
| --program-s) | --program-s)
next_arg=--program-suffix next_arg=--program-suffix
# CYGNUS LOCAL
;; ;;
-program-suffix=* | --program-suffix=* | --program-suffi=* \ -program-suffix=* | --program-suffix=* | --program-suffi=* \
| --program-suff=* | --program-suf=* | --program-su=* \ | --program-suff=* | --program-suf=* | --program-su=* \
| --program-s=*) | --program-s=*)
# CYGNUS LOCAL
arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'`
if [ -n "${arg}" ]; then if [ -n "${arg}" ]; then
program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`,"
fi fi
program_transform_set=yes program_transform_set=yes
;; ;;
-site | --site | --sit) # CYGNUS LOCAL -site | --site | --sit)
next_arg=--site next_arg=--site
;; ;;
-site=* | --site=* | --sit=* | --si=*) # CYGNUS LOCAL -site=* | --site=* | --sit=* | --si=*)
site=`echo ${arg} | sed 's/^[-a-z]*=//'` site=`echo ${arg} | sed 's/^[-a-z]*=//'`
;; ;;
-with-gnu-ld | --with-gnu-ld | --with-gnu-l) -with-gnu-ld | --with-gnu-ld | --with-gnu-l)
...@@ -517,7 +510,6 @@ EOF ...@@ -517,7 +510,6 @@ EOF
tmake_file=../Makefile.in tmake_file=../Makefile.in
fi fi
# CYGNUS LOCAL
# Conditionalize the makefile for this site. # Conditionalize the makefile for this site.
if [ -f ${mainsrcdir}/config/ms-${site} ] if [ -f ${mainsrcdir}/config/ms-${site} ]
then then
...@@ -528,7 +520,6 @@ EOF ...@@ -528,7 +520,6 @@ EOF
mv Makefile.xx Makefile.tem mv Makefile.xx Makefile.tem
fi fi
# CYGNUS LOCAL
# If this is a cross compilation, and we have newlib in the build # If this is a cross compilation, and we have newlib in the build
# tree, then define inhibit_libc in LIBGCC2_CFLAGS. This will cause # tree, then define inhibit_libc in LIBGCC2_CFLAGS. This will cause
# __eprintf to be left out of libgcc.a, but that's OK because newlib # __eprintf to be left out of libgcc.a, but that's OK because newlib
...@@ -544,7 +535,6 @@ EOF ...@@ -544,7 +535,6 @@ EOF
# `tmake_file', `prefix', `local_prefix', `exec_prefix', `FIXINCLUDES' # `tmake_file', `prefix', `local_prefix', `exec_prefix', `FIXINCLUDES'
# and `INSTALL_HEADERS_DIR' values in the Makefile from the values # and `INSTALL_HEADERS_DIR' values in the Makefile from the values
# they have in this script. # they have in this script.
# CYGNUS LOCAL: FLOAT_H, CROSS_FLOAT_H, objdir
rm -f Makefile.xx rm -f Makefile.xx
sed -e "s/ //" -e "s/^target=.*$/target=${target}/" \ sed -e "s/ //" -e "s/^target=.*$/target=${target}/" \
-e "s|^xmake_file=.*$|xmake_file=${host_xmake_file}|" \ -e "s|^xmake_file=.*$|xmake_file=${host_xmake_file}|" \
......
gcc/fixinc/gnu-regex.c
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#endif #endif
/* This is for other GNU distributions with internationalized messages. */ /* This is for other GNU distributions with internationalized messages. */
/* CYGNUS LOCAL: ../intl will handle this for us */ /* EGCS LOCAL: ../intl will handle this for us */
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
# include <libintl.h> # include <libintl.h>
#else #else
...@@ -194,7 +194,7 @@ init_syntax_once () ...@@ -194,7 +194,7 @@ init_syntax_once ()
#endif /* not emacs */ #endif /* not emacs */
/* Get the interface, including the syntax bits. */ /* Get the interface, including the syntax bits. */
/* CYGNUS LOCAL: call it gnu-regex.h, not regex.h, to avoid name conflicts */ /* EGCS LOCAL: call it gnu-regex.h, not regex.h, to avoid name conflicts */
#include "gnu-regex.h" #include "gnu-regex.h"
/* isalpha etc. are used for the character classes. */ /* isalpha etc. are used for the character classes. */
...@@ -2210,7 +2210,7 @@ regex_compile (pattern, size, syntax, bufp) ...@@ -2210,7 +2210,7 @@ regex_compile (pattern, size, syntax, bufp)
the leading `:' and `[' (but set bits for them). */ the leading `:' and `[' (but set bits for them). */
if (c == ':' && *p == ']') if (c == ':' && *p == ']')
{ {
/* CYGNUS LOCAL: Skip this code if we don't have btowc(). btowc() is */ /* EGCS LOCAL: Skip this code if we don't have btowc(). btowc() is */
/* defined in the 1994 Amendment 1 to ISO C and may not be present on */ /* defined in the 1994 Amendment 1 to ISO C and may not be present on */
/* systems where we have wchar.h and wctype.h. */ /* systems where we have wchar.h and wctype.h. */
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC) #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment