hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-25 01:55:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'freebsd/current/main' into hardened/current/master

Browse Source
This commit is contained in:
HardenedBSD Sync Services 2024-07-06 12:01:37 -06:00
commit 3dcb5cf67b
No known key found for this signature in database
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/release.sh
View File

@ -337,7 +337,7 @@ chroot_build_release() {
fi fi
if [ -z "${VMSIZE}" ]; then if [ -z "${VMSIZE}" ]; then
VMSIZE="$(eval chroot ${CHROOTDIR} \ VMSIZE="$(eval chroot ${CHROOTDIR} \
make -C /usr/src/release -V VMSIZE)" make -C /usr/src/release ${ARCH_FLAGS} -V VMSIZE)"
fi fi
RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \ RELEASE_RMAKEFLAGS="${RELEASE_RMAKEFLAGS} \
VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}" VMFORMATS=\"${VMFORMATS}\" VMSIZE=${VMSIZE}"

4
sys/dev/mps/mps_pci.c
View File

@ -122,8 +122,8 @@ struct mps_ident {
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS2208" }, 0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS2208" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_1, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_1,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS2308" }, 0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS2308" },
// Add Customer specific vender/subdevice id before generic // Add Customer specific vendor/subdevice id before generic
// (0xffff) vender/subdevice id. // (0xffff) vendor/subdevice id.
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2,
0x8086, 0x3516, 0, "Intel(R) Integrated RAID Module RMS25JB080" }, 0x8086, 0x3516, 0, "Intel(R) Integrated RAID Module RMS25JB080" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2,

38
sys/sys/cdefs.h
View File

@ -124,8 +124,6 @@
#define __STRING(x) #x /* stringify without expanding x */ #define __STRING(x) #x /* stringify without expanding x */
#define __XSTRING(x) __STRING(x) /* expand x, then stringify */ #define __XSTRING(x) __STRING(x) /* expand x, then stringify */
#define __const const /* define reserved names to standard */
#define __signed signed
#define __volatile volatile #define __volatile volatile
#if defined(__cplusplus) #if defined(__cplusplus)
#define __inline inline /* convert to C++ keyword */ #define __inline inline /* convert to C++ keyword */
@ -139,26 +137,10 @@
#define __P(protos) () /* traditional C preprocessor */ #define __P(protos) () /* traditional C preprocessor */
#define __CONCAT(x,y) x/**/y #define __CONCAT(x,y) x/**/y
#define __STRING(x) "x" #define __STRING(x) "x"
#if !defined(__CC_SUPPORTS___INLINE) #if !defined(__CC_SUPPORTS___INLINE)
#define __const /* delete pseudo-ANSI C keywords */ /* Just delete these in a K&R environment */
#define __inline #define __inline
#define __signed
#define __volatile #define __volatile
/*
* In non-ANSI C environments, new programs will want ANSI-only C keywords
* deleted from the program and old programs will want them left alone.
* When using a compiler other than gcc, programs using the ANSI C keywords
* const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
* When using "gcc -traditional", we assume that this is the intent; if
* __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
*/
#ifndef NO_ANSI_KEYWORDS
#define const /* delete ANSI C keywords */
#define inline
#define signed
#define volatile
#endif /* !NO_ANSI_KEYWORDS */
#endif /* !__CC_SUPPORTS___INLINE */ #endif /* !__CC_SUPPORTS___INLINE */
#endif /* !(__STDC__ || __cplusplus) */ #endif /* !(__STDC__ || __cplusplus) */
@ -356,9 +338,7 @@
/* /*
* Compiler-dependent macros to declare that functions take printf-like * Compiler-dependent macros to declare that functions take printf-like
* or scanf-like arguments. They are null except for versions of gcc * or scanf-like arguments.
* that are known to support the features properly (old versions of gcc-2
* didn't permit keeping the keywords out of the application namespace).
*/ */
#define __printflike(fmtarg, firstvararg) \ #define __printflike(fmtarg, firstvararg) \
__attribute__((__format__ (__printf__, fmtarg, firstvararg))) __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
@ -370,8 +350,18 @@
#define __strftimelike(fmtarg, firstvararg) \ #define __strftimelike(fmtarg, firstvararg) \
__attribute__((__format__ (__strftime__, fmtarg, firstvararg))) __attribute__((__format__ (__strftime__, fmtarg, firstvararg)))
#define __printf0like(fmtarg, firstvararg) \ /*
__attribute__((__format__ (__printf0__, fmtarg, firstvararg))) * Like __printflike, but allows fmtarg to be NULL. FreeBSD invented 'printf0'
* for this because older versions of gcc issued warnings for NULL first args.
* Clang has always had printf and printf0 as aliases. gcc 11.0 now follows
* clang. So now this is an alias for __printflike, or nothing. In the future
* _Nullable or _Nonnull will replace this.
*/
#if defined(__clang__) || __GNUC_PREREQ__(11, 0)
#define __printf0like(fmtarg, firstvararg) __printflike(fmtarg, firstvararg)
#else
#define __printf0like(fmtarg, firstvararg)
#endif
#define __strong_reference(sym,aliassym) \ #define __strong_reference(sym,aliassym) \
extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))