The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5ab33279ad2a5283fb11f8411b53093dfc1c41c6
commit 5ab33279ad2a5283fb11f8411b53093dfc1c41c6 Author: John Baldwin <j...@freebsd.org> AuthorDate: 2022-04-12 17:05:50 +0000 Commit: John Baldwin <j...@freebsd.org> CommitDate: 2022-04-12 17:05:50 +0000 Remove checks for __GNUCLIKE___TYPEOF assuming it is always true. All supported compilers (modern versions of GCC and clang) support this. PR: 263102 (exp-run) Reviewed by: brooks, imp, emaste Differential Revision: https://reviews.freebsd.org/D34798 --- sys/amd64/include/pcpu.h | 8 -------- sys/i386/include/pcpu.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h index ad2b6216ed47..fa44b048cbe3 100644 --- a/sys/amd64/include/pcpu.h +++ b/sys/amd64/include/pcpu.h @@ -109,8 +109,6 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line"); #define MONITOR_STOPSTATE_RUNNING 0 #define MONITOR_STOPSTATE_STOPPED 1 -#if defined(__GNUCLIKE___TYPEOF) - /* * Evaluates to the byte offset of the per-cpu variable name. */ @@ -277,12 +275,6 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line"); } \ } while (0); -#else /* !__GNUCLIKE___TYPEOF */ - -#error "this file needs to be ported to your compiler" - -#endif /* __GNUCLIKE___TYPEOF */ - #endif /* _KERNEL */ #endif /* !_MACHINE_PCPU_H_ */ diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h index c4099f04ded1..8fbcb2032337 100644 --- a/sys/i386/include/pcpu.h +++ b/sys/i386/include/pcpu.h @@ -99,8 +99,6 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line"); #define MONITOR_STOPSTATE_RUNNING 0 #define MONITOR_STOPSTATE_STOPPED 1 -#if defined(__GNUCLIKE___TYPEOF) - /* * Evaluates to the byte offset of the per-cpu variable name. */ @@ -206,12 +204,6 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line"); #define IS_BSP() (PCPU_GET(cpuid) == 0) -#else /* defined(__GNUCLIKE___TYPEOF) */ - -#error "this file needs to be ported to your compiler" - -#endif /* __GNUCLIKE___TYPEOF */ - #endif /* _KERNEL */ #endif /* !_MACHINE_PCPU_H_ */