diff options
Diffstat (limited to 'erts/include/internal/ethread.h')
| -rw-r--r-- | erts/include/internal/ethread.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index a683ccee9b..460849ef2f 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2004-2021. All Rights Reserved. + * Copyright Ericsson AB 2004-2023. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,10 +95,12 @@ #endif ETHR_PROTO_NORETURN__ -ethr_assert_failed(const char *file, int line, const char *func, char *a); +ethr_assert_failed(const char *file, int line, const char *func, const char *a); #ifdef ETHR_DEBUG -#define ETHR_ASSERT(A) \ - ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__, #A))) +#define ETHR_ASSERT(A) \ + ((void) ((A) ? \ + ((void) 1) : \ + ethr_assert_failed(__FILE__, __LINE__, __func__, #A))) #else #define ETHR_ASSERT(A) ((void) 1) #endif @@ -312,6 +314,10 @@ ETHR_PROTO_NORETURN__ ethr_fatal_error__(const char *file, ETHR_X86_RUNTIME_CONF_HAVE_META(nonstop_tsc_s3) # define ETHR_X86_RUNTIME_CONF_HAVE_NO_NONSTOP_TSC_S3__ \ ETHR_X86_RUNTIME_CONF_HAVE_NO_META(nonstop_tsc_s3) +# define ETHR_X86_RUNTIME_CONF_HAVE_CPUID__ \ + ETHR_X86_RUNTIME_CONF_HAVE_META(cpuid) +# define ETHR_X86_RUNTIME_CONF_HAVE_NO_CPUID__ \ + ETHR_X86_RUNTIME_CONF_HAVE_NO_META(cpuid) #endif @@ -336,6 +342,7 @@ typedef struct { int have_tsc_reliable; int have_nonstop_tsc; int have_nonstop_tsc_s3; + int have_cpuid; #endif #if defined(ETHR_PPC_RUNTIME_CONF__) int have_lwsync; |