Module Name: src
Committed By: plunky
Date: Wed Jan 11 20:46:48 UTC 2012
Modified Files:
src/external/bsd/pcc/dist/pcc: configure.ac
src/external/bsd/pcc/dist/pcc/cc: Makefile.in
src/external/bsd/pcc/dist/pcc/cc/cc: cc.1
src/external/bsd/pcc/dist/pcc/cc/ccom: ccom.1 scan.l
src/external/bsd/pcc/dist/pcc/mip: common.c
Log Message:
resolve merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/Makefile.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/mip/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/dist/pcc/configure.ac
diff -u src/external/bsd/pcc/dist/pcc/configure.ac:1.3 src/external/bsd/pcc/dist/pcc/configure.ac:1.4
--- src/external/bsd/pcc/dist/pcc/configure.ac:1.3 Thu Sep 1 12:55:29 2011
+++ src/external/bsd/pcc/dist/pcc/configure.ac Wed Jan 11 20:46:47 2012
@@ -70,6 +70,7 @@ case "$target_os" in
abi=elf
stabs=yes
case "$target_os" in
+ *10.*) targosver=10 ;;
*9.*) targosver=9 ;;
*8.*) targosver=8 ;;
*7.*) targosver=7 ;;
@@ -500,6 +501,7 @@ AC_CONFIG_FILES([Makefile
cc/cc/Makefile
cc/cpp/Makefile
cc/ccom/Makefile
+ cc/cxxcom/Makefile
cc/driver/Makefile
f77/Makefile
f77/f77/Makefile
Index: src/external/bsd/pcc/dist/pcc/cc/Makefile.in
diff -u src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.4 src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.5
--- src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.4 Thu Sep 1 12:55:29 2011
+++ src/external/bsd/pcc/dist/pcc/cc/Makefile.in Wed Jan 11 20:46:47 2012
@@ -1,12 +1,12 @@
-# Id: Makefile.in,v 1.8 2011/06/07 13:56:05 plunky Exp
-# $NetBSD: Makefile.in,v 1.4 2011/09/01 12:55:29 plunky Exp $
+# Id: Makefile.in,v 1.9 2012/01/01 16:27:25 ragge 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:
Index: src/external/bsd/pcc/dist/pcc/cc/cc/cc.1
diff -u src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.4 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.5
--- src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.4 Thu Sep 1 12:55:29 2011
+++ src/external/bsd/pcc/dist/pcc/cc/cc/cc.1 Wed Jan 11 20:46:47 2012
@@ -1,5 +1,5 @@
-.\" Id: cc.1,v 1.33 2011/08/28 11:57:45 plunky Exp
-.\" $NetBSD: cc.1,v 1.4 2011/09/01 12:55:29 plunky Exp $
+.\" Id: cc.1,v 1.36 2011/11/11 09:13:14 plunky Exp
+.\" $NetBSD: cc.1,v 1.5 2012/01/11 20:46:47 plunky Exp $
.\"
.\" Copyright (c) 2007 Jeremy C. Reed <[email protected]>
.\"
@@ -16,7 +16,7 @@
.\" 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
@@ -27,8 +27,7 @@
.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 fpic
+.Op Fl f Ns Ar feature
.Op Fl I Ar path
.Op Fl include Ar file
.Op Fl isystem Ar path
@@ -44,7 +43,10 @@
.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
@@ -141,6 +143,8 @@ 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?
@@ -281,9 +285,14 @@ preprocessor to remove the initial macro
Outputs the version of
.Nm
and shows what commands will be run with their command line arguments.
-.It Fl Wl Ar flags
-Options for the linker.
-.\" what is ignored? llist?
+.It Fl Wa Ns , Ns Ar options
+Comma separated list of options for the assembler.
+.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
Index: src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.5
--- src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.4 Thu Sep 1 12:55:29 2011
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1 Wed Jan 11 20:46:48 2012
@@ -1,7 +1,8 @@
-.\" Id: ccom.1,v 1.23 2011/08/31 18:02:24 plunky Exp
-.\" $NetBSD: ccom.1,v 1.4 2011/09/01 12:55:29 plunky Exp $
+.\" Id: ccom.1,v 1.24 2011/11/14 16:46:17 plunky Exp
+.\" $NetBSD: ccom.1,v 1.5 2012/01/11 20:46:48 plunky Exp $
.\"
.\" Copyright (c) 2007 Jeremy C. Reed <[email protected]>
+.\"
.\" 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.
@@ -15,7 +16,7 @@
.\" 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
@@ -143,8 +144,11 @@ Multiple
.Fl W
options can be given, the following warnings are supported:
.Bl -tag -width Ds
-.It Sy error
-Treat all warnings as errors.
+.It Sy error Ns Oo = Ns Ar warning Oc
+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
@@ -166,6 +170,10 @@ 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
Index: src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.4
--- src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l:1.3 Thu Sep 1 12:55:29 2011
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l Wed Jan 11 20:46:48 2012
@@ -1,6 +1,6 @@
%{
-/* Id: scan.l,v 1.108 2011/06/07 12:43:36 plunky Exp */
-/* $NetBSD: scan.l,v 1.3 2011/09/01 12:55:29 plunky Exp $ */
+/* Id: scan.l,v 1.109 2011/09/03 08:04:18 ragge Exp */
+/* $NetBSD: scan.l,v 1.4 2012/01/11 20:46:48 plunky Exp $ */
/*
* Copyright (c) 2002 Anders Magnusson. All rights reserved.
@@ -54,7 +54,7 @@ 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
@@ -143,8 +143,11 @@ extern void yyset_lineno (int);
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)
@@ -195,11 +198,12 @@ L?\"(\\.|[^\\"])*\" { yylval.strp = yyte
";" { 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;
Index: src/external/bsd/pcc/dist/pcc/mip/common.c
diff -u src/external/bsd/pcc/dist/pcc/mip/common.c:1.3 src/external/bsd/pcc/dist/pcc/mip/common.c:1.4
--- src/external/bsd/pcc/dist/pcc/mip/common.c:1.3 Thu Sep 1 12:55:30 2011
+++ src/external/bsd/pcc/dist/pcc/mip/common.c Wed Jan 11 20:46:48 2012
@@ -1,5 +1,5 @@
-/* Id: common.c,v 1.98 2011/08/20 21:54:33 plunky Exp */
-/* $NetBSD: common.c,v 1.3 2011/09/01 12:55:30 plunky Exp $ */
+/* Id: common.c,v 1.99 2011/11/14 11:52:13 plunky Exp */
+/* $NetBSD: common.c,v 1.4 2012/01/11 20:46:48 plunky Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson ([email protected]).
* All rights reserved.
@@ -179,28 +179,45 @@ char *flagstr[] = {
void
Wflags(char *str)
{
- int i, flagval;
+ int i, isset, iserr;
- if (strncmp("no-", str, 3) == 0) {
- str += 3;
- flagval = 0;
- } else
- flagval = 1;
- if (strcmp(str, "error") == 0) {
- /* special */
+ /* handle -Werror specially */
+ if (strcmp("error", str) == 0) {
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);
}
