From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Thu, 23 Jan 2025 20:45:26 +0000 (+0500)
Subject: Rename "arch/power/fallback_builtins.h" to avoid possible conflict with "fallback_bui... 
X-Git-Tag: 2.2.4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69a60bfc18e52eb3a61a80a84c36b90d6e7e9cd1;p=thirdparty%2Fzlib-ng.git

Rename "arch/power/fallback_builtins.h" to avoid possible conflict with "fallback_builtins.h" in zlib-ng sources directory

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---

diff --git a/arch/power/crc32_power8.c b/arch/power/crc32_power8.c
index 1cb5f299..28c59b66 100644
--- a/arch/power/crc32_power8.c
+++ b/arch/power/crc32_power8.c
@@ -32,9 +32,7 @@
 #include "crc32_constants.h"
 #include "crc32_braid_tbl.h"
 
-#if defined (__clang__)
-#include "fallback_builtins.h"
-#endif
+#include "power_intrins.h"
 
 #define MAX_SIZE    32768
 #define VMX_ALIGN	16
diff --git a/arch/power/fallback_builtins.h b/arch/power/power_intrins.h
similarity index 91%
rename from arch/power/fallback_builtins.h
rename to arch/power/power_intrins.h
index ed958461..cf719865 100644
--- a/arch/power/fallback_builtins.h
+++ b/arch/power/power_intrins.h
@@ -9,9 +9,10 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#ifndef POWER_BUILTINS_H
-#define POWER_BUILTINS_H
+#ifndef POWER_INTRINS_H
+#define POWER_INTRINS_H
 
+#if defined (__clang__)
 /*
  * These stubs fix clang incompatibilities with GCC builtins.
  */
@@ -29,3 +30,5 @@ vec_ld(int __a, const __vector unsigned long long* __b) {
 }
 
 #endif
+
+#endif