This commit was generated by cvs2svn to compensate for changes in r16274,

which included commits to RCS files with non-trunk default branches.

From-SVN: r16275

gcc/SERVICE

@@ -198,33 +198,6 @@ Rates: ~60 US$ / hour (Flux 2000.-)
 
 Updated:  1997-05-07
 
-Paul Black                                      <paulb@triode.apana.org.au>
-Sydney, Australia
-
-     I am available for general consulting on GNU software.  My specific
-areas of interest are:
-	- general C, C++, ADA and APL programming
-	- Gnu/unix utilities
-	- Troff
-	- Real Time Software
-	- Linux
-	- IP Comms, SMTP, NNTP, HTTP and WWW
-	- Simulation
-
-I am happy to provide free consulting/services if the work is of the order of
-a couple of hours. If more time is required, I am happy to negotiate depending
-on the nature of the work, my indicative rate is $40 per hour.
-
-Entered: 1996-07-10
-
-Keith Bostic
-
-	I'm interested in supporting/extending the ex/vi editors,
-	which I wrote.  On-site or by email, rates are based on the
-	project.  <bostic@cs.berkeley.edu>
-
-Entered:  1996-07-15
-
 Philip Brown
 <phil@mitre.org>
 (703) 893-8967 (prefer email)
@@ -415,8 +388,6 @@ Cygnus Solutions
 Sunnyvale, CA 94089 USA
 +1 408 542 9600 voice
 +1 408 542 9699 fax
-Web Site: http://www.cygnus.com
-
 
 Cygnus Solutions provides supported and maintained versions of gcc, g++, gdb
 with GUI, GNU linker and GNU macro assembler.  In addition, Cygnus provides
@@ -440,7 +411,7 @@ Cygnus Solutions contacts:
    	ph: +1 408 542 9637
    	fx: +1 408 542 9699
    	email:  <westcott@cygnus.com>
-Updated: 1997-05-23
+Updated: 1997-09-02 by rms
 
 Marcus G. Daniels              <marcusd@gnu.ai.mit.edu>
 31060 S. Kaufman Rd.           <marcus@tdb.com>
@@ -671,24 +642,6 @@ Consulting rates: $70 to $175 per hour.
  
 Updated:  1997-05-07
 
-Ehud Karni      <kehud@simonwiesel.net.il>
-
-I am an UNIX system programmer. My skills include writing in C and scripts.
-
-In the GNU domain, I consider myself an expert on Emacs.  I have written several
-packages in emacs-lisp (.el) including: better Hebrew support, another marking
-system, emulation for CDC full screen editor (FSE), COBOL mode, mathematical
-expression computing, and enhancements to vc.el (customization) and to ange-ftp
-(added Novell and NT operating systems).
-     I have installed and tested Emacs and my el's on several machines: DG,
-HP, Alpha (OSF) and PC (DOS).
-     I installed and worked with several other GNU packages - RCS, Gmake, GCC
-and more, but I'm not an expert in these packages.
-
-I work in Israel and my normal rate is $40 per hour.
-
-Entered:  1996-07-15
-
 Joseph R. Kiniry		<kiniry@cs.caltech.edu>
 Caltech Mailstop 256-80		http://www.cs.caltech.edu/~kiniry/
 Pasadena, CA 91125              <jrk@metagenesis.com>
@@ -717,26 +670,26 @@ Updated: 1997-05-07
 
 Bradley M. Kuhn
 <bkuhn@acm.org>
-http://www.smart.net/~bkuhn
+http://www.ebb.org/bkuhn
 
 I am available for primarily Unix system administration consulting, including
 but not limited to installation, configuration and integration of GNU tools
 and other copy-lefted software such as GNU/Linux.
 
-I am particularly skilled at end-user hand-holding and assisting in the
-integration of GNU and other copy-lefted software into new environments that
-have not used such tools in the past.
+I am particularly skilled at integration of GNU and other copy-lefted software
+into new environments that have not used such tools in the past, and porting
+the GNU software to new Unix-based platforms.
 
 Please visit my homepage for more information on my background and skills.
 
 I am available for both 1099 (preferred) and W2 on-site contracting in the
-Baltimore, MD metropolitan area, as well as remote consulting via dialup or
+Cincinnati, OH metropolitan area, as well as remote consulting via dialup or
 Internet connection anywhere in the US.
-
+ 
 My rate is in the $40/hour range, depending on the circumstances.  Rates for
 non-profit organizations are substantially lower, and possibly free.
 
-Updated: 1996-12-31
+Updated: 1997-08-03
 
 Fen Labalme                       <fen@comedia.com>
 CoMedia Consulting           http//www.comedia.com/comedia/
@@ -1376,12 +1329,12 @@ Services:
   Internet access
 
 Rates:
-  DM 110 (~$70) per hour
-  Support contracts start at DM 170/month + DM 30/supported system.
+  DM 150 (~$85) per hour
+  Support contracts start at DM 220/month + DM 30/supported system.
   Willing to travel for sufficiently large jobs.
   Rates don't include taxes.
 
-Updated: 1996-07-05
+Updated: 1997-08-04
 
 Paul C.A. van Gool
       <P.vanGool@LR.TUDelft.NL>

gcc/c-parse.y

@@ -54,11 +54,12 @@ State 434 contains 2 shift/reduce conflicts.  (Four ways to parse this.)  */
 
 
 %{
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <setjmp.h>
 
-#include "config.h"
 #include "tree.h"
 #include "input.h"
 #include "c-lex.h"
@@ -207,9 +208,11 @@ void yyerror ();
 
 
 %{
-/* Number of statements (loosely speaking) seen so far.  */
+/* Number of statements (loosely speaking) and compound statements 
+   seen so far.  */
 static int stmt_count;
-
+static int compstmt_count;
+  
 /* Input file and line number of the end of the body of last simple_if;
    used by the stmt-rule immediately after simple_if returns.  */
 static char *if_stmt_file;
@@ -442,7 +445,7 @@ unary_expr:
 	| sizeof unary_expr  %prec UNARY
 		{ skip_evaluation--;
 		  if (TREE_CODE ($2) == COMPONENT_REF
-		      && DECL_BIT_FIELD (TREE_OPERAND ($2, 1)))
+		      && DECL_C_BIT_FIELD (TREE_OPERAND ($2, 1)))
 		    error ("`sizeof' applied to a bit-field");
 		  $$ = c_sizeof (TREE_TYPE ($2)); }
 	| sizeof '(' typename ')'  %prec HYPERUNARY
@@ -1544,9 +1547,11 @@ compstmt_or_error:
 	| error compstmt
 	;
 
-compstmt: '{' '}'
+compstmt_start: '{' { compstmt_count++; }
+
+compstmt: compstmt_start '}'
 		{ $$ = convert (void_type_node, integer_zero_node); }
-	| '{' pushlevel maybe_label_decls decls xstmts '}'
+	| compstmt_start pushlevel maybe_label_decls decls xstmts '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), 1, 0);
 		  $$ = poplevel (1, 1, 0);
@@ -1554,7 +1559,7 @@ compstmt: '{' '}'
 		    pop_momentary_nofree ();
 		  else
 		    pop_momentary (); }
-	| '{' pushlevel maybe_label_decls error '}'
+	| compstmt_start pushlevel maybe_label_decls error '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  $$ = poplevel (kept_level_p (), 0, 0);
@@ -1562,7 +1567,7 @@ compstmt: '{' '}'
 		    pop_momentary_nofree ();
 		  else
 		    pop_momentary (); }
-	| '{' pushlevel maybe_label_decls stmts '}'
+	| compstmt_start pushlevel maybe_label_decls stmts '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  $$ = poplevel (kept_level_p (), 0, 0);
@@ -1575,8 +1580,8 @@ compstmt: '{' '}'
 /* Value is number of statements counted as of the closeparen.  */
 simple_if:
 	  if_prefix lineno_labeled_stmt
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* Make sure c_expand_end_cond is run once
+   for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
 	| if_prefix error
 	;
@@ -1584,7 +1589,8 @@ simple_if:
 if_prefix:
 	  IF '(' expr ')'
 		{ emit_line_note ($<filename>-1, $<lineno>0);
-		  expand_start_cond (truthvalue_conversion ($3), 0);
+		  c_expand_start_cond (truthvalue_conversion ($3), 0, 
+				       compstmt_count);
 		  $<itype>$ = stmt_count;
 		  if_stmt_file = $<filename>-1;
 		  if_stmt_line = $<lineno>0;
@@ -1597,6 +1603,7 @@ if_prefix:
 do_stmt_start:
 	  DO
 		{ stmt_count++;
+		  compstmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);
 		  /* See comment in `while' alternative, above.  */
 		  emit_nop ();
@@ -1659,15 +1666,15 @@ stmt:
 		  iterator_expand ($1);
 		  clear_momentary (); }
 	| simple_if ELSE
-		{ expand_start_else ();
+		{ c_expand_start_else ();
 		  $<itype>1 = stmt_count;
 		  position_after_white_space (); }
 	  lineno_labeled_stmt
-		{ expand_end_cond ();
+		{ c_expand_end_cond ();
 		  if (extra_warnings && stmt_count == $<itype>1)
 		    warning ("empty body in an else-statement"); }
 	| simple_if %prec IF
-		{ expand_end_cond ();
+		{ c_expand_end_cond ();
 		  /* This warning is here instead of in simple_if, because we
 		     do not want a warning if an empty if is followed by an
 		     else statement.  Increment stmt_count so we don't
@@ -1675,11 +1682,11 @@ stmt:
 		  if (extra_warnings && stmt_count++ == $<itype>1)
 		    warning_with_file_and_line (if_stmt_file, if_stmt_line,
 						"empty body in an if-statement"); }
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* Make sure c_expand_end_cond is run once
+   for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
 	| simple_if ELSE error
-		{ expand_end_cond (); }
+		{ c_expand_end_cond (); }
 	| WHILE
 		{ stmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);

gcc/config/arm/xm-netbsd.h

@@ -7,4 +7,12 @@
 #undef HAVE_VPRINTF
 #endif
 
+#ifndef SYS_SIGLIST_DECLARED
+#define SYS_SIGLIST_DECLARED
+#endif
+
+#ifndef HAVE_STRERROR
+#define HAVE_STRERROR
+#endif
+
 #include <xm-netbsd.h>

gcc/objc/objc-parse.y

@@ -31,11 +31,12 @@ Boston, MA 02111-1307, USA.  */
 %expect 66
 
 %{
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <setjmp.h>
 
-#include "config.h"
 #include "tree.h"
 #include "input.h"
 #include "c-lex.h"
@@ -196,9 +197,11 @@ void yyerror ();
 %type <ttype> CLASSNAME OBJC_STRING OBJECTNAME
 
 %{
-/* Number of statements (loosely speaking) seen so far.  */
+/* Number of statements (loosely speaking) and compound statements 
+   seen so far.  */
 static int stmt_count;
-
+static int compstmt_count;
+  
 /* Input file and line number of the end of the body of last simple_if;
    used by the stmt-rule immediately after simple_if returns.  */
 static char *if_stmt_file;
@@ -445,7 +448,7 @@ unary_expr:
 	| sizeof unary_expr  %prec UNARY
 		{ skip_evaluation--;
 		  if (TREE_CODE ($2) == COMPONENT_REF
-		      && DECL_BIT_FIELD (TREE_OPERAND ($2, 1)))
+		      && DECL_C_BIT_FIELD (TREE_OPERAND ($2, 1)))
 		    error ("`sizeof' applied to a bit-field");
 		  $$ = c_sizeof (TREE_TYPE ($2)); }
 	| sizeof '(' typename ')'  %prec HYPERUNARY
@@ -1658,9 +1661,11 @@ compstmt_or_error:
 	| error compstmt
 	;
 
-compstmt: '{' '}'
+compstmt_start: '{' { compstmt_count++; }
+
+compstmt: compstmt_start '}'
 		{ $$ = convert (void_type_node, integer_zero_node); }
-	| '{' pushlevel maybe_label_decls decls xstmts '}'
+	| compstmt_start pushlevel maybe_label_decls decls xstmts '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), 1, 0);
 		  $$ = poplevel (1, 1, 0);
@@ -1668,7 +1673,7 @@ compstmt: '{' '}'
 		    pop_momentary_nofree ();
 		  else
 		    pop_momentary (); }
-	| '{' pushlevel maybe_label_decls error '}'
+	| compstmt_start pushlevel maybe_label_decls error '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  $$ = poplevel (kept_level_p (), 0, 0);
@@ -1676,7 +1681,7 @@ compstmt: '{' '}'
 		    pop_momentary_nofree ();
 		  else
 		    pop_momentary (); }
-	| '{' pushlevel maybe_label_decls stmts '}'
+	| compstmt_start pushlevel maybe_label_decls stmts '}'
 		{ emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  $$ = poplevel (kept_level_p (), 0, 0);
@@ -1689,8 +1694,8 @@ compstmt: '{' '}'
 /* Value is number of statements counted as of the closeparen.  */
 simple_if:
 	  if_prefix lineno_labeled_stmt
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* Make sure c_expand_end_cond is run once
+   for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
 	| if_prefix error
 	;
@@ -1698,7 +1703,8 @@ simple_if:
 if_prefix:
 	  IF '(' expr ')'
 		{ emit_line_note ($<filename>-1, $<lineno>0);
-		  expand_start_cond (truthvalue_conversion ($3), 0);
+		  c_expand_start_cond (truthvalue_conversion ($3), 0, 
+				       compstmt_count);
 		  $<itype>$ = stmt_count;
 		  if_stmt_file = $<filename>-1;
 		  if_stmt_line = $<lineno>0;
@@ -1711,6 +1717,7 @@ if_prefix:
 do_stmt_start:
 	  DO
 		{ stmt_count++;
+		  compstmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);
 		  /* See comment in `while' alternative, above.  */
 		  emit_nop ();
@@ -1773,15 +1780,15 @@ stmt:
 		  iterator_expand ($1);
 		  clear_momentary (); }
 	| simple_if ELSE
-		{ expand_start_else ();
+		{ c_expand_start_else ();
 		  $<itype>1 = stmt_count;
 		  position_after_white_space (); }
 	  lineno_labeled_stmt
-		{ expand_end_cond ();
+		{ c_expand_end_cond ();
 		  if (extra_warnings && stmt_count == $<itype>1)
 		    warning ("empty body in an else-statement"); }
 	| simple_if %prec IF
-		{ expand_end_cond ();
+		{ c_expand_end_cond ();
 		  /* This warning is here instead of in simple_if, because we
 		     do not want a warning if an empty if is followed by an
 		     else statement.  Increment stmt_count so we don't
@@ -1789,11 +1796,11 @@ stmt:
 		  if (extra_warnings && stmt_count++ == $<itype>1)
 		    warning_with_file_and_line (if_stmt_file, if_stmt_line,
 						"empty body in an if-statement"); }
-/* Make sure expand_end_cond is run once
-   for each call to expand_start_cond.
+/* Make sure c_expand_end_cond is run once
+   for each call to c_expand_start_cond.
    Otherwise a crash is likely.  */
 	| simple_if ELSE error
-		{ expand_end_cond (); }
+		{ c_expand_end_cond (); }
 	| WHILE
 		{ stmt_count++;
 		  emit_line_note ($<filename>-1, $<lineno>0);