 @@ -60,26 +60,27 @@ case "$target_os" in
 	stabs=yes
 	tls=yes
 	case "$target_cpu" in
 	    i?86) targmach=i386 ;;
 	    x86_64) targmach=amd64 ;;
 	esac
 	;;
     freebsd*)
 	targos=freebsd
 	abi=elf
 	stabs=yes
 	case "$target_os" in
 	    *10.*) targosver=10 ;;
 	    *9.*) targosver=9 ;;
 	    *8.*) targosver=8 ;;
 	    *7.*) targosver=7 ;;
 	    *6.*) targosver=6 ;;
 	    *5.*) targosver=5 ;;
 	    *4.*) targosver=4 ;;
 	esac
 	case "$target_cpu" in
 	    i386) targmach=i386 ;;
 	    x86_64) targmach=amd64 ;;
 	esac
 	;;
 @@ -490,26 +491,27 @@ pcc_minor=`echo $PACKAGE_VERSION | awk -
 pcc_minorminor=`echo $PACKAGE_VERSION | awk -F. '{print $3}'`
 versstr="\"$PACKAGE_STRING `cat $srcdir/DATESTAMP` for $target\""
 AC_DEFINE_UNQUOTED(PCC_MAJOR, $pcc_major, [Major version no])
 AC_DEFINE_UNQUOTED(PCC_MINOR, $pcc_minor, [Minor version no])
 AC_DEFINE_UNQUOTED(PCC_MINORMINOR, $pcc_minorminor, [Minor minor version no])
 AC_DEFINE_UNQUOTED(VERSSTR, $versstr, [Version string])
 AC_CONFIG_FILES([Makefile
 		cc/Makefile
 		cc/cc/Makefile
 		cc/cpp/Makefile
 		cc/ccom/Makefile
 		cc/cxxcom/Makefile
 		cc/driver/Makefile
 		f77/Makefile
 		f77/f77/Makefile
 		f77/fcom/Makefile
 ])
 AC_OUTPUT
 eval "exec_prefix=$exec_prefix"
 eval "bindir=$bindir"
 eval "libexecdir=$libexecdir"
 echo
 echo "Target CPU is .................... ${targmach}"

 @@ -1,60 +1,62 @@
-.\"	Id: cc.1,v 1.33 2011/08/28 11:57:45 plunky Exp
+.\"	Id: cc.1,v 1.36 2011/11/11 09:13:14 plunky Exp
-.\"	$NetBSD: cc.1,v 1.4 2011/09/01 12:55:29 plunky Exp $
+.\"	$NetBSD: cc.1,v 1.5 2012/01/11 20:46:47 plunky Exp $
 .\"
 .\" Copyright (c) 2007 Jeremy C. Reed <reed@reedmedia.net>
 .\"
 .\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR AND CONTRIBUTORS DISCLAIM
 .\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL AUTHOR AND
 .\" CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
 .\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
 .\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd September 14, 2007
+.Dd November 11, 2011
 .Dt CC 1
 .Os
 .Sh NAME
 .Nm cc
 .Nd front-end to the C compiler
 .Sh SYNOPSIS
 .Nm
 .Op Fl cEgkLMPStvX
 .Op Fl B Ns Ar prefix
 .Op Fl D Ar macro Ns Oo = Ns Ar value Oc
-.Op Fl fPIC
+.Op Fl f Ns Ar feature
 .Op Fl fpic
 .Op Fl I Ar path
 .Op Fl include Ar file
 .Op Fl isystem Ar path
 .Op Fl m Ns Ar option
 .Op Fl nodefaultlibs
 .Op Fl nostartfiles
 .Op Fl nostdinc
 .Op Fl nostdlib
 .Op Fl O Ns Oo Ar level Oc
 .Op Fl o Ar outfile
 .Op Fl pg
 .Op Fl pthread
 .Op Fl shared
 .Op Fl static
 .Op Fl U Ar macro
-.Op Fl Wl Ar flags
+.Op Fl Wa Ns , Ns Ar options
 .Op Fl Wc Ns , Ns Ar options
 .Op Fl Wl Ns , Ns Ar options
 .Op Fl Wp Ns , Ns Ar options
 .Op Fl x Ar language
 .Op Ar
 .Sh DESCRIPTION
 The
 .Nm
 utility provides a front-end to the
 .Dq portable C compiler .
 Multiple files may be given on the command line.
 Unrecognized options are all sent directly to
 .Xr ld 1 .
 .Pp
 .\" Brief description of its syntax:
 Filenames that end with
 @@ -131,26 +133,28 @@ if multiple files are given.
 Passed to the
 .Xr cpp 1
 preprocessor to define
 .Ar macro
 with an optional
 .Ar value .
 .It Fl E
 Stop after preprocessing with
 .Xr cpp 1 .
 Do not compile, assemble, or link.
 Output is sent to standard output unless the
 .Fl o
 option is used.
 .It Fl ffreestanding
 Assume a freestanding environment.
 .It Fl fPIC
 Generate PIC code.
 .\" TODO: document about avoiding machine-specific maximum size?
 .It Fl fpic
 Tells C compiler to generate PIC code
 and tells assembler that PIC code has been generated.
 .\" TODO: document difference between PIC and pic
 .\" other -f GCC compatibility flags are ignored for now
 .It Fl g
 Send
 .Fl g
 flag to
 .Xr ccom 1
 @@ -271,29 +275,34 @@ and/or shared objects for the platform.
 .It Fl t
 Passed to
 .Xr cpp 1
 to suppress some default macro definitions and enable use
 of traditional C preprocessor syntax.
 .It Fl U Ar macro
 Passes to the
 .Xr cpp 1
 preprocessor to remove the initial macro definition.
 .It Fl v
 Outputs the version of
 .Nm
 and shows what commands will be run with their command line arguments.
-.It Fl Wl Ar flags
+.It Fl Wa Ns , Ns Ar options
-Options for the linker.
+Comma separated list of options for the assembler.
-.\" what is ignored? llist?
+.It Fl Wc Ns , Ns Ar options
 Comma separated list of options for the compiler.
 .It Fl Wl Ns , Ns Ar options
 Comma separated list of options for the linker.
 .It Fl Wp Ns , Ns Ar options
 Comma separated list of options for the preprocessor.
 .It Fl X
 Don't remove temporary files on exit.
 .It Fl x Ar language
 GCC compatibility option; specify the language in use rather than
 interpreting the filename extension.
 Currently known language values are
 .Sy c ,
 .Sy c++
 and
 .Sy assembler-with-cpp .
 Any unknown
 .Fl x
 options are passed to

 @@ -1,31 +1,32 @@
-.\"	Id: ccom.1,v 1.23 2011/08/31 18:02:24 plunky Exp
+.\"	Id: ccom.1,v 1.24 2011/11/14 16:46:17 plunky Exp
-.\"	$NetBSD: ccom.1,v 1.4 2011/09/01 12:55:29 plunky Exp $
+.\"	$NetBSD: ccom.1,v 1.5 2012/01/11 20:46:48 plunky Exp $
 .\"
 .\" Copyright (c) 2007 Jeremy C. Reed <reed@reedmedia.net>
 .\"
 .\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies.
 .\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR AND CONTRIBUTORS DISCLAIM
 .\" ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL AUTHOR AND
 .\" CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
 .\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
 .\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd August 28, 2011
+.Dd November 14, 2011
 .Dt CCOM 1
 .Os
 .Sh NAME
 .Nm ccom
 .Nd C compiler
 .Sh SYNOPSIS
 .Nm
 .Op Fl gkpsv
 .Op Fl f Ar features
 .Op Fl m Ar options
 .Op Fl W Ar warnings
 .Op Fl X Ar flags
 .Op Fl x Ar settings
 @@ -133,49 +134,56 @@ This includes:
 name table entries, name string size, permanent allocated memory,
 temporary allocated memory, lost memory, argument list unions,
 dimension/function unions, struct/union/enum blocks, inline node count,
 inline control blocks, and permanent symtab entries.
 .\" TODO: explain units for above?
 .It Fl v
 Display version.
 .It Fl W Ar warning
 Do some basic checks and emit warnings about possible coding problems.
 Multiple
 .Fl W
 options can be given, the following warnings are supported:
 .Bl -tag -width Ds
-.It Sy error
+.It Sy error Ns Oo = Ns Ar warning Oc
-Treat all warnings as errors.
+Enable
 .Ar warning ,
 and treat it as an error condition.
 If a specific warning is not given, producing any warning will cause an error.
 .It Sy implicit-function-declaration
 (TODO) Require explicit prototypes for all called functions.
 .It Sy implicit-int
 (TODO) Warn when a function declaration lacks a type.
 .It Sy missing-prototypes
 Require explicit prototypes for all global function definitions.
 .It Sy pointer-sign
 Warn when pointer operations are done with mismatched signed and unsigned values.
 .It Sy sign-compare
 (TODO) Warn about comparisons between signed and unsigned values.
 .It Sy strict-prototypes
 (TODO) Require that function prototypes are strictly C99.
 .It Sy shadow
 Report when a local variable shadows something from a higher scope.
 .It Sy truncate
 Report when integer values may be implicitly truncated to fit a smaller type.
 .It Sy unknown-pragmas
 Report unhandled pragma statements.
 .It Sy unreachable-code
 Report statements that cannot be executed.
 .El
 .Pp
 Any of the above may be prefixed with
 .Dq no-
 in order to disable the effect.
 .\"
 .It Fl X Ar flags
 C specific debugging where
 .Ar flags
 is one or more of the following:
 .Pp
 .Bl -tag -compact -width Ds
 .It Sy b
 Building of parse trees
 .It Sy d
 Declarations (using multiple
 .Sy d
 flags gives more output)

 @@ -1,16 +1,16 @@
 %{
-/*	Id: scan.l,v 1.108 2011/06/07 12:43:36 plunky Exp 	*/
+/*	Id: scan.l,v 1.109 2011/09/03 08:04:18 ragge Exp 	*/
-/*	$NetBSD: scan.l,v 1.3 2011/09/01 12:55:29 plunky Exp $	*/
+/*	$NetBSD: scan.l,v 1.4 2012/01/11 20:46:48 plunky Exp $	*/
 /*
  * Copyright (c) 2002 Anders Magnusson. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -44,27 +44,27 @@ UL			({L}|\\u{H}{H}{H}{H}|\\U{H}{H}{H}{H
 #include <errno.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include "pass1.h"
 #include "cgram.h"
 static NODE *cvtdig(int radix);
 static NODE *charcon(void);
 static NODE *wcharcon(void);
 static void control(int);
 static void pragma(void);
-int notype, parbal, inattr, parlvl, nodinit;
+int notype, parbal, inattr, parlvl, nodinit, inoso;
 static int resw(TWORD, int);
 #define	CPP_IDENT 	2
 #define	CPP_LINE 	3
 #define	CPP_HASH	4
 #ifdef STABS
 #define	STABS_LINE(x) if (gflag && cftnsp) stabs_line(x)
 #else
 #define STABS_LINE(x)
 #endif
 #if defined(FLEX_SCANNER) && YY_FLEX_SUBMINOR_VERSION == 31
 /* Hack to avoid unnecessary warnings */
 @@ -133,28 +133,31 @@ extern void yyset_lineno (int);
 {UL}({UL}|{D})*	{ 	struct symtab *s;
 			int i = 0;
 			yylval.strp = addname(yytext);
 #ifdef GCC_COMPAT
 			if (doing_init && nodinit == 0) {
 				/* check for name: for old gcc compat */
 				while ((i = input()) == ' ' || i == '\t')
+					;
 				if (i == ':')
 					return(GCC_DESIG);
 				unput(i);
+			}
-			if ((i = gcc_keyword(yylval.strp, &yylval.nodep)) > 0)
+			if ((i = gcc_keyword(yylval.strp, &yylval.nodep)) > 0) {
 				if (i == PCC_OFFSETOF)
 					inoso = 1;
 				return i;
+			}
 #endif
 			if (i == 0) {
 				if (notype)
 					return(C_NAME);
 				s = lookup(yylval.strp, SNOCREAT);
 				return s && s->sclass == TYPEDEF ?
 				    notype=1, C_TYPENAME : C_NAME;
+			}
+		}
 [xX]{H}+{IS}?		{ yylval.nodep = cvtdig(16); return(C_ICON); }
 {D}+{IS}?		{ yylval.nodep = cvtdig(8); return(C_ICON); }
 {D}+{IS}?		{ yylval.nodep = cvtdig(10); return(C_ICON); }
 @@ -185,31 +188,32 @@ L?\"(\\.|[^\\"])*\"	{ yylval.strp = yyte
 "<<"			{ yylval.intval = LS; return(C_SHIFTOP); }
 "++"			{ yylval.intval = INCR; return(C_INCOP); }
 "--"			{ yylval.intval = DECR; return(C_INCOP); }
 "->"			{ yylval.intval = STREF; return(C_STROP); }
 "&&"			{ yylval.intval = ANDAND; return(C_ANDAND); }
 "||"			{ yylval.intval = OROR; return(C_OROR); }
 "<="			{ yylval.intval = LE; return(C_RELOP); }
 ">="			{ yylval.intval = GE; return(C_RELOP); }
 "=="			{ yylval.intval = EQ; return(C_EQUOP); }
 "!="			{ yylval.intval = NE; return(C_EQUOP); }
 ";"			{ notype = 0; return(';'); }
 ("{"|"<%")		{ notype = 0; return('{'); }
 ("}"|"%>")		{ if (rpole) notype = 1; return('}'); }
-","			{ if (parbal) notype = 0; return(','); }
+","			{ if (parbal && !inoso) notype = 0; return(','); }
 ":"			{ if (doing_init) nodinit--; return(':'); }
 "="			{ return('='); }
 "("			{ parbal++; notype = 0; return('('); }
 ")"			{	parbal--;
 				inoso = 0;
 				if (parbal==0) { notype = 0; }
 				if (inattr && parlvl == parbal)
 					inattr = 0;
 				return(')'); }
 ("["|"<:")		{ return('['); }
 ("]"|":>")		{ return(']'); }
 "."			{ yylval.intval = DOT; return(C_STROP); }
 "&"			{ return('&'); }
 "!"			{ yylval.intval = NOT; return(C_UNOP); }
 "~"			{ yylval.intval = COMPL; return(C_UNOP); }
 "-"			{ return('-'); }
 "+"			{ return('+'); }
 "*"			{ if (parbal && notype == 0) notype = 1; return('*'); }

 @@ -1,15 +1,15 @@
-/*	Id: common.c,v 1.98 2011/08/20 21:54:33 plunky Exp 	*/
+/*	Id: common.c,v 1.99 2011/11/14 11:52:13 plunky Exp 	*/
-/*	$NetBSD: common.c,v 1.3 2011/09/01 12:55:30 plunky Exp $	*/
+/*	$NetBSD: common.c,v 1.4 2012/01/11 20:46:48 plunky Exp $	*/
 /*
  * Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -169,48 +169,65 @@ static char *warntxt[] = {
 char *flagstr[] = {
 	"truncate", "strict-prototypes", "missing-prototypes",
 	"implicit-int", "implicit-function-declaration", "shadow",
 	"pointer-sign", "sign-compare", "unknown-pragmas",
 	"unreachable-code",
 };
 /*
  * "emulate" the gcc warning flags.
  */
 void
 Wflags(char *str)
+{
-	int i, flagval;
+	int i, isset, iserr;
-	if (strncmp("no-", str, 3) == 0) {
+	/* handle -Werror specially */
-		str += 3;
+	if (strcmp("error", str) == 0) {
 		flagval = 0;
 	} else
 		flagval = 1;
 	if (strcmp(str, "error") == 0) {
 		/* special */
 		for (i = 0; i < NUMW; i++)
 			BITSET(werrary, i);
 		return;
+	}
 	isset = 1;
 	if (strncmp("no-", str, 3) == 0) {
 		str += 3;
 		isset = 0;
+	}
 	iserr = 0;
 	if (strncmp("error=", str, 6) == 0) {
 		str += 6;
 		iserr = 1;
+	}
 	for (i = 0; i < NUMW; i++) {
 		if (strcmp(flagstr[i], str) != 0)
 			continue;
 		if (flagval)
 		if (isset) {
 			if (iserr)
 				BITSET(werrary, i);
 			BITSET(warnary, i);
-		else
+		} else if (iserr) {
 			BITCLEAR(werrary, i);
 		} else {
 			BITCLEAR(warnary, i);
+		}
 		return;
+	}
 	fprintf(stderr, "unrecognised warning option '%s'\n", str);
+}
 /*
  * Deal with gcc warnings.
  */
 void
 warner(int type, ...)
+{
 	va_list ap;
 	char *w;
 	if (TESTBIT(warnary, type) == 0)

 @@ -1,22 +1,22 @@
-#	Id: Makefile.in,v 1.8 2011/06/07 13:56:05 plunky Exp
+#	Id: Makefile.in,v 1.9 2012/01/01 16:27:25 ragge Exp
-#	$NetBSD: Makefile.in,v 1.4 2011/09/01 12:55:29 plunky Exp $
+#	$NetBSD: Makefile.in,v 1.5 2012/01/11 20:46:47 plunky Exp $
+#
 # Makefile.in for top-level of pcc.
+#
 @SET_MAKE@
-ALL_SUBDIRS=	cc cpp ccom
+ALL_SUBDIRS=	cc cpp ccom cxxcom
 DIST_SUBDIRS=	$(ALL_SUBDIRS) driver
 all install clean:
 	@for subdir in $(ALL_SUBDIRS); do \
 		_nextdir_=$${_thisdir_+$$_thisdir_/}$$subdir; \
 		echo "===> $$_nextdir_"; \
 		(_thisdir_=$$_nextdir_; export _thisdir_; cd $$subdir && \
 		    exec $(MAKE) $(MFLAGS) $@) || exit $$?; \
 		echo "<=== $$_nextdir_"; \
 	done
 distclean:
 	@for subdir in $(DIST_SUBDIRS); do \