diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ch/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ch/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/ch/Makefile.in | 3 | ||||
| -rwxr-xr-x | gcc/ch/configure | 24 | ||||
| -rw-r--r-- | gcc/fixinc/gnu-regex.c | 6 |
6 files changed, 22 insertions, 23 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b76342..a5cc313 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +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> * config/mips/iris6.h (SUBTARGET_CC1_SPEC): Remove -static diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog index 2a8b5dc..082be48 100644 --- a/gcc/ch/ChangeLog +++ b/gcc/ch/ChangeLog @@ -1,3 +1,9 @@ +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> * Makefile.in ($(srcdir)/hash.h): Refer to GNU FTP site for diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in index 7554b8e..779fd1e 100644 --- a/gcc/ch/Make-lang.in +++ b/gcc/ch/Make-lang.in @@ -170,7 +170,7 @@ CHILL.extraclean: CHILL.maintainer-clean: -rm -f ch/TAGS -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 # # Stage hooks: diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in index ecfcdbb..b5e3918 100644 --- a/gcc/ch/Makefile.in +++ b/gcc/ch/Makefile.in @@ -75,7 +75,7 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) # These are used because `configure' appends `cross-make' # 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. # program_transform_name and objdir are set by configure.in. program_transform_name = @@ -91,7 +91,6 @@ tmake_file=@dep_tmake_file@ srcdir = @srcdir@ VPATH = @srcdir@ -# CYGNUS LOCAL # Directory where texinfo.tex lives # texidir = $(srcdir)/../../texinfo diff --git a/gcc/ch/configure b/gcc/ch/configure index 8574a9f..fd1b50d 100755 --- a/gcc/ch/configure +++ b/gcc/ch/configure @@ -75,13 +75,12 @@ prefix=/usr/local # Think THREE TIMES before specifying any other value for this! # DO NOT make this use $prefix! 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. local_prefix='$(prefix)' # Default is to let the Makefile set exec_prefix from $(prefix) exec_prefix='$(prefix)' -# CYGNUS LOCAL. Default to nothing. program_transform_name= program_transform_set= site= @@ -134,7 +133,7 @@ do exec_prefix=$arg next_arg= ;; - --program-transform-name) # CYGNUS LOCAL + --program-transform-name) # Double any backslashes or dollar signs in the argument. if [ -n "${arg}" ] ; then program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" @@ -142,21 +141,21 @@ do program_transform_set=yes next_arg= ;; - --program-prefix) # CYGNUS LOCAL + --program-prefix) if [ -n "${arg}" ]; then program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," fi program_transform_set=yes next_arg= ;; - --program-suffix) # CYGNUS LOCAL + --program-suffix) if [ -n "${arg}" ]; then program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," fi program_transform_set=yes next_arg= ;; - --site) # CYGNUS LOCAL + --site) site=${arg} next_arg= ;; @@ -220,7 +219,6 @@ do | --program-trans | --program-tran | --program-tra \ | --program-tr | --program-t) next_arg=--program-transform-name - # CYGNUS LOCAL ;; -program-transform-name=* | --program-transform-name=* \ | --program-transform-nam=* | --program-transform-na=* \ @@ -228,7 +226,6 @@ do | --program-transform=* | --program-transfor=* | --program-transfo=* \ | --program-transf=* | --program-trans=* | --program-tran=* \ | --program-tra=* | --program-tr=* | --program-t=*) - # CYGNUS LOCAL arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` # Double any \ or $ in the argument. if [ -n "${arg}" ] ; then @@ -240,12 +237,10 @@ do | --program-pref | --program-pre | --program-pr \ | --program-p) next_arg=--program-prefix - # CYGNUS LOCAL ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* \ | --program-p=*) - # CYGNUS LOCAL arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` if [ -n "${arg}" ]; then program_transform_name="${program_transform_name} -e s,^,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," @@ -256,22 +251,20 @@ do | --program-suff | --program-suf | --program-su \ | --program-s) next_arg=--program-suffix - # CYGNUS LOCAL ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* \ | --program-s=*) - # CYGNUS LOCAL arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` if [ -n "${arg}" ]; then program_transform_name="${program_transform_name} -e s,\$\$,`echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`," fi program_transform_set=yes ;; - -site | --site | --sit) # CYGNUS LOCAL + -site | --site | --sit) next_arg=--site ;; - -site=* | --site=* | --sit=* | --si=*) # CYGNUS LOCAL + -site=* | --site=* | --sit=* | --si=*) site=`echo ${arg} | sed 's/^[-a-z]*=//'` ;; -with-gnu-ld | --with-gnu-ld | --with-gnu-l) @@ -517,7 +510,6 @@ EOF tmake_file=../Makefile.in fi - # CYGNUS LOCAL # Conditionalize the makefile for this site. if [ -f ${mainsrcdir}/config/ms-${site} ] then @@ -528,7 +520,6 @@ EOF mv Makefile.xx Makefile.tem fi - # CYGNUS LOCAL # If this is a cross compilation, and we have newlib in the build # 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 @@ -544,7 +535,6 @@ EOF # `tmake_file', `prefix', `local_prefix', `exec_prefix', `FIXINCLUDES' # and `INSTALL_HEADERS_DIR' values in the Makefile from the values # they have in this script. - # CYGNUS LOCAL: FLOAT_H, CROSS_FLOAT_H, objdir rm -f Makefile.xx sed -e "s/ //" -e "s/^target=.*$/target=${target}/" \ -e "s|^xmake_file=.*$|xmake_file=${host_xmake_file}|" \ diff --git a/gcc/fixinc/gnu-regex.c b/gcc/fixinc/gnu-regex.c index 5678499..c152aba 100644 --- a/gcc/fixinc/gnu-regex.c +++ b/gcc/fixinc/gnu-regex.c @@ -62,7 +62,7 @@ #endif /* 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 # include <libintl.h> #else @@ -194,7 +194,7 @@ init_syntax_once () #endif /* not emacs */ /* 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" /* isalpha etc. are used for the character classes. */ @@ -2210,7 +2210,7 @@ regex_compile (pattern, size, syntax, bufp) the leading `:' and `[' (but set bits for them). */ 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 */ /* systems where we have wchar.h and wctype.h. */ #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC) |