* cpplex.c (parse_name): Don't warn about $ in identifiers if

	skipping.

	* Makefile.in: Remove all references to HOST_INTLLIBS.

	* cp/method.c: Don't include hard-reg-set.h.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34621 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82026f5..2ae556a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-20  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * Makefile.in: Remove all references to HOST_INTLLIBS.
+
+       * cpplex.c (parse_name): Don't warn about $ in identifiers if
+       skipping.
+
 2000-06-20  Philipp Thomas  <pthomas@suse.de>
 
        * config/pa/pa.h(TARGET_SWITCHES): Require binutils 2.10 or later

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e0d1f06..ae9c6fb 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -469,7 +469,6 @@ HOST_PREFIX_1=loser-
 HOST_CC=$(CC)
 HOST_CFLAGS=$(ALL_CFLAGS)
 HOST_CLIB=$(CLIB)
-HOST_INTLLIBS=$(INTLLIBS)
 HOST_LDFLAGS=$(LDFLAGS)
 HOST_CPPFLAGS=$(ALL_CPPFLAGS)
 HOST_ALLOCA=$(ALLOCA)
@@ -577,7 +576,7 @@ LIBDEPS= $(INTLLIBS) $(OBSTACK) $(ALLOCA) $(MALLOC) $(VFPRINTF) $(DOPRINT)
 # Likewise, for use in the tools that must run on this machine
 # even if we are cross-building GCC.
 # We don't use USE_ALLOCA because backquote expansion doesn't work in deps.
-HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_INTLLIBS) $(HOST_PREFIX)$(HOST_OBSTACK) $(HOST_PREFIX)$(HOST_ALLOCA) $(HOST_PREFIX)$(HOST_MALLOC) $(HOST_PREFIX)$(HOST_VFPRINTF) $(HOST_PREFIX)$(HOST_DOPRINT)
+HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) $(HOST_PREFIX)$(HOST_ALLOCA) $(HOST_PREFIX)$(HOST_MALLOC) $(HOST_PREFIX)$(HOST_VFPRINTF) $(HOST_PREFIX)$(HOST_DOPRINT)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
@@ -586,8 +585,7 @@ LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRI
 # Likewise, for use in the tools that must run on this machine
 # even if we are cross-building GCC.
 HOST_LIBS = $(USE_HOST_OBSTACK) $(USE_HOST_ALLOCA) $(USE_HOST_MALLOC)  \
-           $(HOST_INTLLIBS) $(USE_HOST_VFPRINTF) $(USE_HOST_DOPRINT) \
-           $(HOST_CLIB)
+           $(USE_HOST_VFPRINTF) $(USE_HOST_DOPRINT) $(HOST_CLIB)
 
 HOST_RTL = $(HOST_PREFIX)rtl.o $(HOST_PREFIX)bitmap.o \
                $(HOST_PREFIX)ggc-none.o gensupport.o

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3be1d2a..1c53f0d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-20  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * method.c: Don't include hard-reg-set.h.
+
 2000-06-20  Nathan Sidwell  <nathan@codesourcery.com>
 
        * rtti.c (get_base_offset): Cope when vbase field is in a base.

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 1f09add..04685d4 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.  */
 #include "rtl.h"
 #include "expr.h"
 #include "output.h"
-#include "hard-reg-set.h"
 #include "flags.h"
 #include "toplev.h"
 #include "ggc.h"

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 1dd3e9a..4a159aa 100644 (file)
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -1096,7 +1096,10 @@ _cpp_parse_name (pfile, c)
          break;
       }
 
-      if (c == '$' && CPP_PEDANTIC (pfile))
+      /* $ is not a legal identifier character in the standard, but is
+        commonly accepted as an extension.  Don't warn about it in
+        skipped conditional blocks. */
+      if (c == '$' && CPP_PEDANTIC (pfile) && ! pfile->skipping)
        cpp_pedwarn (pfile, "`$' in identifier");
 
       CPP_RESERVE(pfile, 2); /* One more for final NUL.  */