From 777fb69d261ef25842cbc1bd56d45a4c39de3e06 Mon Sep 17 00:00:00 2001 From: purplerain Date: Tue, 27 Jun 2023 23:12:38 +0000 Subject: [PATCH] sync --- gnu/lib/libiberty/src/aclocal.m4 | 2 +- gnu/lib/libstdc++/Makefile.bsd-wrapper | 2 +- gnu/lib/libstdc++/config-ml.in | 2 +- gnu/lib/libstdc++/config.guess | 2 +- gnu/lib/libstdc++/install-sh | 14 +- gnu/lib/libstdc++/libstdc++/Makefile.am | 4 +- gnu/lib/libstdc++/libstdc++/Makefile.in | 18 +-- gnu/lib/libstdc++/libstdc++/acconfig.h | 2 +- gnu/lib/libstdc++/libstdc++/acinclude.m4 | 186 +++++++++++------------ gnu/lib/libstdc++/ltcf-cxx.sh | 4 +- gnu/lib/libstdc++/ltconfig | 4 +- gnu/lib/libstdc++/ltmain.sh | 2 +- lib/libtls/tls_internal.h | 4 +- sys/net/if.c | 20 +-- sys/net/pf_ioctl.c | 10 +- sys/sys/malloc.h | 6 +- 16 files changed, 139 insertions(+), 143 deletions(-) diff --git a/gnu/lib/libiberty/src/aclocal.m4 b/gnu/lib/libiberty/src/aclocal.m4 index 3bf5c2d4e..15fa406cf 100644 --- a/gnu/lib/libiberty/src/aclocal.m4 +++ b/gnu/lib/libiberty/src/aclocal.m4 @@ -159,7 +159,7 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, main () { exit (find_stack_direction() < 0); -}], +}], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, ac_cv_c_stack_direction=0)]) diff --git a/gnu/lib/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libstdc++/Makefile.bsd-wrapper index 95017ddc1..e83896800 100644 --- a/gnu/lib/libstdc++/Makefile.bsd-wrapper +++ b/gnu/lib/libstdc++/Makefile.bsd-wrapper @@ -66,7 +66,7 @@ tags: prereq: config.status cd ${.OBJDIR}/include && exec ${MAKE} ${MAKE_FLAGS} all - + includes: cd ${.OBJDIR}/include && exec ${MAKE} ${MAKE_FLAGS} install DESTDIR=${DESTDIR} cd ${.OBJDIR}/libsupc++ && exec ${MAKE} ${MAKE_FLAGS} install-data DESTDIR=${DESTDIR} diff --git a/gnu/lib/libstdc++/config-ml.in b/gnu/lib/libstdc++/config-ml.in index c1c1eb4df..458b77ed2 100644 --- a/gnu/lib/libstdc++/config-ml.in +++ b/gnu/lib/libstdc++/config-ml.in @@ -755,7 +755,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then fi # find compiler flag corresponding to ${ml_dir} - for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do + for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do dir=`echo $i | sed -e 's/;.*$//'` if [ "${dir}" = "${ml_dir}" ]; then flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'` diff --git a/gnu/lib/libstdc++/config.guess b/gnu/lib/libstdc++/config.guess index 78eb70e29..5f65d9be0 100755 --- a/gnu/lib/libstdc++/config.guess +++ b/gnu/lib/libstdc++/config.guess @@ -699,7 +699,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` diff --git a/gnu/lib/libstdc++/install-sh b/gnu/lib/libstdc++/install-sh index 59bcde425..4bfc1e4db 100755 --- a/gnu/lib/libstdc++/install-sh +++ b/gnu/lib/libstdc++/install-sh @@ -115,7 +115,7 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - + if [ -d $dst ]; then instcmd=: chmodcmd="" @@ -125,7 +125,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] @@ -135,7 +135,7 @@ else echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ] then echo "install: no destination specified" @@ -202,17 +202,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -243,7 +243,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/gnu/lib/libstdc++/libstdc++/Makefile.am b/gnu/lib/libstdc++/libstdc++/Makefile.am index 642bdc306..78458708f 100644 --- a/gnu/lib/libstdc++/libstdc++/Makefile.am +++ b/gnu/lib/libstdc++/libstdc++/Makefile.am @@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS = 1.3 cygnus MAINT_CHARSET = latin1 -SUBDIRS = include libio libmath libsupc++ src po testsuite +SUBDIRS = include libio libmath libsupc++ src po testsuite mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs @@ -147,7 +147,7 @@ AM_MAKEFLAGS = \ "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "DESTDIR=$(DESTDIR)" \ - "WERROR=$(WERROR)" + "WERROR=$(WERROR)" # Subdir rules rely on $(FLAGS_TO_PASS) FLAGS_TO_PASS = $(AM_MAKEFLAGS) diff --git a/gnu/lib/libstdc++/libstdc++/Makefile.in b/gnu/lib/libstdc++/libstdc++/Makefile.in index 1c8b93d71..49543cb37 100644 --- a/gnu/lib/libstdc++/libstdc++/Makefile.in +++ b/gnu/lib/libstdc++/libstdc++/Makefile.in @@ -148,20 +148,20 @@ AUTOMAKE_OPTIONS = 1.3 cygnus MAINT_CHARSET = latin1 INCLUDE_SUBDIR=include -SUBDIRS = ${INCLUDE_SUBDIR} libio libmath libsupc++ src po testsuite +SUBDIRS = ${INCLUDE_SUBDIR} libio libmath libsupc++ src po testsuite mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs PWD_COMMAND = $${PWDCMD-pwd} # Multilib support. -MAKEOVERRIDES = +MAKEOVERRIDES = # Multilib support variables. -MULTISRCTOP = -MULTIBUILDTOP = -MULTIDIRS = -MULTISUBDIR = +MULTISRCTOP = +MULTIBUILDTOP = +MULTIDIRS = +MULTISUBDIR = MULTIDO = true MULTICLEAN = true @@ -206,7 +206,7 @@ AM_MAKEFLAGS = \ "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "DESTDIR=$(DESTDIR)" \ - "WERROR=$(WERROR)" + "WERROR=$(WERROR)" # Subdir rules rely on $(FLAGS_TO_PASS) @@ -225,7 +225,7 @@ TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -412,7 +412,7 @@ check-am: check: check-recursive installcheck-am: installcheck: installcheck-recursive -install-info-am: +install-info-am: install-info: install-info-recursive all-recursive-am: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/gnu/lib/libstdc++/libstdc++/acconfig.h b/gnu/lib/libstdc++/libstdc++/acconfig.h index 91af8fa31..3d9dcb6ea 100644 --- a/gnu/lib/libstdc++/libstdc++/acconfig.h +++ b/gnu/lib/libstdc++/libstdc++/acconfig.h @@ -35,7 +35,7 @@ #undef _GLIBCPP_CONCEPT_CHECKS // Define if the atan2f function exists. -#undef _GLIBCPP_HAVE_ATAN2F +#undef _GLIBCPP_HAVE_ATAN2F // Define if the atan2l function exists. #undef _GLIBCPP_HAVE_ATAN2L diff --git a/gnu/lib/libstdc++/libstdc++/acinclude.m4 b/gnu/lib/libstdc++/libstdc++/acinclude.m4 index 9ef7e5adc..5ba9b2088 100644 --- a/gnu/lib/libstdc++/libstdc++/acinclude.m4 +++ b/gnu/lib/libstdc++/libstdc++/acinclude.m4 @@ -209,8 +209,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ dnl dnl Check to see if g++ can compile this library, and if so, if any version- -dnl specific precautions need to be taken. -dnl +dnl specific precautions need to be taken. +dnl dnl GLIBCPP_CHECK_COMPILER_VERSION AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ if test ! -f stamp-sanity-compiler; then @@ -335,14 +335,14 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ # Check for -Wl,--gc-sections # XXX This test is broken at the moment, as symbols required for - # linking are now in libsupc++ (not built yet.....). In addition, + # linking are now in libsupc++ (not built yet.....). In addition, # this test has cored on solaris in the past. In addition, # --gc-sections doesn't really work at the moment (keeps on discarding # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) AC_TRY_RUN([ - int main(void) + int main(void) { try { throw 1; } catch (...) { }; @@ -388,7 +388,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [ #include #endif ], - [ $1(0);], + [ $1(0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) @@ -412,11 +412,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1 AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ GLIBCPP_CHECK_MATH_DECL_1($1) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) else GLIBCPP_CHECK_MATH_DECL_1(_$1) if test x$glibcpp_cv_func__$1_use = x"yes"; then - AC_CHECK_FUNCS(_$1) + AC_CHECK_FUNCS(_$1) fi fi ]) @@ -424,7 +424,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ dnl dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of -dnl of functions at once. It's an all-or-nothing check -- either +dnl of functions at once. It's an all-or-nothing check -- either dnl HAVE_XYZ is defined for each of the functions, or for none of them. dnl Doing it this way saves significant configure time. AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [ @@ -455,8 +455,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], - [ $1(0, 0);], + AC_TRY_COMPILE([#include ], + [ $1(0, 0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) @@ -479,11 +479,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2 AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [ GLIBCPP_CHECK_MATH_DECL_2($1) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) else GLIBCPP_CHECK_MATH_DECL_2(_$1) if test x$glibcpp_cv_func__$1_use = x"yes"; then - AC_CHECK_FUNCS(_$1) + AC_CHECK_FUNCS(_$1) fi fi ]) @@ -501,8 +501,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], - [ $1(0, 0, 0);], + AC_TRY_COMPILE([#include ], + [ $1(0, 0, 0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) @@ -525,11 +525,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3 AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [ GLIBCPP_CHECK_MATH_DECL_3($1) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) else GLIBCPP_CHECK_MATH_DECL_3(_$1) if test x$glibcpp_cv_func__$1_use = x"yes"; then - AC_CHECK_FUNCS(_$1) + AC_CHECK_FUNCS(_$1) fi fi ]) @@ -551,15 +551,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], - [ $1(0, 0);], + AC_TRY_COMPILE([#include ], + [ $1(0, 0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) fi AC_MSG_RESULT($glibcpp_cv_func_$1_use) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) fi ]) @@ -580,15 +580,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], - [ $1(0, 0, 0);], + AC_TRY_COMPILE([#include ], + [ $1(0, 0, 0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) fi AC_MSG_RESULT($glibcpp_cv_func_$1_use) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) fi ]) @@ -608,20 +608,20 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], - [ $1(0);], + AC_TRY_COMPILE([#include ], + [ $1(0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE ]) fi AC_MSG_RESULT($glibcpp_cv_func_$1_use) if test x$glibcpp_cv_func_$1_use = x"yes"; then - AC_CHECK_FUNCS($1) + AC_CHECK_FUNCS($1) fi ]) dnl -dnl Because the builtins are picky picky picky about the arguments they take, +dnl Because the builtins are picky picky picky about the arguments they take, dnl do an explict linkage tests here. dnl Check to see if the (math function) argument passed is dnl 1) declared when using the c++ compiler @@ -640,7 +640,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([#include ], [ $1(0);], [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) AC_LANG_RESTORE @@ -651,7 +651,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ AC_MSG_CHECKING([for $1 linkage]) if test x${glibcpp_cv_func_$1_link+set} != xset; then AC_CACHE_VAL(glibcpp_cv_func_$1_link, [ - AC_TRY_LINK([#include ], + AC_TRY_LINK([#include ], [ $1(0);], [glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no]) ]) @@ -686,7 +686,7 @@ dnl dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ dnl Test for builtin math functions. - dnl These are made in gcc/c-common.c + dnl These are made in gcc/c-common.c GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs) GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf) GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs) @@ -732,7 +732,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ dnl dnl Check to see what the underlying c library is like -dnl These checks need to do two things: +dnl These checks need to do two things: dnl 1) make sure the name is declared when using the c++ compiler dnl 2) make sure the name has "C" linkage dnl This might seem like overkill but experience has shown that it's not... @@ -756,7 +756,7 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [ dnl dnl Check to see what the underlying c library is like -dnl These checks need to do two things: +dnl These checks need to do two things: dnl 1) make sure the name is declared when using the c++ compiler dnl 2) make sure the name has "C" linkage dnl This might seem like overkill but experience has shown that it's not... @@ -770,13 +770,13 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_SUPPORT, [ CXXFLAGS='-fno-builtins -D_GNU_SOURCE' GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1(isatty) - + CXXFLAGS="$ac_save_CXXFLAGS" ]) dnl dnl Check to see what the underlying c library or math library is like. -dnl These checks need to do two things: +dnl These checks need to do two things: dnl 1) make sure the name is declared when using the c++ compiler dnl 2) make sure the name has "C" linkage dnl This might seem like overkill but experience has shown that it's not... @@ -888,7 +888,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ dnl -dnl Check to see if there is native support for complex +dnl Check to see if there is native support for complex dnl dnl Don't compile bits in math/* if native support exits. dnl @@ -904,7 +904,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"]) AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"]) - dnl Compile the long double complex functions only if the function + dnl Compile the long double complex functions only if the function dnl provides the non-complex long double functions that are needed. dnl Currently this includes copysignl, which should be dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above. @@ -923,7 +923,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ dnl Check to see what architecture and operating system we are compiling dnl for. Also, if architecture- or OS-specific flags are required for dnl compilation, pick them up here. -dnl +dnl dnl GLIBCPP_CHECK_TARGET AC_DEFUN(GLIBCPP_CHECK_TARGET, [ . [$]{glibcpp_basedir}/configure.target @@ -937,7 +937,7 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++. dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This dnl must have been previously checked.) dnl -dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found +dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT @@ -949,7 +949,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl others even if wchar_t support is not on. AC_MSG_CHECKING([for mbstate_t]) AC_TRY_COMPILE([#include ], - [mbstate_t teststate;], + [mbstate_t teststate;], have_mbstate_t=yes, have_mbstate_t=no) AC_MSG_RESULT($have_mbstate_t) if test x"$have_mbstate_t" = xyes; then @@ -959,20 +959,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl Sanity check for existence of ISO C99 headers for extended encoding. AC_CHECK_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no) AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no) - + dnl Only continue checking if the ISO C99 headers exist and support is on. if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes && test x"$enable_c_mbchar" != xno; then - + dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before dnl numeric_limits can instantiate type_traits AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX]) AC_TRY_COMPILE([#include ], - [int i = WCHAR_MIN; int j = WCHAR_MAX;], + [int i = WCHAR_MIN; int j = WCHAR_MAX;], has_wchar_minmax=yes, has_wchar_minmax=no) AC_MSG_RESULT($has_wchar_minmax) - + dnl Test wchar.h for WEOF, which is what we use to determine whether dnl to specialize for char_traits or not. AC_MSG_CHECKING([for WEOF]) @@ -982,12 +982,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ [wint_t i = WEOF;], has_weof=yes, has_weof=no) AC_MSG_RESULT($has_weof) - + dnl Tests for wide character functions used in char_traits. ac_wfuncs=yes AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \ ac_wfuncs=no) - + dnl Checks for names injected into std:: by the c_std headers. AC_CHECK_FUNCS(btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ @@ -1006,8 +1006,8 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ac_isoC99_wchar_t=no fi AC_MSG_RESULT($ac_isoC99_wchar_t) - - dnl Use iconv for wchar_t to char conversions. As such, check for + + dnl Use iconv for wchar_t to char conversions. As such, check for dnl X/Open Portability Guide, version 2 features (XPG2). AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no) AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no) @@ -1019,7 +1019,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \ ac_XPG2funcs=yes, ac_XPG2funcs=no) - + LIBS="$ac_save_LIBS" AC_MSG_CHECKING([for XPG2 wchar_t support]) @@ -1031,18 +1031,18 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ac_XPG2_wchar_t=no fi AC_MSG_RESULT($ac_XPG2_wchar_t) - + dnl At the moment, only enable wchar_t specializations if all the dnl above support is present. if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then AC_DEFINE(_GLIBCPP_USE_WCHAR_T) - enable_wchar_t=yes + enable_wchar_t=yes fi fi AC_MSG_CHECKING([for enabled wchar_t specializations]) - AC_MSG_RESULT($enable_wchar_t) - AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) + AC_MSG_RESULT($enable_wchar_t) + AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) ]) @@ -1186,15 +1186,15 @@ dnl dnl GLIBCPP_ENABLE_CLOCALE dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends -dnl +dnl dnl default is generic dnl AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_MSG_CHECKING([for clocale to use]) AC_ARG_ENABLE(clocale, - [ --enable-clocale enable model for target locale package. + [ --enable-clocale enable model for target locale package. --enable-clocale=MODEL use MODEL target-speific locale package. [default=generic] - ], + ], if test x$enable_clocale = xno; then enable_clocale=no fi, @@ -1209,7 +1209,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ xlinux* | xgnu*) AC_EGREP_CPP([_GLIBCPP_ok], [ #include - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) _GLIBCPP_ok #endif ], enable_clocale_flag=gnu, enable_clocale_flag=generic) @@ -1239,7 +1239,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ j = __strcoll_l(__one, __two, loc_dup); return 0; } - ], + ], [enable_clocale_flag=gnu],[enable_clocale_flag=generic], [enable_clocale_flag=generic]) fi @@ -1362,15 +1362,15 @@ dnl Check for which I/O library to use: libio, or something specific. dnl dnl GLIBCPP_ENABLE_CSTDIO dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends -dnl +dnl dnl default is stdio dnl AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ AC_MSG_CHECKING([for cstdio to use]) AC_ARG_ENABLE(cstdio, - [ --enable-cstdio enable stdio for target io package. + [ --enable-cstdio enable stdio for target io package. --enable-cstdio=LIB use LIB target-speific io package. [default=stdio] - ], + ], if test x$enable_cstdio = xno; then enable_cstdio=stdio fi, @@ -1390,7 +1390,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no) # Need to check and see what version of glibc is being used. If - # it's not glibc-2.2 or higher, then we'll need to go ahead and + # it's not glibc-2.2 or higher, then we'll need to go ahead and # compile most of libio for linux systems. if test x$has_libio = x"yes"; then case "$target" in @@ -1398,7 +1398,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ AC_MSG_CHECKING([for glibc version >= 2.2]) AC_EGREP_CPP([ok], [ #include - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) ok #endif ], glibc_satisfactory=yes, glibc_satisfactory=no) @@ -1408,11 +1408,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ # XXX at the moment, admit defeat and force the recompilation # XXX of glibc even on glibc-2.2 systems, because libio is not synched. - glibc_satisfactory=no + glibc_satisfactory=no if test x$glibc_satisfactory = x"yes"; then need_libio=no - need_wlibio=no + need_wlibio=no else need_libio=yes # bkoz XXX need to add checks to enable this @@ -1536,7 +1536,7 @@ void foo() bar(); } EOF - old_CXXFLAGS="$CXXFLAGS" + old_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-S if AC_TRY_EVAL(ac_compile); then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then @@ -1615,7 +1615,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl *) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;; esac], enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl - + AC_LANG_SAVE AC_LANG_CPLUSPLUS @@ -1674,8 +1674,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ac_c99_stdlib=yes; AC_MSG_CHECKING([for lldiv_t declaration]) AC_CACHE_VAL(ac_c99_lldiv_t, [ - AC_TRY_COMPILE([#include ], - [ lldiv_t mydivt;], + AC_TRY_COMPILE([#include ], + [ lldiv_t mydivt;], [ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no]) ]) AC_MSG_RESULT($ac_c99_lldiv_t) @@ -1690,19 +1690,19 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl AC_TRY_COMPILE([#include ], [atoll("10");],, [ac_c99_stdlib=no]) AC_TRY_COMPILE([#include ], [_Exit(0);],, [ac_c99_stdlib=no]) if test x"$ac_c99_lldiv_t" = x"no"; then - ac_c99_stdlib=no; - fi; + ac_c99_stdlib=no; + fi; AC_MSG_RESULT($ac_c99_stdlib) # Check for the existence of functions used if C99 is enabled. # XXX the wchar.h checks should be rolled into the general C99 bits. ac_c99_wchar=yes; AC_MSG_CHECKING([for additional ISO C99 support in ]) - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([#include ], [wcstold(L"10.0", NULL);],, [ac_c99_wchar=no]) - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([#include ], [wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no]) - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([#include ], [wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no]) AC_MSG_RESULT($ac_c99_wchar) @@ -1711,8 +1711,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl test x"$ac_c99_stdio" = x"no" || test x"$ac_c99_stdlib" = x"no" || test x"$ac_c99_wchar" = x"no"; then - enable_c99=no; - fi; + enable_c99=no; + fi; AC_MSG_RESULT($enable_c99) # Option parsed, now set things appropriately @@ -1789,13 +1789,13 @@ changequote(<<, >>)dnl << --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT], changequote([, ]) [case "$enableval" in - c) - enable_cheaders=c + c) + enable_cheaders=c ;; - c_std) - enable_cheaders=c_std + c_std) + enable_cheaders=c_std ;; - *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) + *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) ;; esac], enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT) @@ -1803,10 +1803,10 @@ changequote([, ]) dnl Option parsed, now set things appropriately case "$enable_cheaders" in - c_std) + c_std) C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std' ;; - c) + c) C_INCLUDE_DIR='${glibcpp_srcdir}/include/c' ;; esac @@ -1884,8 +1884,8 @@ dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's. dnl AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [ # Optimization flags that are probably a good idea for thrill-seekers. Just - # uncomment the lines below and make, everything else is ready to go... - # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc + # uncomment the lines below and make, everything else is ready to go... + # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc OPTIMIZE_CXXFLAGS= AC_SUBST(OPTIMIZE_CXXFLAGS) @@ -1961,7 +1961,7 @@ fi # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir # Install a library built with a cross compiler in tooldir, not libdir. -if test x"$glibcpp_toolexecdir" = x"no"; then +if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' @@ -2098,8 +2098,8 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [ AC_TRY_COMPILE([#include #include #include - ], - [ struct rlimit r; setrlimit(0, &r);], + ], + [ struct rlimit r; setrlimit(0, &r);], [ac_setrlimit=yes], [ac_setrlimit=no]) ]) fi @@ -2140,9 +2140,9 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ enable_abi_check=no else case "$host" in - *-*-cygwin*) + *-*-cygwin*) enable_abi_check=no ;; - *) + *) enable_abi_check=yes ;; esac fi @@ -2280,9 +2280,9 @@ changequote([, ])dnl enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl # If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we -# don't know enough about $LD to do tricks... -if test x$enable_shared = xno || - test "x$LD" = x || +# don't know enough about $LD to do tricks... +if test x$enable_shared = xno || + test "x$LD" = x || test x$glibcpp_gnu_ld_version = x; then enable_symvers=no fi @@ -2302,7 +2302,7 @@ fi glibcpp_min_gnu_ld_version=21200 # Check to see if unspecified "yes" value can win, given results -# above. +# above. if test $enable_symvers = yes ; then if test $with_gnu_ld = yes && test $glibcpp_shared_libgcc = yes ; @@ -2339,7 +2339,7 @@ case $enable_symvers in ;; gnu) SYMVER_MAP=config/linker-map.gnu - AC_DEFINE(_GLIBCPP_SYMVER) + AC_DEFINE(_GLIBCPP_SYMVER) ;; esac diff --git a/gnu/lib/libstdc++/ltcf-cxx.sh b/gnu/lib/libstdc++/ltcf-cxx.sh index 1b05b9b93..fc03a1ffb 100644 --- a/gnu/lib/libstdc++/ltcf-cxx.sh +++ b/gnu/lib/libstdc++/ltcf-cxx.sh @@ -532,10 +532,10 @@ case $host_os in if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' archive_cmds='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: - + # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. diff --git a/gnu/lib/libstdc++/ltconfig b/gnu/lib/libstdc++/ltconfig index c8a202329..e9ba0406c 100755 --- a/gnu/lib/libstdc++/ltconfig +++ b/gnu/lib/libstdc++/ltconfig @@ -151,7 +151,7 @@ else if test "$prev" != 'sed 50q "$0"'; then echo_test_string=`eval $prev` - + export echo_test_string exec "${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}}" "$0" ${1+"$@"} else @@ -915,7 +915,7 @@ if test "$with_gcc" = yes; then else no_builtin_flag=' -fno-builtin' fi - + fi # See if the linker supports building shared libraries. diff --git a/gnu/lib/libstdc++/ltmain.sh b/gnu/lib/libstdc++/ltmain.sh index 5d4281c54..372aa160a 100644 --- a/gnu/lib/libstdc++/ltmain.sh +++ b/gnu/lib/libstdc++/ltmain.sh @@ -646,7 +646,7 @@ EOF if test $status -ne 0 && test ! -d ${xdir}$objdir; then exit $status fi - fi + fi if test -z "$output_obj"; then # Place PIC objects in $objdir diff --git a/lib/libtls/tls_internal.h b/lib/libtls/tls_internal.h index af081a079..5cac88199 100644 --- a/lib/libtls/tls_internal.h +++ b/lib/libtls/tls_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_internal.h,v 1.82 2023/06/18 11:43:03 op Exp $ */ +/* $OpenBSD: tls_internal.h,v 1.83 2023/06/27 18:19:59 tb Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas * Copyright (c) 2014 Joel Sing @@ -29,7 +29,7 @@ __BEGIN_HIDDEN_DECLS #ifndef TLS_DEFAULT_CA_FILE -#define TLS_DEFAULT_CA_FILE "/etc/ssl/cert.pem" +#define TLS_DEFAULT_CA_FILE "/etc/ssl/cert.pem" #endif #define TLS_CIPHERS_DEFAULT "TLSv1.3:TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE" diff --git a/sys/net/if.c b/sys/net/if.c index 494b1b2d7..aa71a3d6f 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.700 2023/06/12 21:19:54 mvs Exp $ */ +/* $OpenBSD: if.c,v 1.701 2023/06/27 21:02:13 mvs Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -2784,7 +2784,7 @@ if_creategroup(const char *groupname) { struct ifg_group *ifg; - if ((ifg = malloc(sizeof(*ifg), M_TEMP, M_NOWAIT)) == NULL) + if ((ifg = malloc(sizeof(*ifg), M_IFGROUP, M_NOWAIT)) == NULL) return (NULL); strlcpy(ifg->ifg_group, groupname, sizeof(ifg->ifg_group)); @@ -2819,11 +2819,11 @@ if_addgroup(struct ifnet *ifp, const char *groupname) if (!strcmp(ifgl->ifgl_group->ifg_group, groupname)) return (EEXIST); - if ((ifgl = malloc(sizeof(*ifgl), M_TEMP, M_NOWAIT)) == NULL) + if ((ifgl = malloc(sizeof(*ifgl), M_IFGROUP, M_NOWAIT)) == NULL) return (ENOMEM); - if ((ifgm = malloc(sizeof(*ifgm), M_TEMP, M_NOWAIT)) == NULL) { - free(ifgl, M_TEMP, sizeof(*ifgl)); + if ((ifgm = malloc(sizeof(*ifgm), M_IFGROUP, M_NOWAIT)) == NULL) { + free(ifgl, M_IFGROUP, sizeof(*ifgl)); return (ENOMEM); } @@ -2834,8 +2834,8 @@ if_addgroup(struct ifnet *ifp, const char *groupname) if (ifg == NULL) { ifg = if_creategroup(groupname); if (ifg == NULL) { - free(ifgl, M_TEMP, sizeof(*ifgl)); - free(ifgm, M_TEMP, sizeof(*ifgm)); + free(ifgl, M_IFGROUP, sizeof(*ifgl)); + free(ifgm, M_IFGROUP, sizeof(*ifgm)); return (ENOMEM); } } else @@ -2878,7 +2878,7 @@ if_delgroup(struct ifnet *ifp, const char *groupname) if (ifgm != NULL) { TAILQ_REMOVE(&ifgl->ifgl_group->ifg_members, ifgm, ifgm_next); - free(ifgm, M_TEMP, sizeof(*ifgm)); + free(ifgm, M_IFGROUP, sizeof(*ifgm)); } #if NPF > 0 @@ -2891,10 +2891,10 @@ if_delgroup(struct ifnet *ifp, const char *groupname) #if NPF > 0 pfi_detach_ifgroup(ifgl->ifgl_group); #endif - free(ifgl->ifgl_group, M_TEMP, sizeof(*ifgl->ifgl_group)); + free(ifgl->ifgl_group, M_IFGROUP, sizeof(*ifgl->ifgl_group)); } - free(ifgl, M_TEMP, sizeof(*ifgl)); + free(ifgl, M_IFGROUP, sizeof(*ifgl)); return (0); } diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 36779cfdf..26e1fa07f 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.406 2023/06/26 07:49:48 claudio Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.408 2023/06/27 17:36:56 kn Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -2944,11 +2944,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) goto fail; } - NET_LOCK(); + NET_LOCK_SHARED(); PF_LOCK(); pfi_get_ifaces(io->pfiio_name, kif_buf, &io->pfiio_size); PF_UNLOCK(); - NET_UNLOCK(); + NET_UNLOCK_SHARED(); if (copyout(kif_buf, io->pfiio_buffer, sizeof(*kif_buf) * io->pfiio_size)) error = EFAULT; @@ -2964,11 +2964,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) goto fail; } - NET_LOCK(); PF_LOCK(); error = pfi_set_flags(io->pfiio_name, io->pfiio_flags); PF_UNLOCK(); - NET_UNLOCK(); break; } @@ -2980,11 +2978,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) goto fail; } - NET_LOCK(); PF_LOCK(); error = pfi_clear_flags(io->pfiio_name, io->pfiio_flags); PF_UNLOCK(); - NET_UNLOCK(); break; } diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 97bf9ff60..832fec21c 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.h,v 1.122 2022/02/03 17:18:22 guenther Exp $ */ +/* $OpenBSD: malloc.h,v 1.123 2023/06/27 21:02:13 mvs Exp $ */ /* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */ /* @@ -72,7 +72,7 @@ /* 7 - free */ /* 8 - free */ #define M_IFADDR 9 /* interface address */ -/* 10 - free */ +#define M_IFGROUP 10 /* interface group */ #define M_SYSCTL 11 /* sysctl buffers (persistent storage) */ #define M_COUNTERS 12 /* per CPU counters */ /* 13 - free */ @@ -190,7 +190,7 @@ NULL, \ NULL, \ "ifaddr", /* 9 M_IFADDR */ \ - NULL, \ + "ifgroup", /* 10 M_IFGROUP */ \ "sysctl", /* 11 M_SYSCTL */ \ "counters", /* 12 M_COUNTERS */ \ NULL, \