CVS commit: src
Module Name:src Committed By: mrg Date: Tue Jul 13 05:53:13 UTC 2021 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: shl.mi src/external/mit/xorg/lib/libX11: Makefile Makefile.libx11 src/external/mit/xorg/lib/libX11/dynamic: Makefile src/external/mit/xorg/lib/libX11/static: Makefile Log Message: move the i18n modules into libX11 directly. fixes at least alacritty, and saves memory too. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libX11/Makefile cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/libX11/Makefile.libx11 cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/dynamic/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/static/Makefile 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/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.95 src/distrib/sets/lists/xbase/shl.mi:1.96 --- src/distrib/sets/lists/xbase/shl.mi:1.95 Sun Jul 11 00:08:06 2021 +++ src/distrib/sets/lists/xbase/shl.mi Tue Jul 13 05:53:12 2021 @@ -1,25 +1,25 @@ -# $NetBSD: shl.mi,v 1.95 2021/07/11 00:08:06 mrg Exp $ +# $NetBSD: shl.mi,v 1.96 2021/07/13 05:53:12 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # -./usr/X11R7/lib/X11/locale/lib/common/ximcp.so xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so xbase-obsolete obsolete -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 xbase-obsolete obsolete -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 xbase-obsolete obsolete -./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 xbase-libX11-lib xorg -./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 xbase-libX11-lib xorg +./usr/X11R7/lib/X11/locale/lib/common/ximcp.so obsolet obsolete +./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 obsolete obsolete +./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 obsolete obsolete ./usr/X11R7/lib/libEGL.so xbase-libEGL-lib xorg,compatx11file,xorg_glamor ./usr/X11R7/lib/libEGL.so.0 xbase-libEGL-lib xorg,compatx11file,xorg_glamor ./usr/X11R7/lib/libEGL.so.0.0 xbase-libEGL-lib xorg,compatx11file,xorg_glamor Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.62 src/distrib/sets/lists/xdebug/shl.mi:1.63 --- src/distrib/sets/lists/xdebug/shl.mi:1.62 Sun Jul 11 20:48:48 2021 +++ src/distrib/sets/lists/xdebug/shl.mi Tue Jul 13 05:53:12 2021 @@ -1,17 +1,17 @@ -# $NetBSD: shl.mi,v 1.62 2021/07/11 20:48:48 mrg Exp $ +# $NetBSD: shl.mi,v 1.63 2021/07/13 05:53:12 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
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src
Committed By: mrg
Date: Tue Jul 13 05:22:27 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile
Log Message:
also look for libgbm in ${OLD_SUFFIX}.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libEGL/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/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.6 src/external/mit/xorg/lib/libEGL/Makefile:1.7
--- src/external/mit/xorg/lib/libEGL/Makefile:1.6 Mon Jul 12 09:40:31 2021
+++ src/external/mit/xorg/lib/libEGL/Makefile Tue Jul 13 05:22:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2021/07/13 05:22:27 mrg Exp $
.include
@@ -102,7 +102,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
Xdmcp ${.CURDIR}/../libXdmcp \
glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \
drm ${.CURDIR}/../libdrm \
- gbm ${.CURDIR}/../libgbm \
+ gbm ${.CURDIR}/../libgbm${OLD_SUFFIX} \
xshmfence ${.CURDIR}/../libxshmfence \
X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: thorpej Date: Tue Jul 13 01:59:10 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: lock_stubs.s patch.c Log Message: As with membar_producer() and membar_sync(), initialize the fast-path lock stubs with "unop" isns where memory barriers need to be, and if we detect a multiprocessor system, patch those locations with "mb" insns. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/alpha/lock_stubs.s \ src/sys/arch/alpha/alpha/patch.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/alpha/alpha/lock_stubs.s diff -u src/sys/arch/alpha/alpha/lock_stubs.s:1.6 src/sys/arch/alpha/alpha/lock_stubs.s:1.7 --- src/sys/arch/alpha/alpha/lock_stubs.s:1.6 Mon Jul 12 15:21:51 2021 +++ src/sys/arch/alpha/alpha/lock_stubs.s Tue Jul 13 01:59:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 thorpej Exp $ */ +/* $NetBSD: lock_stubs.s,v 1.7 2021/07/13 01:59:10 thorpej Exp $ */ /*- * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc. @@ -34,12 +34,16 @@ #include -__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.7 2021/07/13 01:59:10 thorpej Exp $"); #include "assym.h" #if defined(MULTIPROCESSOR) -#define MB mb +/* + * These 'unop' insns will be patched with 'mb' insns at run-time if + * the system has more than one processor. + */ +#define MB(label) label: unop #else #define MB /* nothing */ #endif @@ -55,11 +59,11 @@ LEAF(_lock_cas, 3) beq t1, 2f stq_c v0, 0(a0) beq v0, 3f - MB + MB(.L__lock_cas_mb_1) RET 2: mov zero, v0 - MB + MB(.L__lock_cas_mb_2) RET 3: br 1b @@ -79,7 +83,7 @@ LEAF(mutex_enter, 1) bne t2, 2f stq_c t1, 0(a0) beq t1, 3f - MB + MB(.L_mutex_enter_mb_1) RET 2: lda t12, mutex_vector_enter @@ -93,7 +97,7 @@ LEAF(mutex_enter, 1) */ LEAF(mutex_exit, 1) LDGP(pv) - MB + MB(.L_mutex_exit_mb_1) GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0, t8...t11. */ mov zero, t3 1: @@ -179,7 +183,7 @@ LEAF(mutex_spin_enter, 1); bne t0, 2f /* contended */ stl_c t1, MUTEX_SIMPLELOCK(a1) beq t1, 2f /* STL_C failed; consider contended */ - MB + MB(.L_mutex_spin_enter_mb_1) RET 2: mov a1, a0 /* restore first argument */ @@ -192,7 +196,7 @@ LEAF(mutex_spin_enter, 1); */ LEAF(mutex_spin_exit, 1) LDGP(pv); - MB + MB(.L_mutex_spin_exit_mb_1) /* * STEP 1: __cpu_simple_unlock(>mtx_lock) @@ -247,7 +251,7 @@ LEAF(rw_enter, 2) bne t1, 4f /* contended */ stq_c t2, 0(a0) beq t2, 2f /* STQ_C failed; retry */ - MB + MB(.L_rw_enter_mb_1) RET 2: br 1b @@ -259,7 +263,7 @@ LEAF(rw_enter, 2) bne t0, 4f /* contended */ stq_c t2, 0(a0) beq t2, 4f /* STQ_C failed; consider it contended */ - MB + MB(.L_rw_enter_mb_2) RET 4: lda pv, rw_vector_enter @@ -284,7 +288,7 @@ LEAF(rw_tryenter, 2) bne t1, 4f /* contended */ stq_c v0, 0(a0) beq v0, 2f /* STQ_C failed; retry */ - MB + MB(.L_rw_tryenter_mb_1) RET /* v0 contains non-zero LOCK_FLAG from STQ_C */ 2: br 1b @@ -302,7 +306,7 @@ LEAF(rw_tryenter, 2) * in the failure case because we expect it to be rare and it saves * a branch-not-taken instruction in the success case. */ - MB + MB(.L_rw_tryenter_mb_2) RET 4: mov zero, v0 /* return 0 (failure) */ @@ -316,7 +320,7 @@ LEAF(rw_tryenter, 2) */ LEAF(rw_exit, 1) LDGP(pv) - MB + MB(.L_rw_exit_mb_1) /* * Check for write-lock release, and get the owner/count field @@ -381,3 +385,27 @@ LEAF(rw_exit, 1) END(rw_exit) #endif /* !LOCKDEBUG */ + +#if defined(MULTIPROCESSOR) +/* + * Table of locations to patch with MB instructions on multiprocessor + * systems. + */ + .section ".rodata" + .globl lock_stub_patch_table +lock_stub_patch_table: + .quad .L__lock_cas_mb_1 + .quad .L__lock_cas_mb_2 +#if !defined(LOCKDEBUG) + .quad .L_mutex_enter_mb_1 + .quad .L_mutex_exit_mb_1 + .quad .L_mutex_spin_enter_mb_1 + .quad .L_mutex_spin_exit_mb_1 + .quad .L_rw_enter_mb_1 + .quad .L_rw_enter_mb_2 + .quad .L_rw_tryenter_mb_1 + .quad .L_rw_tryenter_mb_2 + .quad .L_rw_exit_mb_1 +#endif /* ! LOCKDEBUG */ + .quad 0 /* NULL terminator */ +#endif /* MULTIPROCESSOR */ Index: src/sys/arch/alpha/alpha/patch.c diff -u src/sys/arch/alpha/alpha/patch.c:1.6 src/sys/arch/alpha/alpha/patch.c:1.7 --- src/sys/arch/alpha/alpha/patch.c:1.6 Wed Jul 7 03:30:35 2021 +++ src/sys/arch/alpha/alpha/patch.c Tue Jul 13 01:59:10 2021 @@ -1,7 +1,7 @@ -/* $NetBSD: patch.c,v 1.6 2021/07/07 03:30:35 thorpej Exp $ */ +/* $NetBSD: patch.c,v 1.7 2021/07/13 01:59:10 thorpej Exp $ */ /*- - * Copyright (c) 2007 The NetBSD Foundation, Inc. + * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: patch.c,v
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 12 22:02:44 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: order type declarations in grammar, group by C99 section
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.320 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.319 src/usr.bin/xlint/lint1/cgram.y:1.320
--- src/usr.bin/xlint/lint1/cgram.y:1.319 Mon Jul 12 21:43:44 2021
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 12 22:02:44 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.319 2021/07/12 21:43:44 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.320 2021/07/12 22:02: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.319 2021/07/12 21:43:44 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.320 2021/07/12 22:02:44 rillig Exp $");
#endif
#include
@@ -279,25 +279,33 @@ anonymize(sym_t *s)
%token T_CON
%token T_STRING
+%type identifier_sym
+%type identifier
+%type string
+%type string2
+
%type primary_expression
+%type generic_selection
+%type generic_assoc_list
+%type generic_association
%type postfix_expression
+%type gcc_statement_expr_list
+%type gcc_statement_expr_item
+%type point_or_arrow
%type argument_expression_list
%type unary_expression
%type cast_expression
+%type expr_opt
%type expr
+%type assignment_expression
+%type constant_expr
-%type func_decl
-%type notype_decl
-%type type_decl
-%type type_specifier
%type begin_type_typespec
+%type type_specifier
%type notype_type_specifier
%type struct_or_union_specifier
-%type enum_specifier
%type struct_or_union
%type braced_struct_declaration_list
-%type identifier_sym
-%type identifier
%type struct_declaration_list_with_rbrace
%type struct_declaration_list
%type struct_declaration
@@ -305,48 +313,42 @@ anonymize(sym_t *s)
%type type_member_decls
%type notype_member_decl
%type type_member_decl
-%type constant_expr
-%type array_size
+%type enum_specifier
%type enum_declaration
%type enums_with_opt_comma
%type enumerator_list
%type enumerator
-%type notype_direct_decl
-%type type_direct_decl
+%type type_qualifier
%type pointer
%type asterisk
+%type type_qualifier_list_opt
+%type type_qualifier_list
+%type notype_decl
+%type type_decl
+%type notype_direct_decl
+%type type_direct_decl
%type type_param_decl
-%type param_list
-%type abstract_decl_param_list
-%type direct_param_decl
%type notype_param_decl
+%type direct_param_decl
%type direct_notype_param_decl
-%type type_qualifier_list_opt
-%type type_qualifier_list
-%type type_qualifier
+%type param_list
+%type array_size
%type identifier_list
+%type type_name
+%type abstract_declaration
%type abstract_declarator
%type direct_abstract_declarator
+%type abstract_decl_param_list
%type vararg_parameter_type_list
%type parameter_type_list
%type parameter_declaration
-%type assignment_expression
-%type gcc_statement_expr_list
-%type gcc_statement_expr_item
-%type generic_selection
-%type point_or_arrow
-%type type_name
-%type abstract_declaration
-%type do_while_expr
-%type expr_opt
-%type string
-%type string2
-%type asm_or_symbolrename_opt
%type range
+%type asm_or_symbolrename_opt
+
%type block_item_list
%type block_item
-%type generic_assoc_list
-%type generic_association
+%type do_while_expr
+%type func_decl
%%
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 12 21:43:44 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: reorder grammar rules in the same way as in C99
The code coverage before and after this change is exactly the same,
except of course for cgram.y and cgram.c.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 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.318 src/usr.bin/xlint/lint1/cgram.y:1.319
--- src/usr.bin/xlint/lint1/cgram.y:1.318 Sun Jul 11 21:07:44 2021
+++ src/usr.bin/xlint/lint1/cgram.y Mon Jul 12 21:43:44 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.318 2021/07/11 21:07:44 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.319 2021/07/12 21:43: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.318 2021/07/11 21:07:44 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.319 2021/07/12 21:43:44 rillig Exp $");
#endif
#include
@@ -363,159 +363,373 @@ program:
| translation_unit
;
-translation_unit: /* C99 6.9 */
- external_declaration
- | translation_unit external_declaration
+identifier_sym: /* helper for struct/union/enum */
+ identifier {
+ $$ = getsym($1);
+ }
;
-external_declaration: /* C99 6.9 */
- asm_statement
- | function_definition {
- global_clean_up_decl(false);
- clear_warning_flags();
+/* K ???, C90 ???, C99 6.4.2.1, C11 ???, C18 ??? */
+identifier:
+ T_NAME {
+ $$ = $1;
+ cgram_debug("name '%s'", $$->sb_name);
}
- | top_level_declaration {
- global_clean_up_decl(false);
- clear_warning_flags();
+ | T_TYPENAME {
+ $$ = $1;
+ cgram_debug("typename '%s'", $$->sb_name);
+ }
+ ;
+
+/* see C99 6.4.5, string literals are joined by 5.1.1.2 */
+string:
+ T_STRING
+ | T_STRING string2 {
+ $$ = cat_strings($1, $2);
+ }
+ ;
+
+/* see C99 6.4.5, string literals are joined by 5.1.1.2 */
+string2:
+ T_STRING {
+ if (tflag) {
+ /* concatenated strings are illegal in traditional C */
+ warning(219);
+ }
+ $$ = $1;
+ }
+ | string2 T_STRING {
+ $$ = cat_strings($1, $2);
+ }
+ ;
+
+/* 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)
+ yychar = yylex();
+ $$ = new_name_node(getsym($1), yychar);
+ }
+ | 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;
+ }
+ | generic_selection
+ /* 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));
+ }
+ ;
+
+/* 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);
+ }
+ | 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);
+
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: kre
Date: Mon Jul 12 19:03:20 UTC 2021
Modified Files:
src/usr.sbin/sysinst: msg_xlat.sh
Log Message:
Revert 1.4, that just trades one problem for a different one
(splitting the message on % instead of white space, which affects
less messages, but makes a bigger mess of them when it happens).
The real problem is that the expansion of the message was unquoted,
which allowed the field splitting to happen at all (which was mitigated
by the way printf rescans its format string for each arg when there are
more args than conversions in the format) otherwise it would have been
a much bigger mess (both times).
Just add quotes where quotes are needed, no more splitting, all good.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/usr.sbin/sysinst/msg_xlat.sh:1.5
--- src/usr.sbin/sysinst/msg_xlat.sh:1.4 Sun Jul 11 10:51:46 2021
+++ src/usr.sbin/sysinst/msg_xlat.sh Mon Jul 12 19:03:20 2021
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: msg_xlat.sh,v 1.4 2021/07/11 10:51:46 cjep Exp $
+# $NetBSD: msg_xlat.sh,v 1.5 2021/07/12 19:03:20 kre Exp $
#-
# Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -174,7 +174,7 @@ do
$IGNORE_MISSING_TRANSLATIONS || rval=1
fi
done
-IFS=%
+unset IFS
if $count_fmtargs; then exit $rval; fi
@@ -210,7 +210,7 @@ while
do
eval msg=\${MSGTEXT_$msgnum}
if [ -z "$msg" ]; then continue; fi
- printf '%s\0' $msg
+ printf '%s\0' "$msg"
done
exit $rval
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src Committed By: mrg Date: Mon Jul 12 18:42:40 UTC 2021 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el: config.h config.m4 gmp.h Log Message: mknative-gmp for mipsn64* and GMP 6.2.1. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h cvs rdiff -u -r1.1 -r1.2 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64el/gmp.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/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h:1.1 Sun Apr 25 23:57:47 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.h Mon Jul 12 18:42:39 2021 @@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_NAME "GNU MP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU MP 6.2.0" +#define PACKAGE_STRING "GNU MP 6.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gmp" @@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_URL "http://www.gnu.org/software/gmp/; /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.2.0" +#define PACKAGE_VERSION "6.2.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -569,13 +569,13 @@ see https://www.gnu.org/licenses/. #define SIZEOF_UNSIGNED 4 /* The size of `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 +#define SIZEOF_UNSIGNED_LONG 8 /* The size of `unsigned short', as computed by sizeof. */ #define SIZEOF_UNSIGNED_SHORT 2 /* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 4 +#define SIZEOF_VOID_P 8 /* Define to 1 if sscanf requires writable inputs */ /* #undef SSCANF_WRITABLE_INPUT */ @@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/. #define TUNE_SQR_TOOM2_MAX SQR_TOOM2_MAX_GENERIC /* Version number of package */ -#define VERSION "6.2.0" +#define VERSION "6.2.1" /* Define to 1 to enable ASSERT checking, per --enable-assert */ /* #undef WANT_ASSERT */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4:1.1 Sun Apr 25 23:57:47 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/config.m4 Mon Jul 12 18:42:39 2021 @@ -27,7 +27,7 @@ changequote(`,') ifdef(`__CONFIG_M4_INCLUDED__',,` include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4') include_mpn(`mips32/mips-defs.m4') -define_not_for_expansion(`HAVE_HOST_CPU_mips64') +define_not_for_expansion(`HAVE_HOST_CPU_mipsn64eb') define_not_for_expansion(`HAVE_ABI_n32') define_not_for_expansion(`HAVE_LIMB_BIG_ENDIAN') define_not_for_expansion(`HAVE_DOUBLE_IEEE_BIG_ENDIAN') Index: src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.2 --- src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h:1.1 Sun Apr 25 23:57:47 2021 +++ src/external/lgpl3/gmp/lib/libgmp/arch/mipsn64eb/gmp.h Mon Jul 12 18:42:39 2021 @@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr; GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #ifdef __GNUC__ -#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \ - || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) +#if (defined __GNUC_STDC_INLINE__) || \ +(__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4) #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) -#else -#define __GMP_EXTERN_INLINE extern __inline__ #endif #define __GMP_INLINE_PROTOTYPES 1 #endif @@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt #define mpn_sec_invert_itch __MPN(sec_invert_itch) __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE; +#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv) +__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t); + / mpz inlines / @@ -2324,12 +2325,12 @@ enum /* Define CC and CFLAGS which were used to build this version
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Mon Jul 12 18:42:23 UTC 2021 Modified Files: src/external/lgpl3/gmp/dist: configfsf.sub configure configure.ac Log Message: add mipsn64 support, so native-gmp works, and likely, build.sh tools on a mipsn64 host. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/lgpl3/gmp/dist/configfsf.sub cvs rdiff -u -r1.9 -r1.10 src/external/lgpl3/gmp/dist/configure cvs rdiff -u -r1.1.1.4 -r1.2 src/external/lgpl3/gmp/dist/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/configfsf.sub diff -u src/external/lgpl3/gmp/dist/configfsf.sub:1.7 src/external/lgpl3/gmp/dist/configfsf.sub:1.8 --- src/external/lgpl3/gmp/dist/configfsf.sub:1.7 Sun Jul 11 21:15:45 2021 +++ src/external/lgpl3/gmp/dist/configfsf.sub Mon Jul 12 18:42:23 2021 @@ -1193,6 +1193,7 @@ case $cpu-$vendor in | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64eb | mips64el \ + | mipsn64 | mipsn64eb | mipsn64el \ | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ | mips64r5900 | mips64r5900el \ Index: src/external/lgpl3/gmp/dist/configure diff -u src/external/lgpl3/gmp/dist/configure:1.9 src/external/lgpl3/gmp/dist/configure:1.10 --- src/external/lgpl3/gmp/dist/configure:1.9 Sun Jul 11 21:15:45 2021 +++ src/external/lgpl3/gmp/dist/configure Mon Jul 12 18:42:23 2021 @@ -4684,7 +4684,7 @@ echo "include_mpn(\`mips32/mips-defs.m4' case $host in - mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]*) + mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]* | mipsn64*-*-*) abilist="n32 64 o32" cclist_n32="gcc cc" Index: src/external/lgpl3/gmp/dist/configure.ac diff -u src/external/lgpl3/gmp/dist/configure.ac:1.1.1.4 src/external/lgpl3/gmp/dist/configure.ac:1.2 --- src/external/lgpl3/gmp/dist/configure.ac:1.1.1.4 Sun Jul 11 21:14:44 2021 +++ src/external/lgpl3/gmp/dist/configure.ac Mon Jul 12 18:42:23 2021 @@ -35,7 +35,7 @@ see https://www.gnu.org/licenses/. AC_COPYRIGHT(GMP_COPYRIGHT) AH_TOP(/*GMP_COPYRIGHT*/) -AC_REVISION($Revision: 1.1.1.4 $) +AC_REVISION($Revision: 1.2 $) AC_PREREQ(2.59) AC_INIT(GNU MP, GMP_VERSION, [gmp-b...@gmplib.org, see https://gmplib.org/manual/Reporting-Bugs.html], gmp) AC_CONFIG_SRCDIR(gmp-impl.h) @@ -1027,7 +1027,7 @@ case $host in GMP_INCLUDE_MPN(mips32/mips-defs.m4) case $host in - [mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]*]) + [mips64*-*-* | mipsisa64*-*-* | mips*-*-irix[6789]* | mipsn64*-*-*]) abilist="n32 64 o32" cclist_n32="gcc cc"
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Jul 12 18:00:36 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_064.c msg_064.exp
Log Message:
tests/lint: test trying to define a ()-less function
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_064.c \
src/tests/usr.bin/xlint/lint1/msg_064.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/msg_064.c
diff -u src/tests/usr.bin/xlint/lint1/msg_064.c:1.2 src/tests/usr.bin/xlint/lint1/msg_064.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_064.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_064.c Mon Jul 12 18:00:36 2021
@@ -1,7 +1,16 @@
-/* $NetBSD: msg_064.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_064.c,v 1.3 2021/07/12 18:00:36 rillig Exp $ */
# 3 "msg_064.c"
// Test for message: ()-less function definition [64]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+typedef int (function)(void);
+
+/*
+ * Even though typedef_function has type function, this construction is not
+ * allowed. A function definition must always look like a function
+ * definition, and that includes the parentheses for the arguments or
+ * parameters.
+ */
+function typedef_function {
+ /* expect-1: error: ()-less function definition [64] */
+}
Index: src/tests/usr.bin/xlint/lint1/msg_064.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_064.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_064.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_064.exp:1.2 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/msg_064.exp Mon Jul 12 18:00:36 2021
@@ -1 +1 @@
-msg_064.c(6): error: syntax error ':' [249]
+msg_064.c(14): error: ()-less function definition [64]
CVS commit: src/sys/dev/eisa
Module Name:src
Committed By: thorpej
Date: Mon Jul 12 16:44:52 UTC 2021
Modified Files:
src/sys/dev/eisa: depca_eisa.c
Log Message:
Printing out our model name is not considered an error message.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/eisa/depca_eisa.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/eisa/depca_eisa.c
diff -u src/sys/dev/eisa/depca_eisa.c:1.15 src/sys/dev/eisa/depca_eisa.c:1.16
--- src/sys/dev/eisa/depca_eisa.c:1.15 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/eisa/depca_eisa.c Mon Jul 12 16:44:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_eisa.c,v 1.15 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: depca_eisa.c,v 1.16 2021/07/12 16:44:52 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.15 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.16 2021/07/12 16:44:52 thorpej Exp $");
#include "opt_inet.h"
@@ -106,7 +106,8 @@ depca_eisa_attach(device_t parent, devic
struct eisa_cfg_irq eci;
sc->sc_dev = self;
- aprint_error(": DEC DE422 Ethernet\n");
+ aprint_naive("\n");
+ aprint_normal(": DEC DE422 Ethernet\n");
sc->sc_iot = ea->ea_iot;
sc->sc_memt = ea->ea_memt;
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: thorpej Date: Mon Jul 12 15:21:51 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: genassym.cf lock_stubs.s src/sys/arch/alpha/include: mutex.h Log Message: Optimized fast-paths for mutex_spin_enter() and mutex_spin_exit(). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/alpha/genassym.cf cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/alpha/lock_stubs.s cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/mutex.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/alpha/alpha/genassym.cf diff -u src/sys/arch/alpha/alpha/genassym.cf:1.29 src/sys/arch/alpha/alpha/genassym.cf:1.30 --- src/sys/arch/alpha/alpha/genassym.cf:1.29 Sun Jul 11 01:58:41 2021 +++ src/sys/arch/alpha/alpha/genassym.cf Mon Jul 12 15:21:51 2021 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.29 2021/07/11 01:58:41 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.30 2021/07/12 15:21:51 thorpej Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -67,6 +67,7 @@ # quote #define __RWLOCK_PRIVATE +quote #define __MUTEX_PRIVATE include include @@ -75,6 +76,7 @@ include include include include +include include include @@ -198,6 +200,7 @@ define CPU_INFO_CURLWP offsetof(struct define CPU_INFO_IDLE_LWP offsetof(struct cpu_info, ci_data.cpu_idlelwp) define CPU_INFO_SSIR offsetof(struct cpu_info, ci_ssir) define CPU_INFO_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count) +define CPU_INFO_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl) define CPU_INFO_SIZEOF sizeof(struct cpu_info) # Bits in lock fields @@ -205,3 +208,6 @@ define RW_WRITE_WANTED RW_WRITE_WANTED define RW_WRITE_LOCKED RW_WRITE_LOCKED define RW_READ_INCR RW_READ_INCR define RW_READ_COUNT_SHIFT RW_READ_COUNT_SHIFT +define MUTEX_IPL offsetof(struct kmutex, mtx_ipl) +define MUTEX_SIMPLELOCK offsetof(struct kmutex, mtx_lock) +define __SIMPLELOCK_LOCKED __SIMPLELOCK_LOCKED Index: src/sys/arch/alpha/alpha/lock_stubs.s diff -u src/sys/arch/alpha/alpha/lock_stubs.s:1.5 src/sys/arch/alpha/alpha/lock_stubs.s:1.6 --- src/sys/arch/alpha/alpha/lock_stubs.s:1.5 Sun Jul 11 01:58:41 2021 +++ src/sys/arch/alpha/alpha/lock_stubs.s Mon Jul 12 15:21:51 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $ */ +/* $NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 thorpej Exp $ */ /*- * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 thorpej Exp $"); #include "assym.h" @@ -111,6 +111,120 @@ LEAF(mutex_exit, 1) END(mutex_exit) /* + * void mutex_spin_enter(kmutex_t *mtx); + */ +LEAF(mutex_spin_enter, 1); + LDGP(pv) + + /* + * STEP 1: Perform the MUTEX_SPIN_SPLRAISE() function. + * (see sys/kern/kern_mutex.c) + * + * s = splraise(mtx->mtx_ipl); + * if (curcpu->ci_mtx_count-- == 0) + * curcpu->ci_mtx_oldspl = s; + */ + + call_pal PAL_OSF1_rdps /* clobbers v0, t0, t8..t11 */ + /* v0 = cur_ipl */ +#ifdef __BWX__ + mov a0, a1 /* a1 = mtx */ + ldbu a0, MUTEX_IPL(a0) /* a0 = new_ipl */ + mov v0, a4 /* save cur_ipl in a4 */ +#else + mov a0, a1 /* a1 = mtx */ + ldq_u a2, MUTEX_IPL(a0) + mov v0, a4 /* save cur_ipl in a4 */ + extbl a2, MUTEX_IPL, a0 /* a0 = new_ipl */ +#endif /* __BWX__ */ + cmplt v0, a0, a3 /* a3 = (cur_ipl < new_ipl) */ + GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0, t8...t11. */ + mov v0, a5 /* save curlwp in a5 */ + /* + * The forward-branch over the SWPIPL call is correctly predicted + * not-taken by the CPU because it's rare for a code path to acquire + * 2 spin mutexes. + */ + beq a3, 1f /* no? -> skip... */ + call_pal PAL_OSF1_swpipl /* clobbers v0, t0, t8..t11 */ + /* + * v0 returns the old_ipl, which will be the same as the + * cur_ipl we squirreled away in a4 earlier. + */ +1: + /* + * curlwp->l_cpu is now stable. Update the counter and + * stash the old_ipl. Just in case it's not clear what's + * going on, we: + * + * - Load previous value of mtx_oldspl into t1. + * - Conditionally move old_ipl into t1 if mtx_count == 0. + * - Store t1 back to mtx_oldspl; if mtx_count != 0, + * the store is redundant, but it's faster than a forward + * branch. + */ + ldq a3, L_CPU(a5) /* a3 = curlwp->l_cpu (curcpu) */ + ldl t0, CPU_INFO_MTX_COUNT(a3) + ldl t1, CPU_INFO_MTX_OLDSPL(a3) + cmoveq t0, a4, t1 /* mtx_count == 0? -> t1 = old_ipl */ + subl t0, 1, t2 /* mtx_count-- */ + stl t1, CPU_INFO_MTX_OLDSPL(a3) + stl t2, CPU_INFO_MTX_COUNT(a3) + + /* + * STEP 2: __cpu_simple_lock_try(>mtx_lock) + */ + ldl_l t0, MUTEX_SIMPLELOCK(a1) + ldiq t1, __SIMPLELOCK_LOCKED + bne t0, 2f /* contended */ + stl_c t1, MUTEX_SIMPLELOCK(a1) + beq t1, 2f /* STL_C failed; consider contended */ + MB + RET +2: + mov
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jul 12 12:59:54 UTC 2021 Modified Files: src/sys/dev/pci: ichsmb.c Log Message: Add Jasper Lake support. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ichsmb.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/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.70 src/sys/dev/pci/ichsmb.c:1.71 --- src/sys/dev/pci/ichsmb.c:1.70 Sat Apr 24 23:36:57 2021 +++ src/sys/dev/pci/ichsmb.c Mon Jul 12 12:59:54 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.70 2021/04/24 23:36:57 thorpej Exp $ */ +/* $NetBSD: ichsmb.c,v 1.71 2021/07/12 12:59:54 msaitoh Exp $ */ /* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.70 2021/04/24 23:36:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.71 2021/07/12 12:59:54 msaitoh Exp $"); #include #include @@ -135,6 +135,7 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_BSW_PCU_SMB: case PCI_PRODUCT_INTEL_APL_SMB: case PCI_PRODUCT_INTEL_GLK_SMB: + case PCI_PRODUCT_INTEL_JSL_SMB: case PCI_PRODUCT_INTEL_C600_SMBUS: case PCI_PRODUCT_INTEL_C600_SMB_0: case PCI_PRODUCT_INTEL_C600_SMB_1:
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jul 12 12:58:58 UTC 2021 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel Jasper Lake devices and Reealtek RTL8821CE. To generate a diff of this commit: cvs rdiff -u -r1.1426 -r1.1427 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1426 src/sys/dev/pci/pcidevs:1.1427 --- src/sys/dev/pci/pcidevs:1.1426 Wed Apr 21 13:09:33 2021 +++ src/sys/dev/pci/pcidevs Mon Jul 12 12:58:57 2021 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1426 2021/04/21 13:09:33 jakllsch Exp $ +$NetBSD: pcidevs,v 1.1427 2021/07/12 12:58:57 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5183,6 +5183,56 @@ product INTEL WIFI_LINK_5350_1 0x423a Wi product INTEL WIFI_LINK_5350_2 0x423b WiFi Link 5350 product INTEL WIFI_LINK_5150_1 0x423c WiFi Link 5150 product INTEL WIFI_LINK_5150_2 0x423d WiFi Link 5150 + +product INTEL JSL_ESPI 0x4d87 Jasper Lake eSPI +product INTEL JSL_P2SB 0x4da0 Jasper Lake P2SB +product INTEL JSL_PMC 0x4da1 Jasper Lake PMC +product INTEL JSL_SMB 0x4da3 Jasper Lake SMBus +product INTEL JSL_SPI_FLASH 0x4da4 Jasper Lake SPI (FLASH) +product INTEL JSL_TRACE 0x4da6 Jasper Lake Intel Trace Hub +product INTEL JSL_UART_0 0x4da8 Jasper Lake UART 0 +product INTEL JSL_UART_1 0x4da9 Jasper Lake UART 1 +product INTEL JSL_SPI_0 0x4daa Jasper Lake SPI 0 +product INTEL JSL_SPI_1 0x4dab Jasper Lake SPI 1 +product INTEL JSL_PCIE_1 0x4db8 Jasper Lake PCIe Root Port 1 +product INTEL JSL_PCIE_2 0x4db9 Jasper Lake PCIe Root Port 2 +product INTEL JSL_PCIE_3 0x4dba Jasper Lake PCIe Root Port 3 +product INTEL JSL_PCIE_4 0x4dbb Jasper Lake PCIe Root Port 4 +product INTEL JSL_PCIE_5 0x4dbc Jasper Lake PCIe Root Port 5 +product INTEL JSL_PCIE_6 0x4dbd Jasper Lake PCIe Root Port 6 +product INTEL JSL_PCIE_7 0x4dbe Jasper Lake PCIe Root Port 7 +product INTEL JSL_PCIE_8 0x4dbf Jasper Lake PCIe Root Port 8 +product INTEL JSL_EMMC 0x4dc4 Jasper Lake eMMC +product INTEL JSL_LPSS_I2C_4 0x4dc5 Jasper Lake LPSS I2C 4 +product INTEL JSL_LPSS_I2C_5 0x4dc6 Jasper Lake LPSS I2C 5 +product INTEL JSL_UART_2 0x4dc7 Jasper Lake UART 2 +product INTEL JSL_CAVS 0x4dc8 Jasper Lake cAVS +product INTEL JSL_AHCI_1 0x4dd2 Jasper Lake SATA (AHCI) +product INTEL JSL_AHCI_2 0x4dd3 Jasper Lake SATA (AHCI) +product INTEL JSL_D_RAID 0x4dd6 Jasper Lake SATA (RAID, desktop) +product INTEL JSL_M_RAID 0x4dd7 Jasper Lake SATA (RAID, mobile) +product INTEL JSL_AHCI_OPTANE 0x4dde Jasper Lake SATA (Optane, desktop) +product INTEL JSL_HECI_1 0x4de0 Jasper Lake HECI 1 +product INTEL JSL_HECI_2 0x4de1 Jasper Lake HECI 2 +product INTEL JSL_HECI_3 0x4de4 Jasper Lake HECI 3 +product INTEL JSL_LPSS_I2C_0 0x4de8 Jasper Lake LPSS I2C 0 +product INTEL JSL_LPSS_I2C_1 0x4de9 Jasper Lake LPSS I2C 1 +product INTEL JSL_LPSS_I2C_2 0x4dea Jasper Lake LPSS I2C 2 +product INTEL JSL_LPSS_I2C_3 0x4deb Jasper Lake LPSS I2C 3 +product INTEL JSL_XHCI 0x4ded Jasper Lake USB Host (xHCI) +product INTEL JSL_XDCI 0x4dee Jasper Lake USB Device (xDCI) +product INTEL JSL_SSRAM 0x4def Jasper Lake Shared SRAM +product INTEL JSL_CNVI_0 0x4df0 Jasper Lake CNVi WiFi (SKU 0) +product INTEL JSL_CNVI_1 0x4df1 Jasper Lake CNVi WiFi (SKU 1) +product INTEL JSL_CNVI_2 0x4df2 Jasper Lake CNVi WiFi (SKU 2) +product INTEL JSL_CNVI_3 0x4df3 Jasper Lake CNVi WiFi (SKU 3) +product INTEL JSL_SCS 0x4df8 Jasper Lake SD Card +product INTEL JSL_SPI_2 0x4dfb Jasper Lake SPI 2 +product INTEL JSL_DPTF 0x4e03 Jasper Lake DPTF +product INTEL JSL_HB 0x4e22 Jasper Lake Processor Transaction Route +product INTEL JSL_GPU_EU_16 0x4e55 Jasper Lake GPU 16 EU +product INTEL JSL_GPU_EU_24 0x4e61 Jasper Lake GPU 24 EU +product INTEL JSL_GPU_EU_32 0x4e71 Jasper Lake GPU 32 EU product INTEL EP80579_HB 0x5020 EP80579 Host product INTEL EP80579_MEM 0x5021 EP80579 Memory product INTEL EP80579_EDMA 0x5023 EP80579 EDMA @@ -7574,6 +7624,7 @@ product REALTEK RTL8188EE 0x8179 RTL8188 product REALTEK RT8180 0x8180 8180 802.11b product REALTEK RT8185 0x8185 8185 802.11a/b/g product REALTEK RTL8192EE 0x818b RTL8192EE Wireless LAN 802.11n PCI-E NIC +product REALTEK RTL8821CE 0xc821 RTL8821CE 802.11ac PCIe NIC /* Red Hat products */ product REDHAT PPB 0x0001 Qemu PCI-PCI
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Mon Jul 12 12:56:52 UTC 2021
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Add 0x96(Elkhart Lake) and 0x9c(Jasper Lake).
Not listed in SDM but listed in those spec update documents.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/usr.sbin/cpuctl/arch/i386.c
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/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.116 src/usr.sbin/cpuctl/arch/i386.c:1.117
--- src/usr.sbin/cpuctl/arch/i386.c:1.116 Sat Jul 10 17:18:05 2021
+++ src/usr.sbin/cpuctl/arch/i386.c Mon Jul 12 12:56:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.117 2021/07/12 12:56:52 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.117 2021/07/12 12:56:52 msaitoh Exp $");
#endif /* not lint */
#include
@@ -354,6 +354,8 @@ const struct cpu_cpuid_nameclass i386_cp
[0x8c] = "11th gen Core (Tiger Lake)",
[0x8d] = "11th gen Core (Tiger Lake)",
[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
+[0x96] = "Atom x6000E (Elkhart Lake)",
+[0x9c] = "Pentium Silver N6xxx, Celeron N45xx, Celeron N51xx (Jasper Lake)",
[0x9e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
[0xa5] = "10th gen Core (Comet Lake)",
[0xa6] = "10th gen Core (Comet Lake)",
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src
Committed By: mrg
Date: Mon Jul 12 09:40:31 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile
Log Message:
look for libglapi in ${OLD_SUFFIX}. noted by gson.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/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/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.5 src/external/mit/xorg/lib/libEGL/Makefile:1.6
--- src/external/mit/xorg/lib/libEGL/Makefile:1.5 Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile Mon Jul 12 09:40:31 2021
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $
+# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
.include
+.include "../mesa-which.mk"
+
LIB= EGL
LIBISCXX= yes
@@ -98,7 +100,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
Xfixes ${.CURDIR}/../libXfixes \
Xdamage ${.CURDIR}/../libXdamage \
Xdmcp ${.CURDIR}/../libXdmcp \
- glapi ${.CURDIR}/../libglapi \
+ glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \
drm ${.CURDIR}/../libdrm \
gbm ${.CURDIR}/../libgbm \
xshmfence ${.CURDIR}/../libxshmfence \
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src Committed By: mrg Date: Mon Jul 12 09:34:57 UTC 2021 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: config.h src/external/lgpl3/gmp/lib/libgmp/arch/alpha: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/arm: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/armeb: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/hppa: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/ia64: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68000: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/m68k: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipseb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/mipsel: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/powerpc: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/riscv32: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/riscv64: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sh3el: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/sparc64: config.h gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/vax: config.h gmp.h Log Message: mknative-gmp for GMP 6.2.1 and most platforms. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/alpha/gmp.h cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/arm/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/arm/gmp.h cvs rdiff -u -r1.7 -r1.8 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/gmp.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/hppa/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/hppa/gmp.h cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/ia64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/ia64/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/m68000/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/m68000/gmp.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/m68k/gmp.h cvs rdiff -u -r1.7 -r1.8 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h cvs rdiff -u -r1.7 -r1.8 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h cvs rdiff -u -r1.8 -r1.9 \ src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipseb/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/mipsel/gmp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/config.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/powerpc/gmp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/powerpc64/gmp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/config.h cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/riscv32/gmp.h cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/riscv64/config.h cvs rdiff -u -r1.3 -r1.4 src/external/lgpl3/gmp/lib/libgmp/arch/riscv64/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3eb/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/config.h cvs rdiff -u -r1.6 -r1.7 src/external/lgpl3/gmp/lib/libgmp/arch/sh3el/gmp.h cvs rdiff -u -r1.5 -r1.6 \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc/config.h cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/sparc/gmp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/config.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/sparc64/gmp.h cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/vax/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/vax/gmp.h Please note that diffs are not public domain; they are subject to the copyright notices on
CVS commit: src/external/lgpl3/gmp
Module Name:src Committed By: mrg Date: Mon Jul 12 07:59:52 UTC 2021 Modified Files: src/external/lgpl3/gmp: README src/external/lgpl3/gmp/lib/libgmp/arch/aarch64: config.h config.m4 gmp.h src/external/lgpl3/gmp/lib/libgmp/arch/i386: config.h gmp.h Log Message: regen for GMP 6.2.1 and i386 and arm64. update docs so i don't forget that i mostly got 'native-gmp' working last year. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/lgpl3/gmp/README cvs rdiff -u -r1.2 -r1.3 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 \ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/i386/config.h cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/lib/libgmp/arch/i386/gmp.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/lgpl3/gmp/README diff -u src/external/lgpl3/gmp/README:1.8 src/external/lgpl3/gmp/README:1.9 --- src/external/lgpl3/gmp/README:1.8 Fri Jun 1 21:46:18 2018 +++ src/external/lgpl3/gmp/README Mon Jul 12 07:59:51 2021 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.8 2018/06/01 21:46:18 mrg Exp $ +$NetBSD: README,v 1.9 2021/07/12 07:59:51 mrg Exp $ GMP in NetBSD. We need GMP for GCC >= 4.2. @@ -10,7 +10,20 @@ creates a bunch of symlinks and weeds ou files with the same name in different subdirectories linked into the same final product. All of these issues need to be dealt with. -There are a few steps to this: +There is a mostly-working "mknative" for GMP now. If this fails, see the +section below for the old instructions. + + - run a "./build tools libs", possibly setting MKGCC=no if the + GMP port is currently not working at all. + + - cd to tools/gmp, and run $TOOLDIR/bin/nbmake-$arch native-gmp + + - if that works, commit the files it changed in the source tree. + + - set NEWCONFIGDIR=/writeable/src if eg /usr/src is read-only. + +These are the old steps, that maybe are necessary to fix the automated +output: - run ./configure, save the output. you can use the makefile "Makefile.netbsd-gmp" in this directory to run this with the @@ -54,9 +67,5 @@ There are a few steps to this: The amd64 port is a good reference to compare. -This is still a work in progress and methods used to build may be -changed at any time. - - m...@netbsd.org -- 2017/08/22 +- 2021/07/11 Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h:1.2 Sun Sep 27 00:31:51 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.h Mon Jul 12 07:59:52 2021 @@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_NAME "GNU MP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU MP 6.2.0" +#define PACKAGE_STRING "GNU MP 6.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gmp" @@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_URL "http://www.gnu.org/software/gmp/; /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.2.0" +#define PACKAGE_VERSION "6.2.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/. #define TUNE_SQR_TOOM2_MAX SQR_TOOM2_MAX_GENERIC /* Version number of package */ -#define VERSION "6.2.0" +#define VERSION "6.2.1" /* Define to 1 to enable ASSERT checking, per --enable-assert */ /* #undef WANT_ASSERT */ @@ -641,7 +641,7 @@ see https://www.gnu.org/licenses/. /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ -#define YYTEXT_POINTER 1 +/* #undef YYTEXT_POINTER */ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.3 --- src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4:1.2 Sun Sep 27 00:31:51 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/config.m4 Mon Jul 12 07:59:52 2021 @@ -27,6 +27,7 @@ define(,eval(GMP_LIMB_BIT changequote(`,') ifdef(`__CONFIG_M4_INCLUDED__',,` include(CONFIG_TOP_SRCDIR`/mpn/asm-defs.m4') +include_mpn(`arm64/arm64-defs.m4') define_not_for_expansion(`HAVE_HOST_CPU_aarch64') define_not_for_expansion(`HAVE_ABI_64') define_not_for_expansion(`HAVE_LIMB_LITTLE_ENDIAN') Index: src/external/lgpl3/gmp/lib/libgmp/arch/aarch64/gmp.h diff -u
CVS import: xsrc/external/mit/MesaLib.old
Module Name:xsrc Committed By: mrg Date: Mon Jul 12 07:18:34 UTC 2021 Update of /cvsroot/xsrc/external/mit/MesaLib.old In directory ivanova.netbsd.org:/tmp/cvs-serv422 Log Message: initial import of Mesa 19.1.7 into MesaLib.old. add missed files due to being in subdir called 'core'. this time into the right place. Status: Vendor Tag: NetBSD-xsrc-MesaLib Release Tags: NetBSD-2021-07-11 N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrcommon.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrelemlib.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrelemlib.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib1.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib1.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib2.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrlib2.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrobject.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/addrobject.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/coord.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/coord.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrcommon.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrelemlib.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrelemlib.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib1.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib1.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib2.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrlib2.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrobject.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/addrobject.h N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/coord.cpp N xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/src/core/core/coord.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/api.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/api.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/arena.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_clear.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_impl.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_sample.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_singlesample.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/blend.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/conservativeRast.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/context.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/depthstencil.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/fifo.hpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/format_conversion.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/format_traits.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/format_types.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/format_utils.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.cpp N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs.h N xsrc/external/mit/MesaLib.old/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs_init.h N
CVS import: xsrc/external/mit/MesaLib
Module Name:xsrc Committed By: mrg Date: Mon Jul 12 07:17:30 UTC 2021 Update of /cvsroot/xsrc/external/mit/MesaLib In directory ivanova.netbsd.org:/tmp/cvs-serv22947 Log Message: initial import of Mesa 19.1.7 into MesaLib.old. add missed files due to being in subdir called 'core' Status: Vendor Tag: NetBSD-xsrc-MesaLib Release Tags: NetBSD-2021-07-11 U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrcommon.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrcommon.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.h U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.cpp U xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/arena.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_clear.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_impl.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_sample.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_singlesample.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/blend.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/conservativeRast.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/context.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/depthstencil.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/fifo.hpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_conversion.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_traits.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_types.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_utils.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.cpp U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs_init.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/multisample.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa.h U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa_avx.cpp U
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64
Module Name:src Committed By: mrg Date: Mon Jul 12 07:04:37 UTC 2021 Modified Files: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64: config.h config.m4 gmp.h Log Message: regen gmp parts for amd64 and gmp 6.2.1. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h \ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.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/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.5 --- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h:1.4 Sun Sep 27 00:31:54 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.h Mon Jul 12 07:04:37 2021 @@ -548,7 +548,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_NAME "GNU MP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU MP 6.2.0" +#define PACKAGE_STRING "GNU MP 6.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gmp" @@ -557,7 +557,7 @@ see https://www.gnu.org/licenses/. #define PACKAGE_URL "http://www.gnu.org/software/gmp/; /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.2.0" +#define PACKAGE_VERSION "6.2.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -590,7 +590,7 @@ see https://www.gnu.org/licenses/. /* #undef TUNE_SQR_TOOM2_MAX */ /* Version number of package */ -#define VERSION "6.2.0" +#define VERSION "6.2.1" /* Define to 1 to enable ASSERT checking, per --enable-assert */ /* #undef WANT_ASSERT */ Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.4 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.5 --- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4:1.4 Sun Sep 27 00:31:54 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/config.m4 Mon Jul 12 07:04:37 2021 @@ -19,6 +19,7 @@ define(, <.L>) define(, <.long>) define(,) define(,) +define(, ) define(,<34>) define(,<16>) define(,<4>) Index: src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h diff -u src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.5 src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.6 --- src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h:1.5 Sun Sep 27 00:31:54 2020 +++ src/external/lgpl3/gmp/lib/libgmp/arch/x86_64/gmp.h Mon Jul 12 07:04:37 2021 @@ -361,11 +361,9 @@ typedef __mpq_struct *mpq_ptr; GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #ifdef __GNUC__ -#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \ - || (defined __GNUC_GNU_INLINE__ && defined __cplusplus) +#if (defined __GNUC_STDC_INLINE__) || \ +(__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4) #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) -#else -#define __GMP_EXTERN_INLINE extern __inline__ #endif #define __GMP_INLINE_PROTOTYPES 1 #endif @@ -1693,6 +1691,9 @@ __GMP_DECLSPEC int mpn_sec_invert (mp_pt #define mpn_sec_invert_itch __MPN(sec_invert_itch) __GMP_DECLSPEC mp_size_t mpn_sec_invert_itch (mp_size_t) __GMP_ATTRIBUTE_PURE; +#define mpn_udiv_w_sdiv __MPN(udiv_w_sdiv) +__GMP_DECLSPEC mp_limb_t mpn_udiv_w_sdiv (mp_limb_t *, mp_limb_t, mp_limb_t, mp_limb_t); + / mpz inlines / @@ -2329,7 +2330,7 @@ enum /* Major version number is the value of __GNU_MP__ too, above. */ #define __GNU_MP_VERSION6 #define __GNU_MP_VERSION_MINOR 2 -#define __GNU_MP_VERSION_PATCHLEVEL 0 +#define __GNU_MP_VERSION_PATCHLEVEL 1 #define __GNU_MP_RELEASE (__GNU_MP_VERSION * 1 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL) #define __GMP_H__
