From 69a60bfc18e52eb3a61a80a84c36b90d6e7e9cd1 Mon Sep 17 00:00:00 2001 From: Vladislav Shchapov Date: Fri, 24 Jan 2025 01:45:26 +0500 Subject: [PATCH] Rename "arch/power/fallback_builtins.h" to avoid possible conflict with "fallback_builtins.h" in zlib-ng sources directory Signed-off-by: Vladislav Shchapov --- arch/power/crc32_power8.c | 4 +--- arch/power/{fallback_builtins.h => power_intrins.h} | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename arch/power/{fallback_builtins.h => power_intrins.h} (91%) 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 -- 2.47.2