CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 12:12:30 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: decl.c decl.exp Log Message: tests/lint: parse error for unused variable (since 2021-07-10) Since cgram.y 1.294 from 2021-07-10. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl.c \ src/tests/usr.bin/xlint/lint1/decl.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 12:12:30 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl.c decl.exp
Log Message:
tests/lint: parse error for unused variable (since 2021-07-10)
Since cgram.y 1.294 from 2021-07-10.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl.c \
src/tests/usr.bin/xlint/lint1/decl.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl.c
diff -u src/tests/usr.bin/xlint/lint1/decl.c:1.2 src/tests/usr.bin/xlint/lint1/decl.c:1.3
--- src/tests/usr.bin/xlint/lint1/decl.c:1.2 Sat Jul 10 19:30:19 2021
+++ src/tests/usr.bin/xlint/lint1/decl.c Sun Jul 11 12:12:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.2 2021/07/10 19:30:19 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.3 2021/07/11 12:12:30 rillig Exp $ */
# 3 "decl.c"
/*
@@ -86,3 +86,15 @@ enum_error_handling(void)
return x == B;
}
+
+void
+unused_local_variable(void)
+{
+ /*FIXME*//* expect+1: syntax error '_Bool' [249] */
+ __attribute__((unused)) _Bool unused_var;
+
+ __attribute__((unused))
+ /*FIXME*//* expect+2: syntax error '__attribute__' [249] */
+ /*FIXME*//* expect+1: cannot recover from previous errors [224] */
+ __attribute__((unused)) _Bool unused_twice;
+}
Index: src/tests/usr.bin/xlint/lint1/decl.exp
diff -u src/tests/usr.bin/xlint/lint1/decl.exp:1.2 src/tests/usr.bin/xlint/lint1/decl.exp:1.3
--- src/tests/usr.bin/xlint/lint1/decl.exp:1.2 Sat Jul 10 19:30:19 2021
+++ src/tests/usr.bin/xlint/lint1/decl.exp Sun Jul 11 12:12:30 2021
@@ -9,3 +9,6 @@ decl.c(68): warning: converting 'pointer
decl.c(70): warning: illegal combination of pointer (pointer to double) and integer (char), arg #1 [154]
decl.c(72): warning: converting 'pointer to pointer to char' to incompatible 'pointer to double' for argument 1 [153]
decl.c(80): error: syntax error '"' [249]
+decl.c(94): error: syntax error '_Bool' [249]
+decl.c(99): error: syntax error '__attribute__' [249]
+decl.c(99): error: cannot recover from previous errors [224]
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 14:17:48 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: Mention that emulated disks by HPDisk and HPDrive work. Also add more HP-IB disk models per recent changes. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 14:17:48 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: Mention that emulated disks by HPDisk and HPDrive work. Also add more HP-IB disk models per recent changes. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.25 src/distrib/notes/hp300/hardware:1.26 --- src/distrib/notes/hp300/hardware:1.25 Sun Jul 11 13:53:48 2021 +++ src/distrib/notes/hp300/hardware Sun Jul 11 14:17:48 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.25 2021/07/11 13:53:48 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.26 2021/07/11 14:17:48 tsutsui Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -73,8 +73,14 @@ up to 128 MB RAM) HP-IB devices .(bullet -compact .Em rd ; -CS80 disks: 2200, 2203, 7912, 7914, 7933, 7936, 7937, 7945, 7946, -7957, 7958, and 7959 +CS80 disks: 2200, 2202, 2203, 7908, 7911, 7912, 7914, 7933, 7936, 7937, 7941, +7945, 7946, 7957, 7958, and 7959 +.br +.Em "Emulated CS80 disks by" +.Lk http://www.dalton.ax/hpdisk/ HPDisk +.Em and +.Lk https://www.hp9845.net/9845/projects/hpdrive/ HPDrive +.Em "also work." .It .Em rd ; CS80 floppy disks: 9122, 9134 (possibly others)
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Jul 11 18:58:13 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile
Added Files:
src/tests/usr.bin/xlint/lint1: stmt_if.c stmt_if.exp
Log Message:
tests/lint: test dangling else
To generate a diff of this commit:
cvs rdiff -u -r1.1083 -r1.1084 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.84 -r1.85 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/stmt_if.c \
src/tests/usr.bin/xlint/lint1/stmt_if.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1083 src/distrib/sets/lists/tests/mi:1.1084
--- src/distrib/sets/lists/tests/mi:1.1083 Sat Jul 10 18:25:57 2021
+++ src/distrib/sets/lists/tests/mi Sun Jul 11 18:58:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1083 2021/07/10 18:25:57 rillig Exp $
+# $NetBSD: mi,v 1.1084 2021/07/11 18:58:13 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6976,6 +6976,8 @@
./usr/tests/usr.bin/xlint/lint1/op_shl_lp64.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/stmt_for.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/stmt_for.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/stmt_if.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/stmt_if.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/t_integration tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/ztesttests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/ztest/Atffile tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.84 src/tests/usr.bin/xlint/lint1/Makefile:1.85
--- src/tests/usr.bin/xlint/lint1/Makefile:1.84 Sat Jul 10 18:25:57 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Jul 11 18:58:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2021/07/10 18:25:57 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2021/07/11 18:58:13 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -181,6 +181,8 @@ FILES+= op_shl_lp64.c
FILES+= op_shl_lp64.exp
FILES+= stmt_for.c
FILES+= stmt_for.exp
+FILES+= stmt_if.c
+FILES+= stmt_if.exp
# Note: only works for adding tests.
# To remove a test, the $$mi file must be edited manually.
Added files:
Index: src/tests/usr.bin/xlint/lint1/stmt_if.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/stmt_if.c:1.1
--- /dev/null Sun Jul 11 18:58:13 2021
+++ src/tests/usr.bin/xlint/lint1/stmt_if.c Sun Jul 11 18:58:13 2021
@@ -0,0 +1,28 @@
+/* $NetBSD: stmt_if.c,v 1.1 2021/07/11 18:58:13 rillig Exp $ */
+# 3 "stmt_if.c"
+
+/*
+ * Test parsing of 'if' statements.
+ */
+
+void println(const char *);
+
+void
+dangling_else(int x)
+{
+ if (x > 0)
+ if (x > 10)
+ println("> 10");
+ /* This 'else' is bound to the closest unfinished 'if'. */
+ else
+ println("> 0");
+ /*
+ * If the above 'else' were bound to the other 'if', the next 'else'
+ * would have no corresponding 'if', resulting in a syntax error.
+ */
+ else
+ println("not positive");
+ /* expect+1: syntax error 'else' [249] */
+ else
+ println("syntax error");
+}
Index: src/tests/usr.bin/xlint/lint1/stmt_if.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/stmt_if.exp:1.1
--- /dev/null Sun Jul 11 18:58:13 2021
+++ src/tests/usr.bin/xlint/lint1/stmt_if.exp Sun Jul 11 18:58:13 2021
@@ -0,0 +1 @@
+stmt_if.c(26): error: syntax error 'else' [249]
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Jul 11 18:58:13 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile Added Files: src/tests/usr.bin/xlint/lint1: stmt_if.c stmt_if.exp Log Message: tests/lint: test dangling else To generate a diff of this commit: cvs rdiff -u -r1.1083 -r1.1084 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.84 -r1.85 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/stmt_if.c \ src/tests/usr.bin/xlint/lint1/stmt_if.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 16:57:21 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: resolve shift/reduce conflicts for unary expressions The grammar rule 'term' was ambiguous since both the prefix and postfix increment operators were listed with the same precedence. The expression '++x++' was parsed as '++ (x++)', as expected, since conflicts resolve towards shift. Resolve these conflicts by structuring the grammar as in C99, with the GCC extension of statement-expressions. The resolved conflicts are: 134: shift/reduce conflict (shift 161, reduce 347) on T_LBRACK 134: shift/reduce conflict (shift 162, reduce 347) on T_LPAREN 134: shift/reduce conflict (shift 163, reduce 347) on T_POINT 134: shift/reduce conflict (shift 164, reduce 347) on T_ARROW 134: shift/reduce conflict (shift 165, reduce 347) on T_INCDEC state 134 term : term . T_INCDEC (335) term : term . T_LBRACK expr T_RBRACK (341) term : term . T_LPAREN T_RPAREN (342) term : term . T_LPAREN argument_expression_list T_RPAREN (343) term : term . point_or_arrow T_NAME (344) term : T_EXTENSION term . (347) No functional change. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 16:57:21 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: resolve shift/reduce conflicts for unary expressions
The grammar rule 'term' was ambiguous since both the prefix and postfix
increment operators were listed with the same precedence. The
expression '++x++' was parsed as '++ (x++)', as expected, since
conflicts resolve towards shift.
Resolve these conflicts by structuring the grammar as in C99, with the
GCC extension of statement-expressions. The resolved conflicts are:
134: shift/reduce conflict (shift 161, reduce 347) on T_LBRACK
134: shift/reduce conflict (shift 162, reduce 347) on T_LPAREN
134: shift/reduce conflict (shift 163, reduce 347) on T_POINT
134: shift/reduce conflict (shift 164, reduce 347) on T_ARROW
134: shift/reduce conflict (shift 165, reduce 347) on T_INCDEC
state 134
term : term . T_INCDEC (335)
term : term . T_LBRACK expr T_RBRACK (341)
term : term . T_LPAREN T_RPAREN (342)
term : term . T_LPAREN argument_expression_list T_RPAREN (343)
term : term . point_or_arrow T_NAME (344)
term : T_EXTENSION term . (347)
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.306 src/usr.bin/xlint/lint1/cgram.y:1.307
--- src/usr.bin/xlint/lint1/cgram.y:1.306 Sun Jul 11 15:07:39 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 16:57:21 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.306 2021/07/11 15:07:39 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.307 2021/07/11 16:57:21 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.306 2021/07/11 15:07:39 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.307 2021/07/11 16:57:21 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 178
+%expect 173
%union {
val_t *y_val;
@@ -278,6 +278,9 @@ anonymize(sym_t *s)
%token T_CON
%token T_STRING
+%type primary_expression
+%type postfix_expression
+
%type func_decl
%type notype_decl
%type type_decl
@@ -1724,24 +1727,71 @@ assignment_expression: /* C99 6.5.16 */
expr %prec T_ASSIGN
;
-term:/* see C99 6.5.1 */
+primary_expression: /* C99 6.5.1 */
T_NAME {
/* XXX really necessary? */
if (yychar < 0)
yychar = yylex();
$$ = new_name_node(getsym($1), yychar);
}
- | string {
- $$ = new_string_node($1);
- }
| T_CON {
$$ = expr_new_constant(gettyp($1->v_tspec), $1);
}
+ | string {
+ $$ = new_string_node($1);
+ }
| T_LPAREN expr T_RPAREN {
if ($2 != NULL)
$2->tn_parenthesized = true;
$$ = $2;
}
+ ;
+
+postfix_expression: /* C99 6.5.2 */
+ primary_expression
+ | postfix_expression T_LBRACK expr T_RBRACK {
+ $$ = build(INDIR, build(PLUS, $1, $3), NULL);
+ }
+ | postfix_expression T_LPAREN T_RPAREN {
+ $$ = new_function_call_node($1, NULL);
+ }
+ | postfix_expression T_LPAREN argument_expression_list T_RPAREN {
+ $$ = new_function_call_node($1, $3);
+ }
+ | postfix_expression point_or_arrow T_NAME {
+ if ($1 != NULL) {
+ sym_t *msym;
+ /*
+ * XXX struct_or_union_member should be integrated
+ * in build()
+ */
+ if ($2 == ARROW) {
+/*
+ * must do this before struct_or_union_member
+ * is called
+ */
+$1 = cconv($1);
+ }
+ msym = struct_or_union_member($1, $2, getsym($3));
+ $$ = build($2, $1, new_name_node(msym, 0));
+ } else {
+ $$ = NULL;
+ }
+ }
+ | postfix_expression T_INCDEC {
+ $$ = build($2 == INC ? INCAFT : DECAFT, $1, NULL);
+ }
+ | T_LPAREN type_name T_RPAREN { /* C99 6.5.2.5 "Compound literals" */
+ sym_t *tmp = mktempsym($2);
+ begin_initialization(tmp);
+ cgram_declare(tmp, true, NULL);
+ } init_lbrace initializer_list comma_opt init_rbrace {
+ if (!Sflag)
+ /* compound literals are a C9X/GCC extension */
+ gnuism(319);
+ $$ = new_name_node(*current_initsym(), 0);
+ end_initialization();
+ }
| T_LPAREN compound_statement_lbrace gcc_statement_expr_list {
block_level--;
mem_block_level--;
@@ -1754,9 +1804,10 @@ term:/* see C99 6.5.1 */
$$ = new_name_node(*current_initsym(), 0);
end_initialization();
}
- | term T_INCDEC {
- $$ = build($2 == INC ? INCAFT : DECAFT, $1, NULL);
- }
+ ;
+
+term:/* see C99 6.5.1 */
+ postfix_expression
| T_INCDEC term {
$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
}
@@ -1776,35 +1827,6 @@ term:/* see C99 6.5.1 */
}
$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
}
- | term T_LBRACK expr T_RBRACK {
- $$ = build(INDIR, build(PLUS, $1, $3), NULL);
-
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Jul 11 19:30:56 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: msg_023.c msg_023.exp msg_193.c msg_193.exp msg_194.exp msg_232.c msg_232.exp src/usr.bin/xlint/lint1: decl.c err.c Log Message: lint: add quotes around placeholders in message 23 and 232 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_023.c \ src/tests/usr.bin/xlint/lint1/msg_023.exp \ src/tests/usr.bin/xlint/lint1/msg_194.exp cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/xlint/lint1/msg_193.c \ src/tests/usr.bin/xlint/lint1/msg_193.exp cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_232.c cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_232.exp cvs rdiff -u -r1.197 -r1.198 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.127 -r1.128 src/usr.bin/xlint/lint1/err.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Jul 11 19:30:56 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_023.c msg_023.exp msg_193.c
msg_193.exp msg_194.exp msg_232.c msg_232.exp
src/usr.bin/xlint/lint1: decl.c err.c
Log Message:
lint: add quotes around placeholders in message 23 and 232
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_023.c \
src/tests/usr.bin/xlint/lint1/msg_023.exp \
src/tests/usr.bin/xlint/lint1/msg_194.exp
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/xlint/lint1/msg_193.c \
src/tests/usr.bin/xlint/lint1/msg_193.exp
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_232.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_232.exp
cvs rdiff -u -r1.197 -r1.198 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.127 -r1.128 src/usr.bin/xlint/lint1/err.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_023.c
diff -u src/tests/usr.bin/xlint/lint1/msg_023.c:1.3 src/tests/usr.bin/xlint/lint1/msg_023.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_023.c:1.3 Sun Jul 11 19:24:42 2021
+++ src/tests/usr.bin/xlint/lint1/msg_023.c Sun Jul 11 19:30:56 2021
@@ -1,14 +1,13 @@
-/* $NetBSD: msg_023.c,v 1.3 2021/07/11 19:24:42 rillig Exp $ */
+/* $NetBSD: msg_023.c,v 1.4 2021/07/11 19:30:56 rillig Exp $ */
# 3 "msg_023.c"
-// Test for message: undefined label %s [23]
+// Test for message: undefined label '%s' [23]
void
test(void)
{
goto defined_label;
defined_label:
- /* TODO: add quotes around '%s' */
- /* expect+1: warning: undefined label undefined_label [23] */
+ /* expect+1: warning: undefined label 'undefined_label' [23] */
goto undefined_label;
}
Index: src/tests/usr.bin/xlint/lint1/msg_023.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_023.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_023.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_023.exp:1.3 Sun Jul 11 19:24:42 2021
+++ src/tests/usr.bin/xlint/lint1/msg_023.exp Sun Jul 11 19:30:56 2021
@@ -1 +1 @@
-msg_023.c(13): warning: undefined label undefined_label [23]
+msg_023.c(12): warning: undefined label 'undefined_label' [23]
Index: src/tests/usr.bin/xlint/lint1/msg_194.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_194.exp:1.3 src/tests/usr.bin/xlint/lint1/msg_194.exp:1.4
--- src/tests/usr.bin/xlint/lint1/msg_194.exp:1.3 Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_194.exp Sun Jul 11 19:30:56 2021
@@ -1,2 +1,2 @@
msg_194.c(11): error: label label redefined [194]
-msg_194.c(9): warning: label label unused in function example [232]
+msg_194.c(9): warning: label 'label' unused in function 'example' [232]
Index: src/tests/usr.bin/xlint/lint1/msg_193.c
diff -u src/tests/usr.bin/xlint/lint1/msg_193.c:1.11 src/tests/usr.bin/xlint/lint1/msg_193.c:1.12
--- src/tests/usr.bin/xlint/lint1/msg_193.c:1.11 Sun Mar 21 20:08:21 2021
+++ src/tests/usr.bin/xlint/lint1/msg_193.c Sun Jul 11 19:30:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_193.c,v 1.11 2021/03/21 20:08:21 rillig Exp $ */
+/* $NetBSD: msg_193.c,v 1.12 2021/07/11 19:30:56 rillig Exp $ */
# 3 "msg_193.c"
// Test for message: statement not reached [193]
@@ -577,7 +577,7 @@ one:
goto two;
seven:
goto eight;
-six:/* expect: warning: label six unused */
+six:/* expect: warning: label 'six' unused */
goto seven;
ten:
return;
Index: src/tests/usr.bin/xlint/lint1/msg_193.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_193.exp:1.11 src/tests/usr.bin/xlint/lint1/msg_193.exp:1.12
--- src/tests/usr.bin/xlint/lint1/msg_193.exp:1.11 Sun Mar 21 20:08:21 2021
+++ src/tests/usr.bin/xlint/lint1/msg_193.exp Sun Jul 11 19:30:56 2021
@@ -82,6 +82,6 @@ msg_193.c(515): warning: statement not r
msg_193.c(518): warning: statement not reached [193]
msg_193.c(532): warning: statement not reached [193]
msg_193.c(540): warning: statement not reached [193]
-msg_193.c(580): warning: label six unused in function test_goto_numbers_alphabetically [232]
+msg_193.c(580): warning: label 'six' unused in function 'test_goto_numbers_alphabetically' [232]
msg_193.c(597): warning: statement not reached [193]
msg_193.c(606): warning: statement not reached [193]
Index: src/tests/usr.bin/xlint/lint1/msg_232.c
diff -u src/tests/usr.bin/xlint/lint1/msg_232.c:1.4 src/tests/usr.bin/xlint/lint1/msg_232.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_232.c:1.4 Sun Jul 11 19:24:42 2021
+++ src/tests/usr.bin/xlint/lint1/msg_232.c Sun Jul 11 19:30:56 2021
@@ -1,16 +1,15 @@
-/* $NetBSD: msg_232.c,v 1.4 2021/07/11 19:24:42 rillig Exp $ */
+/* $NetBSD: msg_232.c,v 1.5 2021/07/11 19:30:56 rillig Exp $ */
# 3 "msg_232.c"
-// Test for message: label %s unused in function %s [232]
+// Test for message: label '%s' unused in function '%s' [232]
void
example(void)
{
goto used_label;
-unused_label: /* expect: 232 */
+ /* expect+1: label 'unused_label' unused
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 13:53:49 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: HP9000/360 can have up to 16 MB RAM, not 48 MB. Per Service Information Manual HP 9000 Series 300 Computers Models 360/370. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sun Jul 11 13:53:49 UTC 2021 Modified Files: src/distrib/notes/hp300: hardware Log Message: HP9000/360 can have up to 16 MB RAM, not 48 MB. Per Service Information Manual HP 9000 Series 300 Computers Models 360/370. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.24 src/distrib/notes/hp300/hardware:1.25 --- src/distrib/notes/hp300/hardware:1.24 Wed Dec 23 17:57:17 2020 +++ src/distrib/notes/hp300/hardware Sun Jul 11 13:53:48 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.24 2020/12/23 17:57:17 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.25 2021/07/11 13:53:48 tsutsui Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -31,7 +31,7 @@ CPUs .br .Em "Requires Human Interface board" .It -360 (25 MHz 68030, with 4 MB RAM built-in, up to 48 MB RAM) +360 (25 MHz 68030, with 4 MB RAM built-in, up to 16 MB RAM) .br .Em "Requires System Interface board" .It
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 14:43:57 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: accept.sh Log Message: tests/lint: when accepting test results, skip crashes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/accept.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 14:43:57 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: accept.sh Log Message: tests/lint: when accepting test results, skip crashes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/accept.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/accept.sh diff -u src/tests/usr.bin/xlint/lint1/accept.sh:1.2 src/tests/usr.bin/xlint/lint1/accept.sh:1.3 --- src/tests/usr.bin/xlint/lint1/accept.sh:1.2 Sun Jul 11 12:07:14 2021 +++ src/tests/usr.bin/xlint/lint1/accept.sh Sun Jul 11 14:43:57 2021 @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: accept.sh,v 1.2 2021/07/11 12:07:14 rillig Exp $ +# $NetBSD: accept.sh,v 1.3 2021/07/11 14:43:57 rillig Exp $ # # Copyright (c) 2021 The NetBSD Foundation, Inc. # All rights reserved. @@ -61,6 +61,9 @@ for pattern in "$@"; do sed 's,^,| ,' "$tmpfile" fi rm -f "$expfile" "$tmpfile" + elif [ $? -ge 128 ]; then + echo "$base crashed" + continue else if [ -f "$tmpfile" ] && cmp -s "$tmpfile" "$expfile"; then rm "$tmpfile"
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 19:01:37 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: fix shift/reduce conflict for dangling else The following line no longer occurs in the yacc output: 257: shift/reduce conflict (shift 427, reduce 270) on T_ELSE No functional change. To generate a diff of this commit: cvs rdiff -u -r1.311 -r1.312 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 19:01:37 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix shift/reduce conflict for dangling else
The following line no longer occurs in the yacc output:
257: shift/reduce conflict (shift 427, reduce 270) on T_ELSE
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.311 src/usr.bin/xlint/lint1/cgram.y:1.312
--- src/usr.bin/xlint/lint1/cgram.y:1.311 Sun Jul 11 18:22:02 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 19:01:37 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.311 2021/07/11 18:22:02 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.311 2021/07/11 18:22:02 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 168
+%expect 167
%union {
val_t *y_val;
@@ -257,6 +257,8 @@ anonymize(sym_t *s)
%token T_AT_WARN_UNUSED_RESULT
%token T_AT_WEAK
+%left T_THEN
+%left T_ELSE
%left T_COMMA
%right T_ASSIGN T_OPASSIGN
%right T_QUEST T_COLON
@@ -1486,7 +1488,7 @@ expression_statement: /* C99 6.8.3 */
;
selection_statement: /* C99 6.8.4 */
- if_without_else {
+ if_without_else %prec T_THEN {
save_warning_flags();
if2();
if3(false);
CVS commit: src/tools/compat
Module Name:src Committed By: cjep Date: Sun Jul 11 06:15:42 UTC 2021 Modified Files: src/tools/compat: README Log Message: Final note on OpenBSD cross-buildling. Remaining issues were due to default limits on the build host. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src Committed By: cjep Date: Sun Jul 11 06:15:42 UTC 2021 Modified Files: src/tools/compat: README Log Message: Final note on OpenBSD cross-buildling. Remaining issues were due to default limits on the build host. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/README diff -u src/tools/compat/README:1.20 src/tools/compat/README:1.21 --- src/tools/compat/README:1.20 Sun Jul 4 12:57:48 2021 +++ src/tools/compat/README Sun Jul 11 06:15:42 2021 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.20 2021/07/04 12:57:48 cjep Exp $ +$NetBSD: README,v 1.21 2021/07/11 06:15:42 cjep Exp $ Special notes for cross-hosting a NetBSD build on certain platforms. Only those platforms which have been tested to complete a "build.sh" run @@ -65,14 +65,17 @@ OpenBSD --- As of -current 20210629, ./build.sh will build src on OpenBSD 6.9 -for all targets except MIPS-based ones. +for all platforms. -For builds requiring the LLVM RT library (including X on amd64, -i386 and evbarm64-el), the build user's limits needs to be setup -for higher memory usage, otherwise the build will fail. This can -be achieved by either building as root (not recommended) or -by changing the datasize attribute to infinity for the relevant -groups and users in /etc/login.conf. +Due to the default limits placed on user accounts, the host may experience +memory exhaustion on builds requiring the LLVM RT library (including +X on amd64, i386 and evbarm64-el) and for MIPS targets. + +This can be avoided by building as root (not ideal) or by asking your +administrator to increase your limits in login.conf. These two variables +seem to be sufficient: +:datasize=infinity:\ +:stacksize-cur=8M:\ NetBSD (earlier releases) -
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sun Jul 11 13:00:53 UTC 2021 Modified Files: src/sys/arch/hp300/dev: rd.c rdreg.h Log Message: Add Device and drive info of 2202A, 7908A, 7911A, and 7941A. Geometries and description info are taken from hpdrive.ini.sample in HPDrive. Briefly tested on HPDisk. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/arch/hp300/dev/rd.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/dev/rdreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/dev
Module Name:src
Committed By: tsutsui
Date: Sun Jul 11 13:00:53 UTC 2021
Modified Files:
src/sys/arch/hp300/dev: rd.c rdreg.h
Log Message:
Add Device and drive info of 2202A, 7908A, 7911A, and 7941A.
Geometries and description info are taken from hpdrive.ini.sample
in HPDrive. Briefly tested on HPDisk.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/hp300/dev/rd.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/dev/rdreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/dev/rd.c
diff -u src/sys/arch/hp300/dev/rd.c:1.108 src/sys/arch/hp300/dev/rd.c:1.109
--- src/sys/arch/hp300/dev/rd.c:1.108 Fri Jul 9 17:05:33 2021
+++ src/sys/arch/hp300/dev/rd.c Sun Jul 11 13:00:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.108 2021/07/09 17:05:33 tsutsui Exp $ */
+/* $NetBSD: rd.c,v 1.109 2021/07/11 13:00:52 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.108 2021/07/09 17:05:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.109 2021/07/11 13:00:52 tsutsui Exp $");
#include "opt_useleds.h"
@@ -355,6 +355,42 @@ static const struct rdidentinfo rdidenti
.ri_ntpc = NRD2203ATRK,
.ri_ncyl = 1449,
.ri_nblocks = 1309896
+ },
+
+ [RD2202A] = {
+ .ri_hwid = RD2202AID,
+ .ri_desc = "2202A",
+ .ri_nbpt = NRD2202ABPT,
+ .ri_ntpc = NRD2202ATRK,
+ .ri_ncyl = 1449,
+ .ri_nblocks = 1309896
+ },
+
+ [RD7908A] = {
+ .ri_hwid = RD7908AID,
+ .ri_desc = "7908A",
+ .ri_nbpt = NRD7908ABPT,
+ .ri_ntpc = NRD7908ATRK,
+ .ri_ncyl = 185,
+ .ri_nblocks = 32375
+ },
+
+ [RD7911A] = {
+ .ri_hwid = RD7911AID,
+ .ri_desc = "7911A",
+ .ri_nbpt = NRD7911ABPT,
+ .ri_ntpc = NRD7911ATRK,
+ .ri_ncyl = 572,
+ .ri_nblocks = 54912
+ },
+
+ [RD7941A] = {
+ .ri_hwid = RD7946AID,
+ .ri_desc = "7941A",
+ .ri_nbpt = NRD7941ABPT,
+ .ri_ntpc = NRD7941ATRK,
+ .ri_ncyl = 968,
+ .ri_nblocks = 46464
}
};
static const int numrdidentinfo = __arraycount(rdidentinfo);
@@ -380,7 +416,11 @@ static const struct rdname2id rdname2id[
{ RD7958BNAME, RD7958B },
{ RD7959BNAME, RD7959B },
{ RD2200ANAME, RD2200A },
- { RD2203ANAME, RD2203A }
+ { RD2203ANAME, RD2203A },
+ { RD2202ANAME, RD2202A },
+ { RD7908ANAME, RD7908A },
+ { RD7911ANAME, RD7911A },
+ { RD7941ANAME, RD7941A }
};
static const int numrdname2id = __arraycount(rdname2id);
@@ -618,7 +658,7 @@ rdident(device_t parent, struct rd_softc
/*
* Take care of a couple of anomolies:
- * 1. 7945A and 7946A both return same HW id
+ * 1. 7945A, 7946A, and 7941A all return same HW id
* 2. 9122S and 9134D both return same HW id
* 3. 9122D and 9134L both return same HW id
*/
@@ -626,6 +666,8 @@ rdident(device_t parent, struct rd_softc
case RD7946AID:
if (memcmp(name, RD7945ANAME, RDNAMELEN) == 0)
id = RD7945A;
+ else if (memcmp(name, RD7941ANAME, RDNAMELEN) == 0)
+ id = RD7941A;
else
id = RD7946A;
break;
Index: src/sys/arch/hp300/dev/rdreg.h
diff -u src/sys/arch/hp300/dev/rdreg.h:1.16 src/sys/arch/hp300/dev/rdreg.h:1.17
--- src/sys/arch/hp300/dev/rdreg.h:1.16 Fri Jul 9 17:05:33 2021
+++ src/sys/arch/hp300/dev/rdreg.h Sun Jul 11 13:00:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rdreg.h,v 1.16 2021/07/09 17:05:33 tsutsui Exp $ */
+/* $NetBSD: rdreg.h,v 1.17 2021/07/11 13:00:52 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -104,7 +104,7 @@ struct rd_clearcmd {
} __attribute__((__packed__));
/* HW ids */
-#define RD7946AID 0x220 /* also 7945A */
+#define RD7946AID 0x220 /* also 7945A and 7941A */
#define RD9134DID 0x221 /* also 9122S */
#define RD9134LID 0x222 /* also 9122D */
#define RD7912PID 0x209
@@ -120,6 +120,9 @@ struct rd_clearcmd {
#define RD7959BID 0x22E /* another guess based on 7958B */
#define RD2200AID 0x22F
#define RD2203AID 0x230 /* yet another guess */
+#define RD2202AID 0x231 /* from hpdrive.ini.sample */
+#define RD7908AID 0x200 /* from hpdrive.ini.sample */
+#define RD7911AID 0x204 /* from hpdrive.ini.sample */
/* Drive names -- per identify description structure */
#define RD7945ANAME "079450"
@@ -140,6 +143,10 @@ struct rd_clearcmd {
#define RD7959BNAME "079591"
#define RD2200ANAME "022000"
#define RD2203ANAME "022030"
+#define RD2202ANAME "022020"
+#define RD7908ANAME "079080"
+#define RD7911ANAME "079110"
+#define RD7941ANAME "079410"
#define RDNAMELEN 6
@@ -163,6 +170,10 @@ struct rd_clearcmd {
#define RD7959B 16
#define RD2200A 17
#define RD2203A 18
+#define RD2202A 19
+#define RD7908A 20
+#define RD7911A 21
+#define RD7941A 22
#define NRD7945ABPT 16
#define NRD7945ATRK 7
@@ -178,6 +189,10 @@ struct rd_clearcmd {
#define NRD7933HTRK 13
#define NRD9134LBPT 16
#define NRD9134LTRK 5
+#define NRD7911ABPT 32
+#define NRD7911ATRK 3
+#define NRD7941ABPT 16
+#define NRD7941ATRK 3
/*
* Several HP
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 13:32:06 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_var.c
gcc_attribute_var.exp
Log Message:
tests/lint: analyze yesterday's bug for parsing declarations
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c \
src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.1 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.2
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.1 Tue Jul 6 17:33:07 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c Sun Jul 11 13:32:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_var.c,v 1.1 2021/07/06 17:33:07 rillig Exp $ */
+/* $NetBSD: gcc_attribute_var.c,v 1.2 2021/07/11 13:32:06 rillig Exp $ */
# 3 "gcc_attribute_var.c"
/*
@@ -23,6 +23,47 @@ placement(
int after __attribute__((__deprecated__))
);
+void println(void);
+
+/*
+ * Since cgram.y 1.294 from 2021-07-10, lint did not accept declarations that
+ * started with __attribute__, due to a newly and accidentally introduced
+ * shift/reduce conflict in the grammar.
+ *
+ * A GCC extension allows statement of the form __attribute__((fallthrough)),
+ * thus starting with __attribute__. This is the 'shift' in the conflict.
+ * The 'reduce' in the conflict was begin_type.
+ *
+ * Before cgram 1.294, the gcc_attribute was placed outside the pair of
+ * begin_type/end_type, exactly to resolve this conflict.
+ *
+ * Conceptually, it made sense to put the __attribute__((unused)) between
+ * begin_type and end_type, to make it part of the declaration-specifiers.
+ * This change introduced the hidden conflict though.
+ *
+ * Interestingly, the number of shift/reduce conflicts did not change in
+ * cgram 1.294, the conflicts were just resolved differently than before.
+ *
+ * To prevent this from happening again, make sure that declarations as well
+ * as statements can start with gcc_attribute.
+ */
+void
+ambiguity_for_attribute(void)
+{
+ /*FIXME*//* expect+1: error: syntax error '_Bool' [249] */
+ __attribute__((unused)) _Bool var1;
+
+ switch (1) {
+ case 1:
+ println();
+ /*FIXME*//* expect+1: error: syntax error '_Bool' [249] */
+ __attribute__((unused)) _Bool var2;
+ __attribute__((fallthrough));
+ case 2:
+ println();
+ }
+}
+
/* just to trigger _some_ error, to keep the .exp file */
/* expect+1: error: syntax error 'syntax_error' [249] */
__attribute__((syntax_error));
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.1 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.2
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.1 Tue Jul 6 17:33:07 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp Sun Jul 11 13:32:06 2021
@@ -1 +1,3 @@
-gcc_attribute_var.c(28): error: syntax error 'syntax_error' [249]
+gcc_attribute_var.c(54): error: syntax error '_Bool' [249]
+gcc_attribute_var.c(60): error: syntax error '_Bool' [249]
+gcc_attribute_var.c(69): error: syntax error 'syntax_error' [249]
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 13:32:06 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: gcc_attribute_var.c gcc_attribute_var.exp Log Message: tests/lint: analyze yesterday's bug for parsing declarations To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kre Date: Sun Jul 11 16:30:41 UTC 2021 Modified Files: src/lib/libc/gen: initdir.c Log Message: Make sure dd_size is init'd, even when nothing has been read (so it will be 0). Reported on tech-userlevel by Mouse 20210711T044753+ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/initdir.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: kre
Date: Sun Jul 11 16:30:41 UTC 2021
Modified Files:
src/lib/libc/gen: initdir.c
Log Message:
Make sure dd_size is init'd, even when nothing has been read (so it
will be 0). Reported on tech-userlevel by Mouse 20210711T044753+
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/initdir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/initdir.c
diff -u src/lib/libc/gen/initdir.c:1.4 src/lib/libc/gen/initdir.c:1.5
--- src/lib/libc/gen/initdir.c:1.4 Fri Dec 16 04:45:04 2016
+++ src/lib/libc/gen/initdir.c Sun Jul 11 16:30:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: initdir.c,v 1.4 2016/12/16 04:45:04 mrg Exp $ */
+/* $NetBSD: initdir.c,v 1.5 2021/07/11 16:30:41 kre Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: initdir.c,v 1.4 2016/12/16 04:45:04 mrg Exp $");
+__RCSID("$NetBSD: initdir.c,v 1.5 2021/07/11 16:30:41 kre Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -242,6 +242,7 @@ retry:
dirp->dd_size = ddptr - dirp->dd_buf;
} else {
dirp->dd_len = incr;
+ dirp->dd_size = 0;
dirp->dd_buf = malloc((size_t)dirp->dd_len);
if (dirp->dd_buf == NULL)
return errno;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 17:38:55 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: remove shift/reduce conflict for sizeof
According to the grammar, the expression 'sizeof(int)x' was ambiguous.
Since 'sizeof(int)' is a valid term, that could have been reduced,
which would have resulted in a parse error when trying to parse 'x'.
Now 'sizeof' takes a unary_expression instead of a term.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.307 src/usr.bin/xlint/lint1/cgram.y:1.308
--- src/usr.bin/xlint/lint1/cgram.y:1.307 Sun Jul 11 16:57:21 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 17:38:55 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.307 2021/07/11 16:57:21 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.308 2021/07/11 17:38:55 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.307 2021/07/11 16:57:21 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.308 2021/07/11 17:38:55 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 173
+%expect 172
%union {
val_t *y_val;
@@ -280,6 +280,7 @@ anonymize(sym_t *s)
%type primary_expression
%type postfix_expression
+%type unary_expression
%type func_decl
%type notype_decl
@@ -1806,19 +1807,16 @@ postfix_expression: /* C99 6.5.2 */
}
;
-term:/* see C99 6.5.1 */
+unary_expression: /* C99 6.5.3 */
postfix_expression
- | T_INCDEC term {
+ | T_INCDEC unary_expression {
$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
}
- | T_ASTERISK term {
- $$ = build(INDIR, $2, NULL);
- }
| T_AMPER term {
$$ = build(ADDR, $2, NULL);
}
- | T_UNARY term {
- $$ = build($1, $2, NULL);
+ | T_ASTERISK term {
+ $$ = build(INDIR, $2, NULL);
}
| T_ADDITIVE term {
if (tflag && $1 == PLUS) {
@@ -1827,6 +1825,21 @@ term:/* see C99 6.5.1 */
}
$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
}
+ | T_UNARY term {
+ $$ = build($1, $2, NULL);
+ }
+ | T_SIZEOF unary_expression {
+ $$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
+ if ($$ != NULL)
+ check_expr_misc($2, false, false, false, false, false, true);
+ }
+ | T_SIZEOF T_LPAREN type_name T_RPAREN %prec T_SIZEOF {
+ $$ = build_sizeof($3);
+ }
+ ;
+
+term:/* see C99 6.5.1 */
+ unary_expression
| T_REAL term {
$$ = build(REAL, $2, NULL);
}
@@ -1846,14 +1859,6 @@ term:/* see C99 6.5.1 */
symtyp = FMEMBER;
$$ = build_offsetof($3, getsym($5));
}
- | T_SIZEOF term {
- $$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
- if ($$ != NULL)
- check_expr_misc($2, false, false, false, false, false, true);
- }
- | T_SIZEOF T_LPAREN type_name T_RPAREN %prec T_SIZEOF {
- $$ = build_sizeof($3);
- }
| T_ALIGNOF T_LPAREN type_name T_RPAREN {
$$ = build_alignof($3);
}
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 17:38:55 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: remove shift/reduce conflict for sizeof According to the grammar, the expression 'sizeof(int)x' was ambiguous. Since 'sizeof(int)' is a valid term, that could have been reduced, which would have resulted in a parse error when trying to parse 'x'. Now 'sizeof' takes a unary_expression instead of a term. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 19:46:09 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: remove grammar conflict for __real__ and __imag__ The rules were redundant since a term can be parenthesized by itself, there is no need for an extra rule. The rules for '__real__(term)' and '__imag__(term)' were never reduced since these cases were handled by the rules '__real__ term' and '__imag__ term' a few lines above. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.313 -r1.314 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 19:46:09 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: remove grammar conflict for __real__ and __imag__
The rules were redundant since a term can be parenthesized by itself,
there is no need for an extra rule. The rules for '__real__(term)' and
'__imag__(term)' were never reduced since these cases were handled by
the rules '__real__ term' and '__imag__ term' a few lines above.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.313 src/usr.bin/xlint/lint1/cgram.y:1.314
--- src/usr.bin/xlint/lint1/cgram.y:1.313 Sun Jul 11 19:24:41 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 19:46:09 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.313 2021/07/11 19:24:41 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.314 2021/07/11 19:46:09 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.313 2021/07/11 19:24:41 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.314 2021/07/11 19:46:09 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 167
+%expect 165
%union {
val_t *y_val;
@@ -1853,12 +1853,6 @@ term:/* see C99 6.5.1 */
| T_EXTENSION term {
$$ = $2;
}
- | T_REAL T_LPAREN term T_RPAREN {
- $$ = build(REAL, $3, NULL);
- }
- | T_IMAG T_LPAREN term T_RPAREN {
- $$ = build(IMAG, $3, NULL);
- }
| T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
symtyp = FMEMBER;
$$ = build_offsetof($3, getsym($5));
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: tsutsui
Date: Sun Jul 11 13:36:02 UTC 2021
Modified Files:
src/sys/arch/hppa/dev: sti_sgc.c
Log Message:
Fix silent freeze on probing sti(4) framebuffer on 712/60. PR/52162
Ok'ed by skrll@.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/sti_sgc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/sti_sgc.c
diff -u src/sys/arch/hppa/dev/sti_sgc.c:1.2 src/sys/arch/hppa/dev/sti_sgc.c:1.3
--- src/sys/arch/hppa/dev/sti_sgc.c:1.2 Mon Apr 15 20:40:37 2019
+++ src/sys/arch/hppa/dev/sti_sgc.c Sun Jul 11 13:36:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.2 2019/04/15 20:40:37 skrll Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.3 2021/07/11 13:36:02 tsutsui Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.2 2019/04/15 20:40:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.3 2021/07/11 13:36:02 tsutsui Exp $");
#include "opt_cputype.h"
@@ -73,6 +73,16 @@ extern int stidebug;
#define STI_ROMSIZE (sizeof(struct sti_dd) * 4)
#define STI_ID_FDDI 0x280b31af /* Medusa FDDI ROM id */
+/*
+ * hpa addresses to check on-board variants
+ * XXX should check via device_register(9)?
+ *
+ * 0xf400: HPA1991AC19 on 715/33, 715/50
+ * 0xf800: HPA1439A on 735/99, HPA208LCxxx on 715/80, 715/100, 712
+ */
+#define STI_ONBOARD_HPA0 0xf400
+#define STI_ONBOARD_HPA1 0xf800
+
/* gecko optional graphics */
#define STI_GOPT1_REV 0x17
#define STI_GOPT2_REV 0x70
@@ -118,7 +128,9 @@ sti_sgc_getrom(struct confargs *ca)
rom = PAGE0->pd_resv2[1];
hppa_pagezero_unmap(pagezero_cookie);
- if (ca->ca_type.iodc_sv_model == HPPA_FIO_GSGC) {
+ if (ca->ca_type.iodc_sv_model == HPPA_FIO_GSGC &&
+ ca->ca_hpa != STI_ONBOARD_HPA0 &&
+ ca->ca_hpa != STI_ONBOARD_HPA1) {
int i;
for (i = sizeof(sti_sgc_opt); i--; )
if (sti_sgc_opt[i] == ca->ca_type.iodc_revision)
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: tsutsui Date: Sun Jul 11 13:36:02 UTC 2021 Modified Files: src/sys/arch/hppa/dev: sti_sgc.c Log Message: Fix silent freeze on probing sti(4) framebuffer on 712/60. PR/52162 Ok'ed by skrll@. Should be pulled up to netbsd-9 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/sti_sgc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Jul 11 15:07:39 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: decl.c decl.exp gcc_attribute_var.c gcc_attribute_var.exp src/usr.bin/xlint/lint1: cgram.y Log Message: lint: fix bug when parsing unused variable (since 2021-07-10) Partially revert to cgram.y 1.248 from 2021-06-29. This fixes the parse error for variables whose declaration starts with __attribute__((unused)). In the many refactorings of the last days this bug has slipped in, and since there were several refactorings in that area, there may be have been further bugs that are not caught by the current test suite. Revert for now and maybe apply them later again when there are more tests. Things kept from the current version are: The names of most of the rules, as they correspond more closely to C99 and do not affect the behavior in any way. In type_direct_decl, the replacement of type_attribute_list with type_attribute since that nonterminal is already part of a repetition (saves 4 conflicts). In block_item, the order of the rules corresponds to C99. This has no influence on the generated parser, except for the rule numbers, which are informative. The merge of the duplicate code for struct_tag, enum_tag and enum_constant, as they all contained exactly the same code. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/decl.c \ src/tests/usr.bin/xlint/lint1/decl.exp cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp cvs rdiff -u -r1.305 -r1.306 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Jul 11 15:07:39 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl.c decl.exp gcc_attribute_var.c
gcc_attribute_var.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix bug when parsing unused variable (since 2021-07-10)
Partially revert to cgram.y 1.248 from 2021-06-29.
This fixes the parse error for variables whose declaration starts with
__attribute__((unused)). In the many refactorings of the last days this
bug has slipped in, and since there were several refactorings in that
area, there may be have been further bugs that are not caught by the
current test suite. Revert for now and maybe apply them later again
when there are more tests.
Things kept from the current version are:
The names of most of the rules, as they correspond more closely to C99
and do not affect the behavior in any way.
In type_direct_decl, the replacement of type_attribute_list with
type_attribute since that nonterminal is already part of a repetition
(saves 4 conflicts).
In block_item, the order of the rules corresponds to C99. This has no
influence on the generated parser, except for the rule numbers, which
are informative.
The merge of the duplicate code for struct_tag, enum_tag and
enum_constant, as they all contained exactly the same code.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/decl.c \
src/tests/usr.bin/xlint/lint1/decl.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c \
src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp
cvs rdiff -u -r1.305 -r1.306 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl.c
diff -u src/tests/usr.bin/xlint/lint1/decl.c:1.3 src/tests/usr.bin/xlint/lint1/decl.c:1.4
--- src/tests/usr.bin/xlint/lint1/decl.c:1.3 Sun Jul 11 12:12:30 2021
+++ src/tests/usr.bin/xlint/lint1/decl.c Sun Jul 11 15:07:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.3 2021/07/11 12:12:30 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.4 2021/07/11 15:07:39 rillig Exp $ */
# 3 "decl.c"
/*
@@ -87,14 +87,15 @@ enum_error_handling(void)
return x == B;
}
+/*
+ * An __attribute__ at the beginning of a declaration may become ambiguous
+ * since a GCC fallthrough statement starts with __attribute__ as well.
+ */
void
unused_local_variable(void)
{
- /*FIXME*//* expect+1: syntax error '_Bool' [249] */
__attribute__((unused)) _Bool unused_var;
__attribute__((unused))
- /*FIXME*//* expect+2: syntax error '__attribute__' [249] */
- /*FIXME*//* expect+1: cannot recover from previous errors [224] */
__attribute__((unused)) _Bool unused_twice;
}
Index: src/tests/usr.bin/xlint/lint1/decl.exp
diff -u src/tests/usr.bin/xlint/lint1/decl.exp:1.3 src/tests/usr.bin/xlint/lint1/decl.exp:1.4
--- src/tests/usr.bin/xlint/lint1/decl.exp:1.3 Sun Jul 11 12:12:30 2021
+++ src/tests/usr.bin/xlint/lint1/decl.exp Sun Jul 11 15:07:39 2021
@@ -9,6 +9,3 @@ decl.c(68): warning: converting 'pointer
decl.c(70): warning: illegal combination of pointer (pointer to double) and integer (char), arg #1 [154]
decl.c(72): warning: converting 'pointer to pointer to char' to incompatible 'pointer to double' for argument 1 [153]
decl.c(80): error: syntax error '"' [249]
-decl.c(94): error: syntax error '_Bool' [249]
-decl.c(99): error: syntax error '__attribute__' [249]
-decl.c(99): error: cannot recover from previous errors [224]
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c:1.2 Sun Jul 11 13:32:06 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.c Sun Jul 11 15:07:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_var.c,v 1.2 2021/07/11 13:32:06 rillig Exp $ */
+/* $NetBSD: gcc_attribute_var.c,v 1.3 2021/07/11 15:07:39 rillig Exp $ */
# 3 "gcc_attribute_var.c"
/*
@@ -50,13 +50,12 @@ void println(void);
void
ambiguity_for_attribute(void)
{
- /*FIXME*//* expect+1: error: syntax error '_Bool' [249] */
__attribute__((unused)) _Bool var1;
switch (1) {
case 1:
println();
- /*FIXME*//* expect+1: error: syntax error '_Bool' [249] */
+ /* expect+1: warning: 'var2' unused in function 'ambiguity_for_attribute' [192] */
__attribute__((unused)) _Bool var2;
__attribute__((fallthrough));
case 2:
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.3
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp:1.2 Sun Jul 11 13:32:06 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp Sun Jul 11 15:07:39 2021
@@ -1,3 +1,2 @@
-gcc_attribute_var.c(54): error: syntax error '_Bool'
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: cjep Date: Sun Jul 11 10:51:46 UTC 2021 Modified Files: src/usr.sbin/sysinst: msg_xlat.sh Log Message: We need IFS to be set to % for the rest of the script so be explicit about it. Fixes message truncation for non-English in sysinst. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/msg_xlat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: cjep Date: Sun Jul 11 10:51:46 UTC 2021 Modified Files: src/usr.sbin/sysinst: msg_xlat.sh Log Message: We need IFS to be set to % for the rest of the script so be explicit about it. Fixes message truncation for non-English in sysinst. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/msg_xlat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/msg_xlat.sh diff -u src/usr.sbin/sysinst/msg_xlat.sh:1.3 src/usr.sbin/sysinst/msg_xlat.sh:1.4 --- src/usr.sbin/sysinst/msg_xlat.sh:1.3 Tue Jun 29 08:02:50 2021 +++ src/usr.sbin/sysinst/msg_xlat.sh Sun Jul 11 10:51:46 2021 @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: msg_xlat.sh,v 1.3 2021/06/29 08:02:50 cjep Exp $ +# $NetBSD: msg_xlat.sh,v 1.4 2021/07/11 10:51:46 cjep Exp $ #- # Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -174,7 +174,7 @@ do $IGNORE_MISSING_TRANSLATIONS || rval=1 fi done -unset IFS +IFS=% if $count_fmtargs; then exit $rval; fi
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 17:52:20 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: remove redundant %prec from the grammar Now that the precedence of the unary operators has been modeled via separate rules, the precedence is no longer needed. No change to the generated parser, with both yacc or Bison. To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 17:52:20 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: remove redundant %prec from the grammar
Now that the precedence of the unary operators has been modeled via
separate rules, the precedence is no longer needed.
No change to the generated parser, with both yacc or Bison.
To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.308 src/usr.bin/xlint/lint1/cgram.y:1.309
--- src/usr.bin/xlint/lint1/cgram.y:1.308 Sun Jul 11 17:38:55 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 17:52:20 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.308 2021/07/11 17:38:55 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.309 2021/07/11 17:52:20 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.308 2021/07/11 17:38:55 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.309 2021/07/11 17:52:20 rillig Exp $");
#endif
#include
@@ -270,8 +270,6 @@ anonymize(sym_t *s)
%left T_SHIFT
%left T_ADDITIVE
%left T_ASTERISK T_MULTIPLICATIVE
-%right T_UNARY T_INCDEC T_SIZEOF T_REAL T_IMAG
-%left T_LPAREN T_LBRACK T_POINT T_ARROW
%token T_NAME
%token T_TYPENAME
@@ -1833,7 +1831,7 @@ unary_expression: /* C99 6.5.3 */
if ($$ != NULL)
check_expr_misc($2, false, false, false, false, false, true);
}
- | T_SIZEOF T_LPAREN type_name T_RPAREN %prec T_SIZEOF {
+ | T_SIZEOF T_LPAREN type_name T_RPAREN {
$$ = build_sizeof($3);
}
;
@@ -1862,7 +1860,7 @@ term:/* see C99 6.5.1 */
| T_ALIGNOF T_LPAREN type_name T_RPAREN {
$$ = build_alignof($3);
}
- | T_LPAREN type_name T_RPAREN term %prec T_UNARY {
+ | T_LPAREN type_name T_RPAREN term {
$$ = cast($4, $2);
}
;
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 19:39:00 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_complex_split.c
Log Message:
tests/lint: test precedence of __real__ and cast_expression
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.7 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.8
--- src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.7 Fri Apr 9 21:42:12 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c Sun Jul 11 19:39:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_complex_split.c,v 1.7 2021/04/09 21:42:12 rillig Exp $ */
+/* $NetBSD: d_c99_complex_split.c,v 1.8 2021/07/11 19:39:00 rillig Exp $ */
# 3 "d_c99_complex_split.c"
/*
@@ -81,3 +81,13 @@ trigger_warning(double _Complex c)
c += 1.0;
return c | c; /* expect: incompatible types */
}
+
+void
+precedence_cast_expression(void)
+{
+ double _Complex z = 0;
+ if (b(__real__(double _Complex)z) && b(__imag__(double _Complex)z))
+ return;
+ if (b(__real__(z)) && b(__imag__(z)))
+ return;
+}
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 19:39:00 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: d_c99_complex_split.c Log Message: tests/lint: test precedence of __real__ and cast_expression To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 12:07:15 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: accept.sh Log Message: tests/lint: suppress ShellCheck warnings for intentional violations The undeclared variables are generated by the AWK program. The variable 'flags' must be split into words at exactly this point. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/accept.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/accept.sh diff -u src/tests/usr.bin/xlint/lint1/accept.sh:1.1 src/tests/usr.bin/xlint/lint1/accept.sh:1.2 --- src/tests/usr.bin/xlint/lint1/accept.sh:1.1 Tue Jun 29 09:44:25 2021 +++ src/tests/usr.bin/xlint/lint1/accept.sh Sun Jul 11 12:07:14 2021 @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: accept.sh,v 1.1 2021/06/29 09:44:25 rillig Exp $ +# $NetBSD: accept.sh,v 1.2 2021/07/11 12:07:14 rillig Exp $ # # Copyright (c) 2021 The NetBSD Foundation, Inc. # All rights reserved. @@ -44,6 +44,7 @@ for pattern in "$@"; do ln_file="$base.ln" configure_test_case "$cfile" + # shellcheck disable=SC2154 if [ $skip = yes ]; then continue fi @@ -52,6 +53,8 @@ for pattern in "$@"; do ln_file='/dev/null' fi + # shellcheck disable=SC2154 + # shellcheck disable=SC2086 if "$lint1" $flags "$base.c" "$ln_file" > "$tmpfile"; then if [ -s "$tmpfile" ]; then echo "$base produces output but exits successfully"
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 12:07:15 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: accept.sh Log Message: tests/lint: suppress ShellCheck warnings for intentional violations The undeclared variables are generated by the AWK program. The variable 'flags' must be split into words at exactly this point. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/accept.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 18:03:47 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l
Log Message:
lint: use separate tokens for logical not and bitwise complement
The token T_UNARY was misleading since it only captured 2 of the 6
operators that C99 calls unary-operator. Make the grammar easier to
understand by explicitly listing these 2 operators.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.134 -r1.135 src/usr.bin/xlint/lint1/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.309 src/usr.bin/xlint/lint1/cgram.y:1.310
--- src/usr.bin/xlint/lint1/cgram.y:1.309 Sun Jul 11 17:52:20 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 18:03:47 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.309 2021/07/11 17:52:20 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.309 2021/07/11 17:52:20 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 rillig Exp $");
#endif
#include
@@ -145,7 +145,7 @@ anonymize(sym_t *s)
%token T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPAREN T_RPAREN
%token T_POINT T_ARROW
-%token T_UNARY
+%token T_COMPLEMENT T_LOGNOT
%token T_INCDEC
%token T_SIZEOF
%token T_BUILTIN_OFFSETOF
@@ -1823,8 +1823,11 @@ unary_expression: /* C99 6.5.3 */
}
$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
}
- | T_UNARY term {
- $$ = build($1, $2, NULL);
+ | T_COMPLEMENT term {
+ $$ = build(COMPL, $2, NULL);
+ }
+ | T_LOGNOT term {
+ $$ = build(NOT, $2, NULL);
}
| T_SIZEOF unary_expression {
$$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.134 src/usr.bin/xlint/lint1/scan.l:1.135
--- src/usr.bin/xlint/lint1/scan.l:1.134 Sun Jun 20 18:15:12 2021
+++ src/usr.bin/xlint/lint1/scan.l Sun Jul 11 18:03:47 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.134 2021/06/20 18:15:12 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.135 2021/07/11 18:03:47 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.134 2021/06/20 18:15:12 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.135 2021/07/11 18:03:47 rillig Exp $");
#endif
#include "lint1.h"
@@ -101,8 +101,8 @@ TL ([fFlL]?[i]?)
"*"return T_ASTERISK;
"/"return lex_operator(T_MULTIPLICATIVE, DIV);
"%"return lex_operator(T_MULTIPLICATIVE, MOD);
-"!"return lex_operator(T_UNARY, NOT);
-"~"return lex_operator(T_UNARY, COMPL);
+"!"return T_LOGNOT;
+"~"return T_COMPLEMENT;
"\""return lex_string();
"L\""return lex_wide_string();
";"return T_SEMI;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 18:03:47 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y scan.l Log Message: lint: use separate tokens for logical not and bitwise complement The token T_UNARY was misleading since it only captured 2 of the 6 operators that C99 calls unary-operator. Make the grammar easier to understand by explicitly listing these 2 operators. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.134 -r1.135 src/usr.bin/xlint/lint1/scan.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 18:22:03 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: resolve shift/reduce conflict in notype_direct_decl When a notype_direct_decl was followed by a type_attribute_list, and the next token was another type_attribute, the parser could either continue the current type_attribute_list or start a new one. Either way has the same effect since type_attribute_list has no associated action. This reduces the conflicts by 4, one for each of T_ALIGNAS, T_ATTRIBUTE, T_NORETURN, T_PACKED. There are several other conflicts involving these 4 tokens, but they are harder to fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.310 -r1.311 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 18:22:03 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: resolve shift/reduce conflict in notype_direct_decl
When a notype_direct_decl was followed by a type_attribute_list, and the
next token was another type_attribute, the parser could either continue
the current type_attribute_list or start a new one. Either way has the
same effect since type_attribute_list has no associated action.
This reduces the conflicts by 4, one for each of T_ALIGNAS, T_ATTRIBUTE,
T_NORETURN, T_PACKED. There are several other conflicts involving these
4 tokens, but they are harder to fix.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.310 src/usr.bin/xlint/lint1/cgram.y:1.311
--- src/usr.bin/xlint/lint1/cgram.y:1.310 Sun Jul 11 18:03:47 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 18:22:02 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.311 2021/07/11 18:22:02 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.311 2021/07/11 18:22:02 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 172
+%expect 168
%union {
val_t *y_val;
@@ -979,7 +979,7 @@ notype_direct_decl:
end_declaration_level();
block_level--;
}
- | notype_direct_decl type_attribute_list
+ | notype_direct_decl type_attribute
;
type_direct_decl:
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Jul 11 19:24:42 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile gcc_attribute_label.c msg_023.c msg_023.exp msg_232.c src/usr.bin/xlint/lint1: cgram.y lex.c Removed Files: src/tests/usr.bin/xlint/lint1: gcc_attribute_label.exp Log Message: lint: support __attribute__((hot)) The corresponding attribute 'cold' was already added in cgram.y 1.84 from 2016-12-29. To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.85 -r1.86 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_023.c \ src/tests/usr.bin/xlint/lint1/msg_023.exp cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_232.c cvs rdiff -u -r1.312 -r1.313 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.54 -r1.55 src/usr.bin/xlint/lint1/lex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Jul 11 19:24:42 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile gcc_attribute_label.c msg_023.c
msg_023.exp msg_232.c
src/usr.bin/xlint/lint1: cgram.y lex.c
Removed Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute_label.exp
Log Message:
lint: support __attribute__((hot))
The corresponding attribute 'cold' was already added in cgram.y 1.84
from 2016-12-29.
To generate a diff of this commit:
cvs rdiff -u -r1.1084 -r1.1085 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.85 -r1.86 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_023.c \
src/tests/usr.bin/xlint/lint1/msg_023.exp
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_232.c
cvs rdiff -u -r1.312 -r1.313 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/xlint/lint1/lex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1084 src/distrib/sets/lists/tests/mi:1.1085
--- src/distrib/sets/lists/tests/mi:1.1084 Sun Jul 11 18:58:13 2021
+++ src/distrib/sets/lists/tests/mi Sun Jul 11 19:24:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1084 2021/07/11 18:58:13 rillig Exp $
+# $NetBSD: mi,v 1.1085 2021/07/11 19:24:41 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6233,7 +6233,7 @@
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_func.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp tests-obsolete obsolete
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_attribute_type.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.85 src/tests/usr.bin/xlint/lint1/Makefile:1.86
--- src/tests/usr.bin/xlint/lint1/Makefile:1.85 Sun Jul 11 18:58:13 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Jul 11 19:24:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2021/07/11 18:58:13 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2021/07/11 19:24:42 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -130,7 +130,6 @@ FILES+= gcc_attribute_enum.exp
FILES+= gcc_attribute_func.c
FILES+= gcc_attribute_func.exp
FILES+= gcc_attribute_label.c
-FILES+= gcc_attribute_label.exp
FILES+= gcc_attribute_stmt.c
FILES+= gcc_attribute_stmt.exp
FILES+= gcc_attribute_type.c
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c
diff -u src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c:1.1 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c:1.2
--- src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c:1.1 Tue Jul 6 17:33:07 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c Sun Jul 11 19:24:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gcc_attribute_label.c,v 1.1 2021/07/06 17:33:07 rillig Exp $ */
+/* $NetBSD: gcc_attribute_label.c,v 1.2 2021/07/11 19:24:42 rillig Exp $ */
# 3 "gcc_attribute_label.c"
/*
@@ -14,18 +14,12 @@ test(int i)
{
if (i < 1000)
goto hot;
- /* TODO: add quotes to message 232 */
- /*FIXME*//* expect+1: warning: label error unused in function test [232] */
error:
__attribute__((__cold__));
dead();
hot:
- /* expect+1: error: syntax error '__hot__' [249] */
__attribute__((__hot__));
- /*FIXME*//* expect+1: error: 'i' undefined [99] */
if (i < 0)
- /* TODO: add quotes to message 23 */
- /* expect+1: warning: undefined label error [23] */
goto error;
}
Index: src/tests/usr.bin/xlint/lint1/msg_023.c
diff -u src/tests/usr.bin/xlint/lint1/msg_023.c:1.2 src/tests/usr.bin/xlint/lint1/msg_023.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_023.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_023.c Sun Jul 11 19:24:42 2021
@@ -1,7 +1,14 @@
-/* $NetBSD: msg_023.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_023.c,v 1.3 2021/07/11 19:24:42 rillig Exp $ */
# 3 "msg_023.c"
// Test for message: undefined label %s [23]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+void
+test(void)
+{
+ goto defined_label;
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Jul 11 22:07:35 UTC 2021 Modified Files: src/share/mk: bsd.own.mk Log Message: switch Mesa 19 to use MesaLib.old subdir. To generate a diff of this commit: cvs rdiff -u -r1.1257 -r1.1258 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Jul 11 22:07:35 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch Mesa 19 to use MesaLib.old subdir.
To generate a diff of this commit:
cvs rdiff -u -r1.1257 -r1.1258 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1257 src/share/mk/bsd.own.mk:1.1258
--- src/share/mk/bsd.own.mk:1.1257 Sat Jun 19 06:19:35 2021
+++ src/share/mk/bsd.own.mk Sun Jul 11 22:07:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1257 2021/06/19 06:19:35 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1258 2021/07/11 22:07:35 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1259,18 +1259,17 @@ MKDTB.earmv7hf= yes
MKDTB.earmv7eb= yes
MKDTB.earmv7hfeb= yes
-# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
-HAVE_MESA_VER?= 18
-.if ${HAVE_MESA_VER} == "10"
+HAVE_MESA_VER?= 19
+.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
-.elif ${HAVE_MESA_VER} == "18"
+.elif ${HAVE_MESA_VER} == 21
EXTERNAL_MESALIB_DIR?= MesaLib
.endif
-# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18
+# Default to LLVM run-time if x86 or aarch64 and X11 and Mesa 18 or newer
# XXX This knows that MKX11=no is default below, but would
# require splitting the below loop in two parts.
-.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} == "18"
+.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} >= 19
MKLLVMRT.amd64= yes
MKLLVMRT.i386= yes
MKLLVMRT.aarch64= yes
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 20:07:42 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: reorganize grammar rules for unary expressions According to GCC, __builtin_offsetof is a primary-expression. According to GCC, __real__, __imag__ and __extension__ are unary-operator, just like '!' and '~'. According to C11, _Alignof is a unary-operator. To generate a diff of this commit: cvs rdiff -u -r1.314 -r1.315 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Jul 11 20:15:38 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: note that MPC is now at 1.2.1, and that GMP has 6.2.1 available. To generate a diff of this commit: cvs rdiff -u -r1.1805 -r1.1806 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1805 src/doc/3RDPARTY:1.1806 --- src/doc/3RDPARTY:1.1805 Tue Jul 6 12:26:03 2021 +++ src/doc/3RDPARTY Sun Jul 11 20:15:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1805 2021/07/06 12:26:03 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1806 2021/07/11 20:15:38 mrg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1514,8 +1514,8 @@ Notes: 3. Carefully check for non-autoconf GPL components leaked into the dist area. Package: mpc -Version: 1.2.0 -Current Vers: 1.2.0 +Version: 1.2.1 +Current Vers: 1.2.1 Maintainer: Archive Site: http://www.multiprecision.org/mpc/download/ Home Page: http://www.multiprecision.org/mpc/ @@ -1539,7 +1539,7 @@ Notes: Package: GNU MP Version: 6.2.0 -Current Vers: 6.2.0 +Current Vers: 6.2.1 Maintainer: http://gmplib.org/mailman/listinfo/gmp-devel Archive Site: http://gmplib.org/ Home Page: http://gmplib.org/
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Jul 11 20:15:38 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: note that MPC is now at 1.2.1, and that GMP has 6.2.1 available. To generate a diff of this commit: cvs rdiff -u -r1.1805 -r1.1806 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 21:15:48 UTC 2021 Modified Files: src/external/lgpl3/gmp/dist: Makefile.in config.guess configfsf.guess configfsf.sub configure gmp-h.in gmp-impl.h longlong.h src/external/lgpl3/gmp/dist/mpn/generic: mod_1_1.c Removed Files: src/external/lgpl3/gmp/dist/mpn/alpha/ev67: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm/v5: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm/v6t2: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/ia64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/mips64: addmul_1.asm mul_1.asm sqr_diagonal.asm submul_1.asm umul.asm src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/sparc64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/bobcat: gmp-mparam.h src/external/lgpl3/gmp/dist/mpn/x86/fat: gcd_1.c src/external/lgpl3/gmp/dist/mpn/x86/k6: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/k7: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/p6: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64: addmul_2.asm gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/bd1: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat: aors_n.asm aorsmul_1.asm copyd.asm copyi.asm gmp-mparam.h mul_1.asm mul_basecase.asm redc_1.asm sqr_basecase.asm src/external/lgpl3/gmp/dist/mpn/x86_64/core2: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/coreisbr: popcount.asm src/external/lgpl3/gmp/dist/mpn/x86_64/k10: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/mulx: aorsmul_1.asm mul_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/nano: gcd_1.asm src/external/lgpl3/gmp/dist/tests/cxx: t-ops2.cc src/external/lgpl3/gmp/dist/tests/devel: addmul_N.c anymul_1.c aors_n.c cnd_aors_n.c copy.c divmod_1.c divrem.c logops_n.c mul_N.c shift.c tst-addsub.c src/external/lgpl3/gmp/dist/tests/mpz: bit.c Log Message: merge GMP 6.2.1. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/dist/Makefile.in \ src/external/lgpl3/gmp/dist/gmp-impl.h cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/config.guess \ src/external/lgpl3/gmp/dist/configfsf.sub \ src/external/lgpl3/gmp/dist/gmp-h.in cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/configfsf.guess \ src/external/lgpl3/gmp/dist/longlong.h cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/dist/configure cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/alpha/ev67/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v5/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v6t2/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 src/external/lgpl3/gmp/dist/mpn/arm64/gcd_1.asm cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/ia64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/mips64/addmul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/mul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/sqr_diagonal.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/submul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/umul.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/sparc64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86/bobcat/gmp-mparam.h cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/fat/gcd_1.c cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k6/gcd_1.asm cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k7/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/p6/gcd_1.asm cvs rdiff -u -r1.1.1.3 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/addmul_2.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bd1/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aors_n.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/redc_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aorsmul_1.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyd.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyi.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/gmp-mparam.h \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_1.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_basecase.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/sqr_basecase.asm cvs
CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 21:24:14 UTC 2021 Modified Files: xsrc/external/mit/xf86-video-ati-kms/dist/src: drmmode_display.c radeon_bo_helper.c Log Message: fix a couple of issues found while testing new drm. - actually check the return value of radeon_bo_open() in a three places - for create_pixmap_for_fbcon(), release the bo when jumping to 'out_free_fb'. fixes memory leak. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 21:15:48 UTC 2021 Modified Files: src/external/lgpl3/gmp/dist: Makefile.in config.guess configfsf.guess configfsf.sub configure gmp-h.in gmp-impl.h longlong.h src/external/lgpl3/gmp/dist/mpn/generic: mod_1_1.c Removed Files: src/external/lgpl3/gmp/dist/mpn/alpha/ev67: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm/v5: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm/v6t2: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/arm64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/ia64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/mips64: addmul_1.asm mul_1.asm sqr_diagonal.asm submul_1.asm umul.asm src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/sparc64: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/bobcat: gmp-mparam.h src/external/lgpl3/gmp/dist/mpn/x86/fat: gcd_1.c src/external/lgpl3/gmp/dist/mpn/x86/k6: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/k7: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86/p6: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64: addmul_2.asm gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/bd1: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat: aors_n.asm aorsmul_1.asm copyd.asm copyi.asm gmp-mparam.h mul_1.asm mul_basecase.asm redc_1.asm sqr_basecase.asm src/external/lgpl3/gmp/dist/mpn/x86_64/core2: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/coreisbr: popcount.asm src/external/lgpl3/gmp/dist/mpn/x86_64/k10: gcd_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/mulx: aorsmul_1.asm mul_1.asm src/external/lgpl3/gmp/dist/mpn/x86_64/nano: gcd_1.asm src/external/lgpl3/gmp/dist/tests/cxx: t-ops2.cc src/external/lgpl3/gmp/dist/tests/devel: addmul_N.c anymul_1.c aors_n.c cnd_aors_n.c copy.c divmod_1.c divrem.c logops_n.c mul_N.c shift.c tst-addsub.c src/external/lgpl3/gmp/dist/tests/mpz: bit.c Log Message: merge GMP 6.2.1. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/dist/Makefile.in \ src/external/lgpl3/gmp/dist/gmp-impl.h cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/dist/config.guess \ src/external/lgpl3/gmp/dist/configfsf.sub \ src/external/lgpl3/gmp/dist/gmp-h.in cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/configfsf.guess \ src/external/lgpl3/gmp/dist/longlong.h cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/dist/configure cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/alpha/ev67/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v5/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/arm/v6t2/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 src/external/lgpl3/gmp/dist/mpn/arm64/gcd_1.asm cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/ia64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/mips64/addmul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/mul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/sqr_diagonal.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/submul_1.asm \ src/external/lgpl3/gmp/dist/mpn/mips64/umul.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/powerpc64/mode64/p7/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/sparc64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86/bobcat/gmp-mparam.h cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/fat/gcd_1.c cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k6/gcd_1.asm cvs rdiff -u -r1.1.1.3 -r0 src/external/lgpl3/gmp/dist/mpn/x86/k7/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 src/external/lgpl3/gmp/dist/mpn/x86/p6/gcd_1.asm cvs rdiff -u -r1.1.1.3 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/addmul_2.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/gcd_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bd1/gcd_1.asm cvs rdiff -u -r1.1.1.1 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aors_n.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/redc_1.asm cvs rdiff -u -r1.1.1.2 -r0 \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/aorsmul_1.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyd.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/copyi.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/gmp-mparam.h \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_1.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/mul_basecase.asm \ src/external/lgpl3/gmp/dist/mpn/x86_64/bobcat/sqr_basecase.asm cvs
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Jul 11 21:28:17 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: GMP is updated to 6.2.1 now. To generate a diff of this commit: cvs rdiff -u -r1.1806 -r1.1807 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 11 21:24:14 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: drmmode_display.c
radeon_bo_helper.c
Log Message:
fix a couple of issues found while testing new drm.
- actually check the return value of radeon_bo_open() in a three places
- for create_pixmap_for_fbcon(), release the bo when jumping to
'out_free_fb'. fixes memory leak.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.2 xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.3
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c:1.2 Fri Feb 7 23:36:50 2020
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c Sun Jul 11 21:24:14 2021
@@ -373,7 +373,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
RADEONInfoPtr info = RADEONPTR(pScrn);
PixmapPtr pixmap = info->fbcon_pixmap;
- struct radeon_buffer *bo;
+ struct radeon_buffer *bo = NULL;
drmModeFBPtr fbcon;
struct drm_gem_flink flink;
@@ -405,7 +405,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
bo->ref_count = 1;
bo->bo.radeon = radeon_bo_open(drmmode->bufmgr, flink.name, 0, 0, 0, 0);
- if (!bo) {
+ if (!bo->bo.radeon) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Couldn't open BO for fbcon handle\n");
goto out_free_fb;
@@ -415,8 +415,8 @@ create_pixmap_for_fbcon(drmmode_ptr drmm
fbcon->depth, fbcon->bpp, fbcon->pitch,
bo);
info->fbcon_pixmap = pixmap;
- radeon_buffer_unref();
out_free_fb:
+ radeon_buffer_unref();
drmModeFreeFB(fbcon);
return pixmap;
}
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.3 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.4
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.3 Sat Jun 1 07:25:41 2019
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c Sun Jul 11 21:24:14 2021
@@ -308,7 +308,7 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn
bo->bo.radeon = radeon_bo_open(info->bufmgr, 0, size, base_align,
domain, flags);
-if (bo && tiling && radeon_bo_set_tiling(bo->bo.radeon, tiling, pitch) == 0)
+if (bo->bo.radeon && tiling && radeon_bo_set_tiling(bo->bo.radeon, tiling, pitch) == 0)
*new_tiling = tiling;
*new_pitch = pitch;
@@ -504,7 +504,7 @@ Bool radeon_set_shared_pixmap_backing(Pi
#endif
bo->bo.radeon = radeon_gem_bo_open_prime(info->bufmgr, ihandle, size);
-if (!bo)
+if (!bo->bo.radeon)
goto error;
bo->ref_count = 1;
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Jul 11 21:28:17 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: GMP is updated to 6.2.1 now. To generate a diff of this commit: cvs rdiff -u -r1.1806 -r1.1807 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1806 src/doc/3RDPARTY:1.1807 --- src/doc/3RDPARTY:1.1806 Sun Jul 11 20:15:38 2021 +++ src/doc/3RDPARTY Sun Jul 11 21:28:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1806 2021/07/11 20:15:38 mrg Exp $ +# $NetBSD: 3RDPARTY,v 1.1807 2021/07/11 21:28:17 mrg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1538,7 +1538,7 @@ Location: external/lgpl3/mpfr/dist Notes: Package: GNU MP -Version: 6.2.0 +Version: 6.2.1 Current Vers: 6.2.1 Maintainer: http://gmplib.org/mailman/listinfo/gmp-devel Archive Site: http://gmplib.org/
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Jul 11 20:37:21 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: c11_generic_expression.c
c11_generic_expression.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: make _Generic a primary-expression
C11 says so, and unless the _Generic expression was wrapped in
parentheses, it was not possible before to use it as a function call
expression.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.c
cvs rdiff -u -r1.6 -r1.7 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp
cvs rdiff -u -r1.316 -r1.317 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/c11_generic_expression.c
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.7 src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.8
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.7 Sun Jul 11 20:34:05 2021
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c Sun Jul 11 20:37:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c11_generic_expression.c,v 1.7 2021/07/11 20:34:05 rillig Exp $ */
+/* $NetBSD: c11_generic_expression.c,v 1.8 2021/07/11 20:37:21 rillig Exp $ */
# 3 "c11_generic_expression.c"
/*
@@ -92,7 +92,5 @@ assignment_expression(int first, int sec
int
primary_expression(void)
{
- /*FIXME*//* expect+1: syntax error '(' [249] */
return _Generic(0, int: assignment_expression)(0, 0);
}
-/* expect-1: falls off */
Index: src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.6 src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.7
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.6 Sun Jul 11 20:34:05 2021
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp Sun Jul 11 20:37:21 2021
@@ -4,5 +4,3 @@ c11_generic_expression.c(37): warning: a
c11_generic_expression.c(53): warning: argument 'c' unused in function 'classify_char' [231]
c11_generic_expression.c(72): error: syntax error 'second' [249]
c11_generic_expression.c(77): warning: function comma_expression falls off bottom without returning value [217]
-c11_generic_expression.c(96): error: syntax error '(' [249]
-c11_generic_expression.c(97): warning: function primary_expression falls off bottom without returning value [217]
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.316 src/usr.bin/xlint/lint1/cgram.y:1.317
--- src/usr.bin/xlint/lint1/cgram.y:1.316 Sun Jul 11 20:25:54 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 20:37:21 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 rillig Exp $");
#endif
#include
@@ -1722,7 +1722,6 @@ expr:/* C99 6.5 */
$$ = build(COMMA, $1, $3);
}
| cast_expression
- | generic_selection /* TODO: move to primary_expression */
;
assignment_expression: /* C99 6.5.16 */
@@ -1747,6 +1746,7 @@ primary_expression: /* C99 6.5.1 */
$2->tn_parenthesized = true;
$$ = $2;
}
+ | generic_selection
/* GCC primary-expression, see c_parser_postfix_expression */
| T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
symtyp = FMEMBER;
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Jul 11 20:37:21 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: c11_generic_expression.c c11_generic_expression.exp src/usr.bin/xlint/lint1: cgram.y Log Message: lint: make _Generic a primary-expression C11 says so, and unless the _Generic expression was wrapped in parentheses, it was not possible before to use it as a function call expression. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c cvs rdiff -u -r1.6 -r1.7 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp cvs rdiff -u -r1.316 -r1.317 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jul 11 21:58:52 UTC 2021 Modified Files: src: UPDATING Log Message: note that new GMP may require some cleaning. To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jul 11 21:58:52 UTC 2021 Modified Files: src: UPDATING Log Message: note that new GMP may require some cleaning. To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.318 src/UPDATING:1.319 --- src/UPDATING:1.318 Sat Apr 17 04:08:32 2021 +++ src/UPDATING Sun Jul 11 21:58:52 2021 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.318 2021/04/17 04:08:32 mrg Exp $ +$NetBSD: UPDATING,v 1.319 2021/07/11 21:58:52 mrg Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,10 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20210711: + Updated GMP sources may require cleaning in tools/gmp and/or in + external/lgpl3/gmp/lib, particularly if GCC itself does not build. + 20210417: GCC 10 was enabled for several platforms. If builds fail in either tools/gcc or external/gpl/gcc, first try cleaning those objects and
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 20:07:42 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: reorganize grammar rules for unary expressions
According to GCC, __builtin_offsetof is a primary-expression.
According to GCC, __real__, __imag__ and __extension__ are
unary-operator, just like '!' and '~'.
According to C11, _Alignof is a unary-operator.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.314 src/usr.bin/xlint/lint1/cgram.y:1.315
--- src/usr.bin/xlint/lint1/cgram.y:1.314 Sun Jul 11 19:46:09 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 20:07:41 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.314 2021/07/11 19:46:09 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.315 2021/07/11 20:07:41 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.314 2021/07/11 19:46:09 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.315 2021/07/11 20:07:41 rillig Exp $");
#endif
#include
@@ -1747,6 +1747,11 @@ primary_expression: /* C99 6.5.1 */
$2->tn_parenthesized = true;
$$ = $2;
}
+ /* GCC primary-expression, see c_parser_postfix_expression */
+ | T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
+ symtyp = FMEMBER;
+ $$ = build_offsetof($3, getsym($5));
+ }
;
postfix_expression: /* C99 6.5.2 */
@@ -1802,10 +1807,10 @@ postfix_expression: /* C99 6.5.2 */
block_level++;
/* ({ }) is a GCC extension */
gnuism(320);
- } compound_statement_rbrace T_RPAREN {
+ } compound_statement_rbrace T_RPAREN {
$$ = new_name_node(*current_initsym(), 0);
end_initialization();
- }
+ }
;
unary_expression: /* C99 6.5.3 */
@@ -1832,6 +1837,15 @@ unary_expression: /* C99 6.5.3 */
| T_LOGNOT term {
$$ = build(NOT, $2, NULL);
}
+ | T_REAL term { /* GCC c_parser_unary_expression */
+ $$ = build(REAL, $2, NULL);
+ }
+ | T_IMAG term { /* GCC c_parser_unary_expression */
+ $$ = build(IMAG, $2, NULL);
+ }
+ | T_EXTENSION term { /* GCC c_parser_unary_expression */
+ $$ = $2;
+ }
| T_SIZEOF unary_expression {
$$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
if ($$ != NULL)
@@ -1840,26 +1854,13 @@ unary_expression: /* C99 6.5.3 */
| T_SIZEOF T_LPAREN type_name T_RPAREN {
$$ = build_sizeof($3);
}
+ | T_ALIGNOF T_LPAREN type_name T_RPAREN { /* C11 6.5.3 */
+ $$ = build_alignof($3);
+ }
;
term:/* see C99 6.5.1 */
unary_expression
- | T_REAL term {
- $$ = build(REAL, $2, NULL);
- }
- | T_IMAG term {
- $$ = build(IMAG, $2, NULL);
- }
- | T_EXTENSION term {
- $$ = $2;
- }
- | T_BUILTIN_OFFSETOF T_LPAREN type_name T_COMMA identifier T_RPAREN {
- symtyp = FMEMBER;
- $$ = build_offsetof($3, getsym($5));
- }
- | T_ALIGNOF T_LPAREN type_name T_RPAREN {
- $$ = build_alignof($3);
- }
| T_LPAREN type_name T_RPAREN term {
$$ = cast($4, $2);
}
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 20:25:54 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: rename grammar rule 'term' to 'cast_expression'
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.315 src/usr.bin/xlint/lint1/cgram.y:1.316
--- src/usr.bin/xlint/lint1/cgram.y:1.315 Sun Jul 11 20:07:41 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 20:25:54 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.315 2021/07/11 20:07:41 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.315 2021/07/11 20:07:41 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.316 2021/07/11 20:25:54 rillig Exp $");
#endif
#include
@@ -281,7 +281,10 @@ anonymize(sym_t *s)
%type primary_expression
%type postfix_expression
+%type argument_expression_list
%type unary_expression
+%type cast_expression
+%type expr
%type func_decl
%type notype_decl
@@ -327,13 +330,10 @@ anonymize(sym_t *s)
%type vararg_parameter_type_list
%type parameter_type_list
%type parameter_declaration
-%type expr
%type assignment_expression
%type gcc_statement_expr_list
%type gcc_statement_expr_item
-%type term
%type generic_selection
-%type argument_expression_list
%type point_or_arrow
%type type_name
%type abstract_declaration
@@ -631,7 +631,7 @@ notype_type_specifier:
T_TYPE {
$$ = gettyp($1);
}
- | T_TYPEOF term {
+ | T_TYPEOF cast_expression { /* GCC extension */
$$ = $2->tn_type;
}
| struct_or_union_specifier {
@@ -1353,7 +1353,7 @@ abstract_declarator: /* C99 6.7.6 */
| pointer direct_abstract_declarator {
$$ = add_pointer($2, $1);
}
- | T_TYPEOF term { /* GCC extension */
+ | T_TYPEOF cast_expression { /* GCC extension */
$$ = mktempsym($2->tn_type);
}
;
@@ -1721,8 +1721,8 @@ expr:/* C99 6.5 */
| expr T_COMMA expr {
$$ = build(COMMA, $1, $3);
}
- | term
- | generic_selection
+ | cast_expression
+ | generic_selection /* TODO: move to primary_expression */
;
assignment_expression: /* C99 6.5.16 */
@@ -1818,32 +1818,32 @@ unary_expression: /* C99 6.5.3 */
| T_INCDEC unary_expression {
$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
}
- | T_AMPER term {
+ | T_AMPER cast_expression {
$$ = build(ADDR, $2, NULL);
}
- | T_ASTERISK term {
+ | T_ASTERISK cast_expression {
$$ = build(INDIR, $2, NULL);
}
- | T_ADDITIVE term {
+ | T_ADDITIVE cast_expression {
if (tflag && $1 == PLUS) {
/* unary + is illegal in traditional C */
warning(100);
}
$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
}
- | T_COMPLEMENT term {
+ | T_COMPLEMENT cast_expression {
$$ = build(COMPL, $2, NULL);
}
- | T_LOGNOT term {
+ | T_LOGNOT cast_expression {
$$ = build(NOT, $2, NULL);
}
- | T_REAL term { /* GCC c_parser_unary_expression */
+ | T_REAL cast_expression { /* GCC c_parser_unary_expression */
$$ = build(REAL, $2, NULL);
}
- | T_IMAG term { /* GCC c_parser_unary_expression */
+ | T_IMAG cast_expression { /* GCC c_parser_unary_expression */
$$ = build(IMAG, $2, NULL);
}
- | T_EXTENSION term { /* GCC c_parser_unary_expression */
+ | T_EXTENSION cast_expression { /* GCC c_parser_unary_expression */
$$ = $2;
}
| T_SIZEOF unary_expression {
@@ -1859,9 +1859,9 @@ unary_expression: /* C99 6.5.3 */
}
;
-term:/* see C99 6.5.1 */
+cast_expression: /* see C99 6.5.1 */
unary_expression
- | T_LPAREN type_name T_RPAREN term {
+ | T_LPAREN type_name T_RPAREN cast_expression {
$$ = cast($4, $2);
}
;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 20:25:54 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: rename grammar rule 'term' to 'cast_expression' No functional change. To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 20:34:05 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: c11_generic_expression.c c11_generic_expression.exp Log Message: tests/lint: demonstrate that _Generic must be a primary_expression To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c cvs rdiff -u -r1.5 -r1.6 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 20:34:05 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: c11_generic_expression.c
c11_generic_expression.exp
Log Message:
tests/lint: demonstrate that _Generic must be a primary_expression
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.c
cvs rdiff -u -r1.5 -r1.6 \
src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/c11_generic_expression.c
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.6 src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.7
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.c:1.6 Mon Jun 28 07:55:05 2021
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c Sun Jul 11 20:34:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c11_generic_expression.c,v 1.6 2021/06/28 07:55:05 rillig Exp $ */
+/* $NetBSD: c11_generic_expression.c,v 1.7 2021/07/11 20:34:05 rillig Exp $ */
# 3 "c11_generic_expression.c"
/*
@@ -88,3 +88,11 @@ assignment_expression(int first, int sec
int: second = first
);
}
+
+int
+primary_expression(void)
+{
+ /*FIXME*//* expect+1: syntax error '(' [249] */
+ return _Generic(0, int: assignment_expression)(0, 0);
+}
+/* expect-1: falls off */
Index: src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp
diff -u src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.5 src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.6
--- src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp:1.5 Sun Jun 27 21:30:46 2021
+++ src/tests/usr.bin/xlint/lint1/c11_generic_expression.exp Sun Jul 11 20:34:05 2021
@@ -4,3 +4,5 @@ c11_generic_expression.c(37): warning: a
c11_generic_expression.c(53): warning: argument 'c' unused in function 'classify_char' [231]
c11_generic_expression.c(72): error: syntax error 'second' [249]
c11_generic_expression.c(77): warning: function comma_expression falls off bottom without returning value [217]
+c11_generic_expression.c(96): error: syntax error '(' [249]
+c11_generic_expression.c(97): warning: function primary_expression falls off bottom without returning value [217]
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 21:07:44 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y Log Message: lint: reorder grammar rules for expressions according to C18 No functional change. To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 21:07:44 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: reorder grammar rules for expressions according to C18
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.317 src/usr.bin/xlint/lint1/cgram.y:1.318
--- src/usr.bin/xlint/lint1/cgram.y:1.317 Sun Jul 11 20:37:21 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Jul 11 21:07:44 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.318 2021/07/11 21:07:44 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.317 2021/07/11 20:37:21 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.318 2021/07/11 21:07:44 rillig Exp $");
#endif
#include
@@ -1728,7 +1728,8 @@ assignment_expression: /* C99 6.5.16 */
expr %prec T_ASSIGN
;
-primary_expression: /* C99 6.5.1 */
+/* K 7.1, C90 ???, C99 6.5.1, C11 6.5.1, C18 6.5.1 */
+primary_expression:
T_NAME {
/* XXX really necessary? */
if (yychar < 0)
@@ -1754,7 +1755,41 @@ primary_expression: /* C99 6.5.1 */
}
;
-postfix_expression: /* C99 6.5.2 */
+/* K ---, C90 ---, C99 ---, C11 6.5.1.1, C18 6.5.1.1 */
+generic_selection:
+ T_GENERIC T_LPAREN assignment_expression T_COMMA
+ generic_assoc_list T_RPAREN {
+ /* generic selection requires C11 or later */
+ c11ism(345);
+ $$ = build_generic_selection($3, $5);
+ }
+ ;
+
+/* K ---, C90 ---, C99 ---, C11 6.5.1.1, C18 6.5.1.1 */
+generic_assoc_list:
+ generic_association
+ | generic_assoc_list T_COMMA generic_association {
+ $3->ga_prev = $1;
+ $$ = $3;
+ }
+ ;
+
+/* K ---, C90 ---, C99 ---, C11 6.5.1.1, C18 6.5.1.1 */
+generic_association:
+ type_name T_COLON assignment_expression {
+ $$ = getblk(sizeof(*$$));
+ $$->ga_arg = $1;
+ $$->ga_result = $3;
+ }
+ | T_DEFAULT T_COLON assignment_expression {
+ $$ = getblk(sizeof(*$$));
+ $$->ga_arg = NULL;
+ $$->ga_result = $3;
+ }
+ ;
+
+/* K 7.1, C90 ???, C99 6.5.2, C11 6.5.2, C18 6.5.2 */
+postfix_expression:
primary_expression
| postfix_expression T_LBRACK expr T_RBRACK {
$$ = build(INDIR, build(PLUS, $1, $3), NULL);
@@ -1813,7 +1848,18 @@ postfix_expression: /* C99 6.5.2 */
}
;
-unary_expression: /* C99 6.5.3 */
+/* K 7.1, C90 ???, C99 6.5.2, C11 6.5.2, C18 6.5.2 */
+argument_expression_list:
+ expr %prec T_COMMA {
+ $$ = new_function_argument_node(NULL, $1);
+ }
+ | argument_expression_list T_COMMA expr {
+ $$ = new_function_argument_node($1, $3);
+ }
+ ;
+
+/* K 7.2, C90 ???, C99 6.5.3, C11 6.5.3, C18 6.5.3 */
+unary_expression:
postfix_expression
| T_INCDEC unary_expression {
$$ = build($1 == INC ? INCBEF : DECBEF, $2, NULL);
@@ -1854,57 +1900,20 @@ unary_expression: /* C99 6.5.3 */
| T_SIZEOF T_LPAREN type_name T_RPAREN {
$$ = build_sizeof($3);
}
- | T_ALIGNOF T_LPAREN type_name T_RPAREN { /* C11 6.5.3 */
+ /* K ---, C90 ---, C99 ---, C11 6.5.3, C18 6.5.3 */
+ | T_ALIGNOF T_LPAREN type_name T_RPAREN {
$$ = build_alignof($3);
}
;
-cast_expression: /* see C99 6.5.1 */
+/* K 7.2, C90 ???, C99 6.5.4, C11 6.5.4, C18 6.5.4 */
+cast_expression:
unary_expression
| T_LPAREN type_name T_RPAREN cast_expression {
$$ = cast($4, $2);
}
;
-generic_selection: /* C11 6.5.1.1 */
- T_GENERIC T_LPAREN assignment_expression T_COMMA
- generic_assoc_list T_RPAREN {
- /* generic selection requires C11 or later */
- c11ism(345);
- $$ = build_generic_selection($3, $5);
- }
- ;
-
-generic_assoc_list: /* C11 6.5.1.1 */
- generic_association
- | generic_assoc_list T_COMMA generic_association {
- $3->ga_prev = $1;
- $$ = $3;
- }
- ;
-
-generic_association: /* C11 6.5.1.1 */
- type_name T_COLON assignment_expression {
- $$ = getblk(sizeof(*$$));
- $$->ga_arg = $1;
- $$->ga_result = $3;
- }
- | T_DEFAULT T_COLON assignment_expression {
- $$ = getblk(sizeof(*$$));
- $$->ga_arg = NULL;
- $$->ga_result = $3;
- }
- ;
-
-argument_expression_list: /* C99 6.5.2 */
- expr %prec T_COMMA {
- $$ = new_function_argument_node(NULL, $1);
- }
- | argument_expression_list T_COMMA expr {
- $$ = new_function_argument_node($1, $3);
- }
- ;
-
/*
* The inner part of a GCC statement-expression of the form ({ ... }).
*
CVS import: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 21:14:52 UTC 2021 Update of /cvsroot/src/external/lgpl3/gmp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22314 Log Message: initial import of GMP 6.2.1. from their NEWS: Changes between GMP version 6.2.0 and 6.2.1 BUGS FIXED * A possible overflow of type int is avoided for mpz_cmp on huge operands. * Overflows are more carefully detected and reported for mpz_pow_ui. * A bug in longlong.h for aarch64 sub_ddmmss, not affecting GMP, was healed. FEATURES * C90 compliance. * Initial support for Darwin on arm64, and improved portability. * Support for more processors. Status: Vendor Tag: gmp Release Tags: gmp-6-2-1 U src/external/lgpl3/gmp/dist/gen-fac.c U src/external/lgpl3/gmp/dist/gmpxx.h U src/external/lgpl3/gmp/dist/install-sh U src/external/lgpl3/gmp/dist/gmpxx.pc.in U src/external/lgpl3/gmp/dist/aclocal.m4 U src/external/lgpl3/gmp/dist/assert.c U src/external/lgpl3/gmp/dist/AUTHORS U src/external/lgpl3/gmp/dist/compile C src/external/lgpl3/gmp/dist/gmp-impl.h U src/external/lgpl3/gmp/dist/COPYING U src/external/lgpl3/gmp/dist/README U src/external/lgpl3/gmp/dist/acinclude.m4 U src/external/lgpl3/gmp/dist/tal-debug.c U src/external/lgpl3/gmp/dist/mp_clz_tab.c U src/external/lgpl3/gmp/dist/bootstrap.c U src/external/lgpl3/gmp/dist/COPYINGv2 U src/external/lgpl3/gmp/dist/gen-psqr.c U src/external/lgpl3/gmp/dist/nextprime.c C src/external/lgpl3/gmp/dist/configure U src/external/lgpl3/gmp/dist/missing U src/external/lgpl3/gmp/dist/ChangeLog U src/external/lgpl3/gmp/dist/mp_get_fns.c U src/external/lgpl3/gmp/dist/memory.c U src/external/lgpl3/gmp/dist/tal-reent.c U src/external/lgpl3/gmp/dist/.gdbinit C src/external/lgpl3/gmp/dist/longlong.h U src/external/lgpl3/gmp/dist/NEWS U src/external/lgpl3/gmp/dist/gmp.pc.in U src/external/lgpl3/gmp/dist/mp_set_fns.c U src/external/lgpl3/gmp/dist/configure.ac U src/external/lgpl3/gmp/dist/compat.c U src/external/lgpl3/gmp/dist/test-driver U src/external/lgpl3/gmp/dist/extract-dbl.c C src/external/lgpl3/gmp/dist/config.guess U src/external/lgpl3/gmp/dist/tal-notreent.c U src/external/lgpl3/gmp/dist/INSTALL C src/external/lgpl3/gmp/dist/configfsf.guess U src/external/lgpl3/gmp/dist/COPYING.LESSERv3 U src/external/lgpl3/gmp/dist/config.in U src/external/lgpl3/gmp/dist/config.sub U src/external/lgpl3/gmp/dist/gen-jacobitab.c U src/external/lgpl3/gmp/dist/mp_bpl.c U src/external/lgpl3/gmp/dist/asl.h U src/external/lgpl3/gmp/dist/Makefile.am U src/external/lgpl3/gmp/dist/gen-fib.c U src/external/lgpl3/gmp/dist/mp_dv_tab.c U src/external/lgpl3/gmp/dist/version.c U src/external/lgpl3/gmp/dist/INSTALL.autoconf U src/external/lgpl3/gmp/dist/primesieve.c U src/external/lgpl3/gmp/dist/ylwrap C src/external/lgpl3/gmp/dist/Makefile.in U src/external/lgpl3/gmp/dist/errno.c U src/external/lgpl3/gmp/dist/invalid.c U src/external/lgpl3/gmp/dist/gen-bases.c U src/external/lgpl3/gmp/dist/COPYINGv3 C src/external/lgpl3/gmp/dist/configfsf.sub U src/external/lgpl3/gmp/dist/mp_minv_tab.c U src/external/lgpl3/gmp/dist/gen-trialdivtab.c U src/external/lgpl3/gmp/dist/ltmain.sh C src/external/lgpl3/gmp/dist/gmp-h.in U src/external/lgpl3/gmp/dist/cxx/ismpznw.cc U src/external/lgpl3/gmp/dist/cxx/ismpq.cc U src/external/lgpl3/gmp/dist/cxx/isfuns.cc U src/external/lgpl3/gmp/dist/cxx/Makefile.in U src/external/lgpl3/gmp/dist/cxx/ismpf.cc U src/external/lgpl3/gmp/dist/cxx/osmpq.cc U src/external/lgpl3/gmp/dist/cxx/dummy.cc U src/external/lgpl3/gmp/dist/cxx/osmpf.cc U src/external/lgpl3/gmp/dist/cxx/Makefile.am U src/external/lgpl3/gmp/dist/cxx/osmpz.cc U src/external/lgpl3/gmp/dist/cxx/limits.cc U src/external/lgpl3/gmp/dist/cxx/osdoprnti.cc U src/external/lgpl3/gmp/dist/cxx/osfuns.cc U src/external/lgpl3/gmp/dist/cxx/ismpz.cc U src/external/lgpl3/gmp/dist/mpn/Makeasm.am U src/external/lgpl3/gmp/dist/mpn/cpp-ccas U src/external/lgpl3/gmp/dist/mpn/Makefile.in U src/external/lgpl3/gmp/dist/mpn/README U src/external/lgpl3/gmp/dist/mpn/asm-defs.m4 U src/external/lgpl3/gmp/dist/mpn/Makefile.am U src/external/lgpl3/gmp/dist/mpn/m4-ccas U src/external/lgpl3/gmp/dist/mpn/m88k/add_n.s U src/external/lgpl3/gmp/dist/mpn/m88k/mul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/sub_n.s U src/external/lgpl3/gmp/dist/mpn/m88k/README U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/mul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/addmul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/sub_n.S U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/add_n.S U src/external/lgpl3/gmp/dist/mpn/thumb/add_n.asm U src/external/lgpl3/gmp/dist/mpn/thumb/sub_n.asm U src/external/lgpl3/gmp/dist/mpn/lisp/gmpasm-mode.el U src/external/lgpl3/gmp/dist/mpn/ia64/rsh1aors_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/gcd_11.asm U src/external/lgpl3/gmp/dist/mpn/ia64/cnd_aors_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/aorsorrlsh2_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/copyi.asm U
CVS import: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 21:14:52 UTC 2021 Update of /cvsroot/src/external/lgpl3/gmp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22314 Log Message: initial import of GMP 6.2.1. from their NEWS: Changes between GMP version 6.2.0 and 6.2.1 BUGS FIXED * A possible overflow of type int is avoided for mpz_cmp on huge operands. * Overflows are more carefully detected and reported for mpz_pow_ui. * A bug in longlong.h for aarch64 sub_ddmmss, not affecting GMP, was healed. FEATURES * C90 compliance. * Initial support for Darwin on arm64, and improved portability. * Support for more processors. Status: Vendor Tag: gmp Release Tags: gmp-6-2-1 U src/external/lgpl3/gmp/dist/gen-fac.c U src/external/lgpl3/gmp/dist/gmpxx.h U src/external/lgpl3/gmp/dist/install-sh U src/external/lgpl3/gmp/dist/gmpxx.pc.in U src/external/lgpl3/gmp/dist/aclocal.m4 U src/external/lgpl3/gmp/dist/assert.c U src/external/lgpl3/gmp/dist/AUTHORS U src/external/lgpl3/gmp/dist/compile C src/external/lgpl3/gmp/dist/gmp-impl.h U src/external/lgpl3/gmp/dist/COPYING U src/external/lgpl3/gmp/dist/README U src/external/lgpl3/gmp/dist/acinclude.m4 U src/external/lgpl3/gmp/dist/tal-debug.c U src/external/lgpl3/gmp/dist/mp_clz_tab.c U src/external/lgpl3/gmp/dist/bootstrap.c U src/external/lgpl3/gmp/dist/COPYINGv2 U src/external/lgpl3/gmp/dist/gen-psqr.c U src/external/lgpl3/gmp/dist/nextprime.c C src/external/lgpl3/gmp/dist/configure U src/external/lgpl3/gmp/dist/missing U src/external/lgpl3/gmp/dist/ChangeLog U src/external/lgpl3/gmp/dist/mp_get_fns.c U src/external/lgpl3/gmp/dist/memory.c U src/external/lgpl3/gmp/dist/tal-reent.c U src/external/lgpl3/gmp/dist/.gdbinit C src/external/lgpl3/gmp/dist/longlong.h U src/external/lgpl3/gmp/dist/NEWS U src/external/lgpl3/gmp/dist/gmp.pc.in U src/external/lgpl3/gmp/dist/mp_set_fns.c U src/external/lgpl3/gmp/dist/configure.ac U src/external/lgpl3/gmp/dist/compat.c U src/external/lgpl3/gmp/dist/test-driver U src/external/lgpl3/gmp/dist/extract-dbl.c C src/external/lgpl3/gmp/dist/config.guess U src/external/lgpl3/gmp/dist/tal-notreent.c U src/external/lgpl3/gmp/dist/INSTALL C src/external/lgpl3/gmp/dist/configfsf.guess U src/external/lgpl3/gmp/dist/COPYING.LESSERv3 U src/external/lgpl3/gmp/dist/config.in U src/external/lgpl3/gmp/dist/config.sub U src/external/lgpl3/gmp/dist/gen-jacobitab.c U src/external/lgpl3/gmp/dist/mp_bpl.c U src/external/lgpl3/gmp/dist/asl.h U src/external/lgpl3/gmp/dist/Makefile.am U src/external/lgpl3/gmp/dist/gen-fib.c U src/external/lgpl3/gmp/dist/mp_dv_tab.c U src/external/lgpl3/gmp/dist/version.c U src/external/lgpl3/gmp/dist/INSTALL.autoconf U src/external/lgpl3/gmp/dist/primesieve.c U src/external/lgpl3/gmp/dist/ylwrap C src/external/lgpl3/gmp/dist/Makefile.in U src/external/lgpl3/gmp/dist/errno.c U src/external/lgpl3/gmp/dist/invalid.c U src/external/lgpl3/gmp/dist/gen-bases.c U src/external/lgpl3/gmp/dist/COPYINGv3 C src/external/lgpl3/gmp/dist/configfsf.sub U src/external/lgpl3/gmp/dist/mp_minv_tab.c U src/external/lgpl3/gmp/dist/gen-trialdivtab.c U src/external/lgpl3/gmp/dist/ltmain.sh C src/external/lgpl3/gmp/dist/gmp-h.in U src/external/lgpl3/gmp/dist/cxx/ismpznw.cc U src/external/lgpl3/gmp/dist/cxx/ismpq.cc U src/external/lgpl3/gmp/dist/cxx/isfuns.cc U src/external/lgpl3/gmp/dist/cxx/Makefile.in U src/external/lgpl3/gmp/dist/cxx/ismpf.cc U src/external/lgpl3/gmp/dist/cxx/osmpq.cc U src/external/lgpl3/gmp/dist/cxx/dummy.cc U src/external/lgpl3/gmp/dist/cxx/osmpf.cc U src/external/lgpl3/gmp/dist/cxx/Makefile.am U src/external/lgpl3/gmp/dist/cxx/osmpz.cc U src/external/lgpl3/gmp/dist/cxx/limits.cc U src/external/lgpl3/gmp/dist/cxx/osdoprnti.cc U src/external/lgpl3/gmp/dist/cxx/osfuns.cc U src/external/lgpl3/gmp/dist/cxx/ismpz.cc U src/external/lgpl3/gmp/dist/mpn/Makeasm.am U src/external/lgpl3/gmp/dist/mpn/cpp-ccas U src/external/lgpl3/gmp/dist/mpn/Makefile.in U src/external/lgpl3/gmp/dist/mpn/README U src/external/lgpl3/gmp/dist/mpn/asm-defs.m4 U src/external/lgpl3/gmp/dist/mpn/Makefile.am U src/external/lgpl3/gmp/dist/mpn/m4-ccas U src/external/lgpl3/gmp/dist/mpn/m88k/add_n.s U src/external/lgpl3/gmp/dist/mpn/m88k/mul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/sub_n.s U src/external/lgpl3/gmp/dist/mpn/m88k/README U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/mul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/addmul_1.s U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/sub_n.S U src/external/lgpl3/gmp/dist/mpn/m88k/mc88110/add_n.S U src/external/lgpl3/gmp/dist/mpn/thumb/add_n.asm U src/external/lgpl3/gmp/dist/mpn/thumb/sub_n.asm U src/external/lgpl3/gmp/dist/mpn/lisp/gmpasm-mode.el U src/external/lgpl3/gmp/dist/mpn/ia64/rsh1aors_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/gcd_11.asm U src/external/lgpl3/gmp/dist/mpn/ia64/cnd_aors_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/aorsorrlsh2_n.asm U src/external/lgpl3/gmp/dist/mpn/ia64/copyi.asm U
CVS import: src/external/lgpl3/mpc/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 20:13:02 UTC 2021 Update of /cvsroot/src/external/lgpl3/mpc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv961 Log Message: initial import of MPC 1.2.1. from their NEWS: Changes in version 1.2.1, released in October 2020: - Bug fixes: - Fix an incompatibility problem with GMP 6.0 and before. - Fix an intermediate overflow in asin. Status: Vendor Tag: mpc Release Tags: mpc-1-2-1 U src/external/lgpl3/mpc/dist/Makefile.am U src/external/lgpl3/mpc/dist/Makefile.in U src/external/lgpl3/mpc/dist/config.h.in U src/external/lgpl3/mpc/dist/aclocal.m4 U src/external/lgpl3/mpc/dist/AUTHORS U src/external/lgpl3/mpc/dist/README U src/external/lgpl3/mpc/dist/ChangeLog U src/external/lgpl3/mpc/dist/configure U src/external/lgpl3/mpc/dist/INSTALL U src/external/lgpl3/mpc/dist/Makefile.vc U src/external/lgpl3/mpc/dist/configure.ac U src/external/lgpl3/mpc/dist/COPYING.LESSER U src/external/lgpl3/mpc/dist/NEWS U src/external/lgpl3/mpc/dist/TODO U src/external/lgpl3/mpc/dist/m4/ltoptions.m4 U src/external/lgpl3/mpc/dist/m4/lt~obsolete.m4 U src/external/lgpl3/mpc/dist/m4/ltsugar.m4 U src/external/lgpl3/mpc/dist/m4/ltversion.m4 U src/external/lgpl3/mpc/dist/m4/ax_c_check_flag.m4 U src/external/lgpl3/mpc/dist/m4/libtool.m4 U src/external/lgpl3/mpc/dist/m4/mpc.m4 U src/external/lgpl3/mpc/dist/m4/valgrind-tests.m4 U src/external/lgpl3/mpc/dist/m4/ax_gcc_version.m4 U src/external/lgpl3/mpc/dist/m4/ax_gcc_option.m4 U src/external/lgpl3/mpc/dist/tools/Makefile.am U src/external/lgpl3/mpc/dist/tools/Makefile.in U src/external/lgpl3/mpc/dist/tools/mpcheck/Makefile.am U src/external/lgpl3/mpc/dist/tools/mpcheck/Makefile.in U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-float128.c U src/external/lgpl3/mpc/dist/tools/mpcheck/README U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-double.c U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-longdouble.c U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-float.c U src/external/lgpl3/mpc/dist/tools/bench/Makefile.am U src/external/lgpl3/mpc/dist/tools/bench/Makefile.in U src/external/lgpl3/mpc/dist/tools/bench/benchtime.h U src/external/lgpl3/mpc/dist/tools/bench/mpcbench.c U src/external/lgpl3/mpc/dist/build-aux/missing U src/external/lgpl3/mpc/dist/build-aux/config.guess U src/external/lgpl3/mpc/dist/build-aux/ltmain.sh U src/external/lgpl3/mpc/dist/build-aux/test-driver U src/external/lgpl3/mpc/dist/build-aux/depcomp U src/external/lgpl3/mpc/dist/build-aux/compile U src/external/lgpl3/mpc/dist/build-aux/mdate-sh U src/external/lgpl3/mpc/dist/build-aux/install-sh U src/external/lgpl3/mpc/dist/build-aux/texinfo.tex U src/external/lgpl3/mpc/dist/build-aux/ar-lib U src/external/lgpl3/mpc/dist/build-aux/config.sub U src/external/lgpl3/mpc/dist/tests/tpow_fr.c U src/external/lgpl3/mpc/dist/tests/tanh.dat U src/external/lgpl3/mpc/dist/tests/div_fr.dsc U src/external/lgpl3/mpc/dist/tests/atan.dat U src/external/lgpl3/mpc/dist/tests/copy_parameter.c U src/external/lgpl3/mpc/dist/tests/tui_div.c U src/external/lgpl3/mpc/dist/tests/tsqr.c U src/external/lgpl3/mpc/dist/tests/asinh.dsc U src/external/lgpl3/mpc/dist/tests/norm.dsc U src/external/lgpl3/mpc/dist/tests/pow_z.dat U src/external/lgpl3/mpc/dist/tests/tsum.c U src/external/lgpl3/mpc/dist/tests/pow_ui.dat U src/external/lgpl3/mpc/dist/tests/Makefile.am U src/external/lgpl3/mpc/dist/tests/ttan.c U src/external/lgpl3/mpc/dist/tests/add_fr.dsc U src/external/lgpl3/mpc/dist/tests/tmul_fr.c U src/external/lgpl3/mpc/dist/tests/cosh.dsc U src/external/lgpl3/mpc/dist/tests/tio_str.c U src/external/lgpl3/mpc/dist/tests/tswap.c U src/external/lgpl3/mpc/dist/tests/tmul_si.c U src/external/lgpl3/mpc/dist/tests/tpl_native.c U src/external/lgpl3/mpc/dist/tests/setprec_parameters.c U src/external/lgpl3/mpc/dist/tests/Makefile.in U src/external/lgpl3/mpc/dist/tests/pow_si.dat U src/external/lgpl3/mpc/dist/tests/sinh.dsc U src/external/lgpl3/mpc/dist/tests/data_check.tpl U src/external/lgpl3/mpc/dist/tests/tasinh.c U src/external/lgpl3/mpc/dist/tests/div_fr.dat U src/external/lgpl3/mpc/dist/tests/timag.c U src/external/lgpl3/mpc/dist/tests/exceptions.c U src/external/lgpl3/mpc/dist/tests/tpow_ld.c U src/external/lgpl3/mpc/dist/tests/check_data.c U src/external/lgpl3/mpc/dist/tests/tdiv.c U src/external/lgpl3/mpc/dist/tests/clear_parameters.c U src/external/lgpl3/mpc/dist/tests/tpow_ui.c U src/external/lgpl3/mpc/dist/tests/tset.c U src/external/lgpl3/mpc/dist/tests/sin_cos.dsc U src/external/lgpl3/mpc/dist/tests/fr_sub.dat U src/external/lgpl3/mpc/dist/tests/tabs.c U src/external/lgpl3/mpc/dist/tests/mul.dat U src/external/lgpl3/mpc/dist/tests/tget_version.c U src/external/lgpl3/mpc/dist/tests/ttanh.c U src/external/lgpl3/mpc/dist/tests/cmp_abs.dsc U src/external/lgpl3/mpc/dist/tests/tsub.c U src/external/lgpl3/mpc/dist/tests/acosh.dat U src/external/lgpl3/mpc/dist/tests/print_parameter.c U src/external/lgpl3/mpc/dist/tests/tdiv_ui.c U
CVS import: src/external/lgpl3/mpc/dist
Module Name:src Committed By: mrg Date: Sun Jul 11 20:13:02 UTC 2021 Update of /cvsroot/src/external/lgpl3/mpc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv961 Log Message: initial import of MPC 1.2.1. from their NEWS: Changes in version 1.2.1, released in October 2020: - Bug fixes: - Fix an incompatibility problem with GMP 6.0 and before. - Fix an intermediate overflow in asin. Status: Vendor Tag: mpc Release Tags: mpc-1-2-1 U src/external/lgpl3/mpc/dist/Makefile.am U src/external/lgpl3/mpc/dist/Makefile.in U src/external/lgpl3/mpc/dist/config.h.in U src/external/lgpl3/mpc/dist/aclocal.m4 U src/external/lgpl3/mpc/dist/AUTHORS U src/external/lgpl3/mpc/dist/README U src/external/lgpl3/mpc/dist/ChangeLog U src/external/lgpl3/mpc/dist/configure U src/external/lgpl3/mpc/dist/INSTALL U src/external/lgpl3/mpc/dist/Makefile.vc U src/external/lgpl3/mpc/dist/configure.ac U src/external/lgpl3/mpc/dist/COPYING.LESSER U src/external/lgpl3/mpc/dist/NEWS U src/external/lgpl3/mpc/dist/TODO U src/external/lgpl3/mpc/dist/m4/ltoptions.m4 U src/external/lgpl3/mpc/dist/m4/lt~obsolete.m4 U src/external/lgpl3/mpc/dist/m4/ltsugar.m4 U src/external/lgpl3/mpc/dist/m4/ltversion.m4 U src/external/lgpl3/mpc/dist/m4/ax_c_check_flag.m4 U src/external/lgpl3/mpc/dist/m4/libtool.m4 U src/external/lgpl3/mpc/dist/m4/mpc.m4 U src/external/lgpl3/mpc/dist/m4/valgrind-tests.m4 U src/external/lgpl3/mpc/dist/m4/ax_gcc_version.m4 U src/external/lgpl3/mpc/dist/m4/ax_gcc_option.m4 U src/external/lgpl3/mpc/dist/tools/Makefile.am U src/external/lgpl3/mpc/dist/tools/Makefile.in U src/external/lgpl3/mpc/dist/tools/mpcheck/Makefile.am U src/external/lgpl3/mpc/dist/tools/mpcheck/Makefile.in U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-float128.c U src/external/lgpl3/mpc/dist/tools/mpcheck/README U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-double.c U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-longdouble.c U src/external/lgpl3/mpc/dist/tools/mpcheck/mpcheck-float.c U src/external/lgpl3/mpc/dist/tools/bench/Makefile.am U src/external/lgpl3/mpc/dist/tools/bench/Makefile.in U src/external/lgpl3/mpc/dist/tools/bench/benchtime.h U src/external/lgpl3/mpc/dist/tools/bench/mpcbench.c U src/external/lgpl3/mpc/dist/build-aux/missing U src/external/lgpl3/mpc/dist/build-aux/config.guess U src/external/lgpl3/mpc/dist/build-aux/ltmain.sh U src/external/lgpl3/mpc/dist/build-aux/test-driver U src/external/lgpl3/mpc/dist/build-aux/depcomp U src/external/lgpl3/mpc/dist/build-aux/compile U src/external/lgpl3/mpc/dist/build-aux/mdate-sh U src/external/lgpl3/mpc/dist/build-aux/install-sh U src/external/lgpl3/mpc/dist/build-aux/texinfo.tex U src/external/lgpl3/mpc/dist/build-aux/ar-lib U src/external/lgpl3/mpc/dist/build-aux/config.sub U src/external/lgpl3/mpc/dist/tests/tpow_fr.c U src/external/lgpl3/mpc/dist/tests/tanh.dat U src/external/lgpl3/mpc/dist/tests/div_fr.dsc U src/external/lgpl3/mpc/dist/tests/atan.dat U src/external/lgpl3/mpc/dist/tests/copy_parameter.c U src/external/lgpl3/mpc/dist/tests/tui_div.c U src/external/lgpl3/mpc/dist/tests/tsqr.c U src/external/lgpl3/mpc/dist/tests/asinh.dsc U src/external/lgpl3/mpc/dist/tests/norm.dsc U src/external/lgpl3/mpc/dist/tests/pow_z.dat U src/external/lgpl3/mpc/dist/tests/tsum.c U src/external/lgpl3/mpc/dist/tests/pow_ui.dat U src/external/lgpl3/mpc/dist/tests/Makefile.am U src/external/lgpl3/mpc/dist/tests/ttan.c U src/external/lgpl3/mpc/dist/tests/add_fr.dsc U src/external/lgpl3/mpc/dist/tests/tmul_fr.c U src/external/lgpl3/mpc/dist/tests/cosh.dsc U src/external/lgpl3/mpc/dist/tests/tio_str.c U src/external/lgpl3/mpc/dist/tests/tswap.c U src/external/lgpl3/mpc/dist/tests/tmul_si.c U src/external/lgpl3/mpc/dist/tests/tpl_native.c U src/external/lgpl3/mpc/dist/tests/setprec_parameters.c U src/external/lgpl3/mpc/dist/tests/Makefile.in U src/external/lgpl3/mpc/dist/tests/pow_si.dat U src/external/lgpl3/mpc/dist/tests/sinh.dsc U src/external/lgpl3/mpc/dist/tests/data_check.tpl U src/external/lgpl3/mpc/dist/tests/tasinh.c U src/external/lgpl3/mpc/dist/tests/div_fr.dat U src/external/lgpl3/mpc/dist/tests/timag.c U src/external/lgpl3/mpc/dist/tests/exceptions.c U src/external/lgpl3/mpc/dist/tests/tpow_ld.c U src/external/lgpl3/mpc/dist/tests/check_data.c U src/external/lgpl3/mpc/dist/tests/tdiv.c U src/external/lgpl3/mpc/dist/tests/clear_parameters.c U src/external/lgpl3/mpc/dist/tests/tpow_ui.c U src/external/lgpl3/mpc/dist/tests/tset.c U src/external/lgpl3/mpc/dist/tests/sin_cos.dsc U src/external/lgpl3/mpc/dist/tests/fr_sub.dat U src/external/lgpl3/mpc/dist/tests/tabs.c U src/external/lgpl3/mpc/dist/tests/mul.dat U src/external/lgpl3/mpc/dist/tests/tget_version.c U src/external/lgpl3/mpc/dist/tests/ttanh.c U src/external/lgpl3/mpc/dist/tests/cmp_abs.dsc U src/external/lgpl3/mpc/dist/tests/tsub.c U src/external/lgpl3/mpc/dist/tests/acosh.dat U src/external/lgpl3/mpc/dist/tests/print_parameter.c U src/external/lgpl3/mpc/dist/tests/tdiv_ui.c U
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Sun Jul 11 20:53:35 UTC 2021 Modified Files: src/external/mit/xorg/lib: driver.old.mk libglsl.old.mk libloader.old.mk libmesa.old.mk src/external/mit/xorg/lib/dri.old: Makefile src/external/mit/xorg/lib/gallium.old: Makefile src/external/mit/xorg/lib/libGL.old: Makefile mesa-ver.mk shlib_version src/external/mit/xorg/lib/libGL.old/internal: Makefile src/external/mit/xorg/lib/libgbm.old: Makefile shlib_version src/external/mit/xorg/lib/libglapi.old: Makefile Log Message: copy the Mesa 19.7.1 build framework into .old. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/driver.old.mk \ src/external/mit/xorg/lib/libglsl.old.mk \ src/external/mit/xorg/lib/libloader.old.mk \ src/external/mit/xorg/lib/libmesa.old.mk cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri.old/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium.old/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL.old/Makefile \ src/external/mit/xorg/lib/libGL.old/mesa-ver.mk \ src/external/mit/xorg/lib/libGL.old/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/libGL.old/internal/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libgbm.old/Makefile \ src/external/mit/xorg/lib/libgbm.old/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libglapi.old/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Sun Jul 11 20:53:35 UTC 2021
Modified Files:
src/external/mit/xorg/lib: driver.old.mk libglsl.old.mk
libloader.old.mk libmesa.old.mk
src/external/mit/xorg/lib/dri.old: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile mesa-ver.mk shlib_version
src/external/mit/xorg/lib/libGL.old/internal: Makefile
src/external/mit/xorg/lib/libgbm.old: Makefile shlib_version
src/external/mit/xorg/lib/libglapi.old: Makefile
Log Message:
copy the Mesa 19.7.1 build framework into .old.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/driver.old.mk \
src/external/mit/xorg/lib/libglsl.old.mk \
src/external/mit/xorg/lib/libloader.old.mk \
src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL.old/Makefile \
src/external/mit/xorg/lib/libGL.old/mesa-ver.mk \
src/external/mit/xorg/lib/libGL.old/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/libGL.old/internal/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libgbm.old/Makefile \
src/external/mit/xorg/lib/libgbm.old/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libglapi.old/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/driver.old.mk
diff -u src/external/mit/xorg/lib/driver.old.mk:1.1 src/external/mit/xorg/lib/driver.old.mk:1.2
--- src/external/mit/xorg/lib/driver.old.mk:1.1 Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/driver.old.mk Sun Jul 11 20:53:35 2021
@@ -1,20 +1,48 @@
-# $NetBSD: driver.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: driver.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
# stuff both dri and gallium drivers need.
# util
.PATH: ${X11SRCDIR.Mesa}/src/util
-SRCS.util= \
- hash_table.c\
-MESAralloc.c
.PATH: ${X11SRCDIR.Mesa}/../src/util
-SRCS.util+= \
- format_srgb.c
+
+SRCS.util= \
+ hash_table.c \
+ build_id.c \
+ crc32.c \
+ disk_cache.c \
+ fast_idiv_by_const.c \
+ half_float.c \
+ format_srgb.c \
+ mesa-sha1.c \
+ os_time.c \
+ ralloc.c \
+ UTILdebug.c \
+ rand_xor.c \
+ rb_tree.c \
+ register_allocate.c \
+ rgtc.c \
+ set.c \
+ slab.c \
+ string_buffer.c \
+ strtod.c \
+ u_atomic.c \
+ u_cpu_detect.c \
+ u_math.c \
+ u_queue.c \
+ u_process.c \
+ u_vector.c \
+ vma.c
+
CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
CPPFLAGS.hash_table.c+= -I${X11SRCDIR.Mesa}/src/util
CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \
+-I${X11SRCDIR.Mesa}/src/mesa \
+-I${X11SRCDIR.Mesa}/src \
+-I${X11SRCDIR.Mesa}/src/gallium/include
-BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/ralloc.c MESAralloc.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
SRCS+= ${SRCS.util}
@@ -22,3 +50,6 @@ SRCS+= ${SRCS.util}
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
SRCS+= utils.c dri_util.c xmlconfig.c
SRCS+= megadriver_stub.c
+
+CPPFLAGS.dri_util.c+= -I${X11SRCDIR.Mesa}/../src/util
+
Index: src/external/mit/xorg/lib/libglsl.old.mk
diff -u src/external/mit/xorg/lib/libglsl.old.mk:1.1 src/external/mit/xorg/lib/libglsl.old.mk:1.2
--- src/external/mit/xorg/lib/libglsl.old.mk:1.1 Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/libglsl.old.mk Sun Jul 11 20:53:35 2021
@@ -1,10 +1,21 @@
-# $NetBSD: libglsl.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: libglsl.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
glsl_parser.cpp
-COPTS.glsl_lexer.cpp+= -Wno-deprecated-register
+#COPTS.glsl_lexer.cpp+= -Wno-deprecated-register
+COPTS.vtn_glsl450.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
+
+CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/compiler \
+ -I${X11SRCDIR.Mesa}/../src/compiler \
+ -I${X11SRCDIR.Mesa}/src/compiler/nir \
+ -I${X11SRCDIR.Mesa}/../src/compiler/nir \
+ -I${X11SRCDIR.Mesa}/src/compiler/glsl \
+ -I${X11SRCDIR.Mesa}/../src/compiler/glsl \
+ -I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \
+ -I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \
+ -I${X11SRCDIR.Mesa}/src/compiler/spirv
LIBGLSL_FILES = \
ast_array_index.cpp \
@@ -15,23 +26,34 @@ LIBGLSL_FILES = \
builtin_functions.cpp \
builtin_types.cpp \
builtin_variables.cpp \
+ generate_ir.cpp \
+ gl_nir_lower_atomics.c \
+ gl_nir_link_atomics.c \
+ gl_nir_link_uniform_initializers.c \
+ gl_nir_link_uniforms.c \
+ gl_nir_link_xfb.c \
+ gl_nir_linker.c \
+ gl_nir_lower_bindless_images.c \
+ gl_nir_lower_buffers.c \
+ gl_nir_lower_samplers.c \
+ gl_nir_lower_samplers_as_deref.c \
glsl_parser_extras.cpp \
-
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jul 11 20:48:48 UTC 2021 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: shl.mi src/distrib/sets/lists/xserver: mi Log Message: remove mesa < 18 support To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sun Jul 11 20:52:07 UTC 2021
Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile mesa-which.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
xorg/lib stuff to enable mesa.old, prepare for new mesa
- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jul 11 20:48:48 UTC 2021 Modified Files: src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: shl.mi src/distrib/sets/lists/xserver: mi Log Message: remove mesa < 18 support To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.224 src/distrib/sets/lists/xcomp/mi:1.225 --- src/distrib/sets/lists/xcomp/mi:1.224 Sat Jan 9 02:40:44 2021 +++ src/distrib/sets/lists/xcomp/mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.224 2021/01/09 02:40:44 uki Exp $ +# $NetBSD: mi,v 1.225 2021/07/11 20:48:48 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -34,12 +34,11 @@ ./usr/X11R7/include/GL/internal/sarea.h xcomp-obsolete obsolete ./usr/X11R7/include/GL/osmesa.hxcomp-xorgproto-include xorg ./usr/X11R7/include/GL/wglext.hxcomp-xorgproto-include xorg -./usr/X11R7/include/GL/wmesa.hxcomp-obsolete xorg,obsolete,mesa_ver=18 -./usr/X11R7/include/GL/wmesa.hxcomp-xorgproto-include xorg,mesa_ver=10 +./usr/X11R7/include/GL/wmesa.hxcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa.hxcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa_x.h xcomp-obsolete obsolete ./usr/X11R7/include/GL/xmesa_xf86.h xcomp-obsolete obsolete -./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg,mesa_ver=18 +./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg ./usr/X11R7/include/X11/CallbackI.h xcomp-libXt-include xorg ./usr/X11R7/include/X11/Composite.h xcomp-libXt-include xorg ./usr/X11R7/include/X11/CompositeP.h xcomp-libXt-include xorg Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.61 src/distrib/sets/lists/xdebug/shl.mi:1.62 --- src/distrib/sets/lists/xdebug/shl.mi:1.61 Sun Jul 11 00:08:06 2021 +++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.61 2021/07/11 00:08:06 mrg Exp $ +# $NetBSD: shl.mi,v 1.62 2021/07/11 20:48:48 mrg Exp $ ./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete @@ -107,11 +107,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug xdebug-libxshmfence-debug xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug xdebug-gallium-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug xdebug-MesaLib-debug xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=amd64,mesa_ver=10 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=i386,mesa_ver=10 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=amd64,mesa_ver=18 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=i386,mesa_ver=18 -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete,!machine=i386,!machine=amd64 +./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug xorg,obsolete obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=amd64 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=i386 Index: src/distrib/sets/lists/xserver/mi diff -u src/distrib/sets/lists/xserver/mi:1.47 src/distrib/sets/lists/xserver/mi:1.48 --- src/distrib/sets/lists/xserver/mi:1.47 Sat Jan 9 02:40:44 2021 +++ src/distrib/sets/lists/xserver/mi Sun Jul 11 20:48:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.47 2021/01/09 02:40:44 uki Exp $ +# $NetBSD: mi,v 1.48 2021/07/11 20:48:48 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9,16 +9,8 @@ ./usr/X11R7/lib/modules/dri/gallium_dri.so.0 xserver-gallium-drivers xorg ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so xserver-MesaLib-drivers xorg ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0 xserver-MesaLib-drivers xorg -./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-MesaLib-drivers xorg,machine=amd64,mesa_ver=10 -./usr/X11R7/lib/modules/dri/libmesa_dri.so
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sun Jul 11 20:52:07 UTC 2021
Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile mesa-which.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libGLw: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
xorg/lib stuff to enable mesa.old, prepare for new mesa
- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.9 src/external/mit/xorg/include/Makefile:1.10
--- src/external/mit/xorg/include/Makefile:1.9 Sun Mar 10 13:52:11 2019
+++ src/external/mit/xorg/include/Makefile Sun Jul 11 20:52:06 2021
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2019/03/10 13:52:11 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2021/07/11 20:52:06 mrg Exp $
# *proto packages for xorg
.include
-.if ${HAVE_MESA_VER} == 18
-SUBDIR= KHR
-.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
SUBDIR+= libvdpau
.endif
+SUBDIR+= KHR
SUBDIR+= xorgproto xbitmaps xcb-proto
SUBDIR+= .WAIT xtrans
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.55 src/external/mit/xorg/lib/Makefile:1.56
--- src/external/mit/xorg/lib/Makefile:1.55 Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/Makefile Sun Jul 11 20:52:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
+# $NetBSD: Makefile,v 1.56 2021/07/11 20:52:06 mrg Exp $
# build libraries for xorg
@@ -6,7 +6,7 @@
.include "mesa-which.mk"
-SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
+SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \
libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
@@ -23,7 +23,7 @@ SUBDIR+=libxcb \
libX11 \
.WAIT
.if !defined(MLIBDIR)
-SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_SUFFIX} gallium${OLD_SUFFIX}
.endif
SUBDIR+=fontconfig libSM \
.WAIT \
@@ -36,7 +36,7 @@ SUBDIR+=libvdpau \
.WAIT
.endif
SUBDIR+=libXi libXxf86vm \
- libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \
+ libGL${OLD_SUFFIX} libXScrnSaver libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
libxkbui \
@@ -54,7 +54,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
.WAIT \
libXdmGreet \
xcb-util
-SUBDIR+=libgbm${OLD_PREFIX}
+SUBDIR+=libgbm${OLD_SUFFIX}
.if ${HAVE_XORG_GLAMOR} != "no"
# libEGL depends upon libgbm
SUBDIR+=.WAIT libEGL
Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u src/external/mit/xorg/lib/mesa-which.mk:1.2 src/external/mit/xorg/lib/mesa-which.mk:1.3
--- src/external/mit/xorg/lib/mesa-which.mk:1.2 Sun Jul 11 01:13:26 2021
+++ src/external/mit/xorg/lib/mesa-which.mk Sun Jul 11 20:52:06 2021
@@ -1,6 +1,6 @@
-# $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
+# $NetBSD: mesa-which.mk,v 1.3 2021/07/11 20:52:06 mrg Exp $
-OLD_PREFIX=
+OLD_SUFFIX=
.if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
-OLD_PREFIX=.old
+OLD_SUFFIX=.old
.endif
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.37 src/external/mit/xorg/lib/dri/Makefile:1.38
--- src/external/mit/xorg/lib/dri/Makefile:1.37 Tue Apr 13 04:58:59 2021
+++ src/external/mit/xorg/lib/dri/Makefile Sun Jul 11 20:52:06 2021
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2021/04/13 04:58:59 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2021/07/11 20:52:06 mrg Exp $
# Link the mesa_dri_drivers mega driver.
.include
+.include "../mesa-which.mk"
+
.if ${MACHINE_ARCH} == "i386" ||
CVS commit: xsrc/external/mit/MesaLib.old
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 20:40:59 UTC 2021 Removed Files: xsrc/external/mit/MesaLib.old/dist: Makefile.am Makefile.in aclocal.m4 autogen.sh configure configure.ac install-gallium-links.mk install-lib-links.mk xsrc/external/mit/MesaLib.old/dist/bin: ar-lib compile config.guess config.sub depcomp install-sh ltmain.sh missing perf-annotate-jit test-driver xsrc/external/mit/MesaLib.old/dist/docs: COPYING GL3.txt autoconf.html mangling.html openvg.html patents.txt xsrc/external/mit/MesaLib.old/dist/docs/specs: MESA_agp_offset.spec MESA_set_3dfx_mode.spec xsrc/external/mit/MesaLib.old/dist/doxygen: shader.doxy xsrc/external/mit/MesaLib.old/dist/include/GL: wmesa.h xsrc/external/mit/MesaLib.old/dist/include/GL/internal: sarea.h xsrc/external/mit/MesaLib.old/dist/include/VG: openvg.h vgext.h vgplatform.h vgu.h xsrc/external/mit/MesaLib.old/dist/include/c99: inttypes.h stdbool.h stdint.h xsrc/external/mit/MesaLib.old/dist/m4: ax_check_compile_flag.m4 ax_gcc_builtin.m4 ax_prog_bison.m4 ax_prog_flex.m4 ax_pthread.m4 xsrc/external/mit/MesaLib.old/dist/src: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/docs: EGL_MESA_screen_surface xsrc/external/mit/MesaLib.old/dist/src/egl/drivers/dri2: Android.mk Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/main: Android.mk Makefile.am Makefile.in Makefile.sources SConscript egl.pc.in eglcompiler.h eglmisc.c eglmisc.h eglmode.c eglmode.h eglmutex.h eglscreen.c eglscreen.h eglstring.c eglstring.h xsrc/external/mit/MesaLib.old/dist/src/egl/wayland: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-drm: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-egl: Makefile.am Makefile.in wayland-egl-priv.h wayland-egl-symbols-check wayland-egl.c wayland-egl.pc.in xsrc/external/mit/MesaLib.old/dist/src/gallium: Automake.inc Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/os: os_memory.h os_memory_aligned.h os_memory_debug.h os_memory_stdc.h os_misc.c os_misc.h os_time.c os_time.h xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipe-loader: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipebuffer: pb_buffer_malloc.c pb_bufmgr_alt.c pb_bufmgr_ondemand.c pb_bufmgr_pool.c xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/target-helpers: inline_drm_helper.h inline_wrapper_sw_helper.h xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/util: u_atomic.h u_caps.c u_caps.h u_clear.h u_cpu_detect.c u_cpu_detect.h u_debug.c u_debug.h u_double_list.h u_dynarray.h u_format_r11g11b10f.h u_format_rgb9e5.h u_hash.c u_hash.h u_init.h u_keymap.c u_keymap.h u_linkage.c u_linkage.h u_math.c u_math.h u_memory.h u_simple_list.h u_slab.c u_slab.h u_snprintf.c u_staging.c u_staging.h u_string.h u_time.h xsrc/external/mit/MesaLib.old/dist/src/gallium/docs: d3d11ddi.txt llvm-todo.txt xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno: Makefile.am Makefile.in adreno_common.xml.h adreno_pm4.xml.h freedreno_lowering.c freedreno_lowering.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a2xx: a2xx.xml.h fd2_compiler.c fd2_compiler.h ir-a2xx.c ir-a2xx.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a3xx: a3xx.xml.h fd3_util.c fd3_util.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/ir3: disasm-a3xx.c instr-a3xx.h ir3.c ir3.h ir3_compiler.c ir3_compiler.h ir3_compiler_old.c ir3_cp.c ir3_depth.c ir3_dump.c ir3_flatten.c ir3_ra.c ir3_sched.c ir3_shader.c ir3_shader.h ir3_visitor.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/galahad: Makefile.am Makefile.in Makefile.sources SConscript glhd_context.c glhd_context.h glhd_objects.c glhd_objects.h glhd_public.h glhd_screen.c glhd_screen.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/i915: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/identity: Makefile.am Makefile.in Makefile.sources SConscript id_context.c id_context.h id_objects.c
CVS commit: xsrc/external/mit/MesaLib.old
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 20:40:59 UTC 2021 Removed Files: xsrc/external/mit/MesaLib.old/dist: Makefile.am Makefile.in aclocal.m4 autogen.sh configure configure.ac install-gallium-links.mk install-lib-links.mk xsrc/external/mit/MesaLib.old/dist/bin: ar-lib compile config.guess config.sub depcomp install-sh ltmain.sh missing perf-annotate-jit test-driver xsrc/external/mit/MesaLib.old/dist/docs: COPYING GL3.txt autoconf.html mangling.html openvg.html patents.txt xsrc/external/mit/MesaLib.old/dist/docs/specs: MESA_agp_offset.spec MESA_set_3dfx_mode.spec xsrc/external/mit/MesaLib.old/dist/doxygen: shader.doxy xsrc/external/mit/MesaLib.old/dist/include/GL: wmesa.h xsrc/external/mit/MesaLib.old/dist/include/GL/internal: sarea.h xsrc/external/mit/MesaLib.old/dist/include/VG: openvg.h vgext.h vgplatform.h vgu.h xsrc/external/mit/MesaLib.old/dist/include/c99: inttypes.h stdbool.h stdint.h xsrc/external/mit/MesaLib.old/dist/m4: ax_check_compile_flag.m4 ax_gcc_builtin.m4 ax_prog_bison.m4 ax_prog_flex.m4 ax_pthread.m4 xsrc/external/mit/MesaLib.old/dist/src: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/docs: EGL_MESA_screen_surface xsrc/external/mit/MesaLib.old/dist/src/egl/drivers/dri2: Android.mk Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/main: Android.mk Makefile.am Makefile.in Makefile.sources SConscript egl.pc.in eglcompiler.h eglmisc.c eglmisc.h eglmode.c eglmode.h eglmutex.h eglscreen.c eglscreen.h eglstring.c eglstring.h xsrc/external/mit/MesaLib.old/dist/src/egl/wayland: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-drm: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/egl/wayland/wayland-egl: Makefile.am Makefile.in wayland-egl-priv.h wayland-egl-symbols-check wayland-egl.c wayland-egl.pc.in xsrc/external/mit/MesaLib.old/dist/src/gallium: Automake.inc Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/os: os_memory.h os_memory_aligned.h os_memory_debug.h os_memory_stdc.h os_misc.c os_misc.h os_time.c os_time.h xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipe-loader: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/pipebuffer: pb_buffer_malloc.c pb_bufmgr_alt.c pb_bufmgr_ondemand.c pb_bufmgr_pool.c xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/target-helpers: inline_drm_helper.h inline_wrapper_sw_helper.h xsrc/external/mit/MesaLib.old/dist/src/gallium/auxiliary/util: u_atomic.h u_caps.c u_caps.h u_clear.h u_cpu_detect.c u_cpu_detect.h u_debug.c u_debug.h u_double_list.h u_dynarray.h u_format_r11g11b10f.h u_format_rgb9e5.h u_hash.c u_hash.h u_init.h u_keymap.c u_keymap.h u_linkage.c u_linkage.h u_math.c u_math.h u_memory.h u_simple_list.h u_slab.c u_slab.h u_snprintf.c u_staging.c u_staging.h u_string.h u_time.h xsrc/external/mit/MesaLib.old/dist/src/gallium/docs: d3d11ddi.txt llvm-todo.txt xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno: Makefile.am Makefile.in adreno_common.xml.h adreno_pm4.xml.h freedreno_lowering.c freedreno_lowering.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a2xx: a2xx.xml.h fd2_compiler.c fd2_compiler.h ir-a2xx.c ir-a2xx.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/a3xx: a3xx.xml.h fd3_util.c fd3_util.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/freedreno/ir3: disasm-a3xx.c instr-a3xx.h ir3.c ir3.h ir3_compiler.c ir3_compiler.h ir3_compiler_old.c ir3_cp.c ir3_depth.c ir3_dump.c ir3_flatten.c ir3_ra.c ir3_sched.c ir3_shader.c ir3_shader.h ir3_visitor.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/galahad: Makefile.am Makefile.in Makefile.sources SConscript glhd_context.c glhd_context.h glhd_objects.c glhd_objects.h glhd_public.h glhd_screen.c glhd_screen.h xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/i915: Makefile.am Makefile.in xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/identity: Makefile.am Makefile.in Makefile.sources SConscript id_context.c id_context.h id_objects.c
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jul 11 22:41:36 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: t_integration.sh Log Message: tests/lint: rework ATF test driver To skip tests that work only on particular platforms, a simple 'eval' from the shell does not work since it does not exit on failure. Fix this by storing the commands in a local variable first. Remove configuration knobs 'lint1-only-if-arch' and 'lint1-skip-if-arch' since they are unused. When skipping a test, actually mark it as skipped in the ATF statistics. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/tests/usr.bin/xlint/lint1/t_integration.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/i386
Module Name:src Committed By: mrg Date: Sun Jul 11 22:41:39 UTC 2021 Modified Files: src/external/gpl3/gcc/dist/gcc/config/i386: i386.c i386.h netbsd-elf.h netbsd64.h Log Message: define a X86_32_ASAN_BIT_OFFSET macro that defaults differently on netbsd/i386 than other x86-32 targets. fixes PR#56280. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/config/i386/i386.h \ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h \ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jul 11 22:41:36 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: t_integration.sh
Log Message:
tests/lint: rework ATF test driver
To skip tests that work only on particular platforms, a simple 'eval'
from the shell does not work since it does not exit on failure. Fix
this by storing the commands in a local variable first.
Remove configuration knobs 'lint1-only-if-arch' and 'lint1-skip-if-arch'
since they are unused.
When skipping a test, actually mark it as skipped in the ATF statistics.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/tests/usr.bin/xlint/lint1/t_integration.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.66 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.67
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.66 Tue Jun 29 13:58:13 2021
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Sun Jul 11 22:41:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.66 2021/06/29 13:58:13 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.67 2021/07/11 22:41:36 rillig Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -65,12 +65,12 @@ configure_test_case()
function platform_has(prop) {
if (!match(prop, /^(schar|uchar|ilp32|lp64|int|long|ldbl-64|ldbl-96|ldbl-128)$/)) {
-printf("bad property '\''%s'\''\n", prop) > "/dev/stderr";
-exit(1);
+printf("bad property '\''%s'\''\n", prop) > "/dev/stderr"
+exit(1)
}
if (platform[machine_arch] == "") {
-printf("bad machine_arch '\''%s'\''\n", machine_arch) > "/dev/stderr";
-exit(1);
+printf("bad machine_arch '\''%s'\''\n", machine_arch) > "/dev/stderr"
+exit(1)
}
return match(" " platform[machine_arch] " ", " " prop " ")
}
@@ -78,9 +78,7 @@ configure_test_case()
BEGIN {
machine_arch = "'"$machine_arch"'"
flags = "-g -S -w"
- seen_only_on_arch = 0
- match_only_on_arch = 0
- skip = 0
+ skip = "no"
}
$1 == "/*" && $2 ~ /^lint1-/ && $NF == "*/" {
if ($2 == "lint1-flags:" || $2 == "lint1-extra-flags:") {
@@ -89,29 +87,21 @@ configure_test_case()
for (i = 3; i < NF; i++)
flags = flags " " $i
}
- if ($2 == "lint1-only-if-arch") {
-seen_only_on_arch = 1
-if ($3 == machine_arch)
- match_only_on_arch = 1
- }
- if ($2 == "lint1-skip-if-arch" && $3 == machine_arch)
-skip = 1
if ($2 == "lint1-only-if" && !platform_has($3))
-skip = 1
+skip = "yes"
if ($2 == "lint1-skip-if" && platform_has($3))
-skip = 1
+skip = "yes"
}
END {
- if (seen_only_on_arch && !match_only_on_arch)
-skip = 1
-
printf("flags='\''%s'\''\n", flags)
- printf("skip=%s\n", skip ? "yes" : "no")
+ printf("skip=%s\n", skip)
}
'
- eval "$(awk "$awk" "$1")"
+ local config
+ config="$(awk "$awk" "$1")" || exit 1
+ eval "$config"
}
# shellcheck disable=SC2155
@@ -129,11 +119,10 @@ check_lint1()
wrk_ln='/dev/null'
fi
- configure_test_case "$src"
+ configure_test_case "$src" # sets 'skip' and 'flags'
if [ "$skip" = "yes" ]; then
- atf_check -o 'ignore' echo 'skipped'
- return
+ atf_skip "unsuitable platform"
fi
if [ -f "$exp" ]; then
CVS commit: src/external/gpl3/gcc/dist/gcc/config/i386
Module Name:src
Committed By: mrg
Date: Sun Jul 11 22:41:39 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/i386: i386.c i386.h netbsd-elf.h
netbsd64.h
Log Message:
define a X86_32_ASAN_BIT_OFFSET macro that defaults differently on
netbsd/i386 than other x86-32 targets.
fixes PR#56280.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/config/i386/i386.h \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h \
src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.24 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.25
--- src/external/gpl3/gcc/dist/gcc/config/i386/i386.c:1.24 Sun Apr 11 00:02:13 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/i386.c Sun Jul 11 22:41:38 2021
@@ -1399,7 +1399,7 @@ ix86_asan_shadow_offset (void)
{
return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44)
: HOST_WIDE_INT_C (0x7fff8000))
- : (HOST_WIDE_INT_1 << 29);
+ : (HOST_WIDE_INT_1 << X86_32_ASAN_BIT_OFFSET);
}
/* Argument support functions. */
Index: src/external/gpl3/gcc/dist/gcc/config/i386/i386.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/i386.h:1.14 Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/i386.h Sun Jul 11 22:41:39 2021
@@ -2975,6 +2975,9 @@ extern enum attr_cpu ix86_schedule;
#define NUM_X86_64_MS_CLOBBERED_REGS 12
#endif
+/* Standard location for 32-bit ASAN shadow map. */
+#define X86_32_ASAN_BIT_OFFSET 29
+
/*
Local variables:
version-control: t
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h:1.14 Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h Sun Jul 11 22:41:39 2021
@@ -129,3 +129,7 @@ along with GCC; see the file COPYING3.
/* Preserve i386 psABI */
#undef PREFERRED_STACK_BOUNDARY_DEFAULT
#define PREFERRED_STACK_BOUNDARY_DEFAULT MIN_STACK_BOUNDARY
+
+/* NetBSD/x86 on 32-bit places the ASAN shadow map at 0x4000. */
+#undef X86_32_ASAN_BIT_OFFSET
+#define X86_32_ASAN_BIT_OFFSET 30
Index: src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.14 src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.15
--- src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h:1.14 Sun Apr 11 00:02:14 2021
+++ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h Sun Jul 11 22:41:39 2021
@@ -73,3 +73,7 @@ along with GCC; see the file COPYING3.
((TARGET_64BIT || TARGET_SSE) ? 128 : 32)
#define HAVE_ENABLE_EXECUTE_STACK
+
+/* NetBSD/x86 on 32-bit places the ASAN shadow map at 0x4000. */
+#undef X86_32_ASAN_BIT_OFFSET
+#define X86_32_ASAN_BIT_OFFSET 30
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jul 12 04:41:14 UTC 2021 Modified Files: src/sys/dev/pci: pci_subr.c Log Message: s/Precision Time Management/Precision Time Measurement/ To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/sys/dev/pci/pci_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jul 12 04:41:14 UTC 2021
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
s/Precision Time Management/Precision Time Measurement/
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.226 src/sys/dev/pci/pci_subr.c:1.227
--- src/sys/dev/pci/pci_subr.c:1.226 Tue Jun 29 21:03:36 2021
+++ src/sys/dev/pci/pci_subr.c Mon Jul 12 04:41:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.226 2021/06/29 21:03:36 pgoyette Exp $ */
+/* $NetBSD: pci_subr.c,v 1.227 2021/07/12 04:41:14 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.226 2021/06/29 21:03:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.227 2021/07/12 04:41:14 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -4175,7 +4175,7 @@ pci_conf_print_ptm_cap(const pcireg_t *r
pcireg_t reg;
uint32_t val;
- printf("\n Precision Time Management\n");
+ printf("\n Precision Time Measurement\n");
reg = regs[o2i(extcapoff + PCI_PTM_CAP)];
printf("PTM Capability register: 0x%08x\n", reg);
@@ -4312,7 +4312,7 @@ static struct {
pci_conf_print_dpc_cap },
{ PCI_EXTCAP_L1PM, "L1 PM Substates",
pci_conf_print_l1pm_cap },
- { PCI_EXTCAP_PTM, "Precision Time Management",
+ { PCI_EXTCAP_PTM, "Precision Time Measurement",
pci_conf_print_ptm_cap },
{ PCI_EXTCAP_MPCIE, "M-PCIe",
NULL },
