Merge remote-tracking branch 'origin/develop' into powerFortranAIXMakefiles

ChipKerchner · ChipKerchner · commit 3ada8fbf8a62 · 2023-11-08T11:17:45.000-06:00
diff --git a/driver/others/dynamic_power.c b/driver/others/dynamic_power.c
@@ -202,6 +202,7 @@ static int cpuid(void)
 #ifndef __BUILTIN_CPU_SUPPORTS__
 #include <string.h>
 
+#if defined(_AIX) || (defined(__has_builtin) && !__has_builtin(__builtin_cpu_is))
 static int __builtin_cpu_is(const char *arg)
 {
     static int ipinfo = -1;
@@ -224,12 +225,15 @@ static int __builtin_cpu_is(const char *arg)
     }
     return 0;
 }
+#endif
 
+#if defined(_AIX) || (defined(__has_builtin) && !__has_builtin(__builtin_cpu_supports))
 static int __builtin_cpu_supports(const char *arg)
 {
     return 0;
 }
 #endif
+#endif
 
 static gotoblas_t *get_coretype(void) {
 

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ static int cpuid(void)`
`202`	`202`	`#ifndef __BUILTIN_CPU_SUPPORTS__`
`203`	`203`	`#include <string.h>`
`204`	`204`
	`205`	`+#if defined(_AIX) \|\| (defined(__has_builtin) && !__has_builtin(__builtin_cpu_is))`
`205`	`206`	`static int __builtin_cpu_is(const char *arg)`
`206`	`207`	`{`
`207`	`208`	`static int ipinfo = -1;`
`@@ -224,12 +225,15 @@ static int __builtin_cpu_is(const char *arg)`
`224`	`225`	`}`
`225`	`226`	`return 0;`
`226`	`227`	`}`
	`228`	`+#endif`
`227`	`229`
	`230`	`+#if defined(_AIX) \|\| (defined(__has_builtin) && !__has_builtin(__builtin_cpu_supports))`
`228`	`231`	`static int __builtin_cpu_supports(const char *arg)`
`229`	`232`	`{`
`230`	`233`	`return 0;`
`231`	`234`	`}`
`232`	`235`	`#endif`
	`236`	`+#endif`
`233`	`237`
`234`	`238`	`static gotoblas_t *get_coretype(void) {`
`235`	`239`