Skip to content

Commit 7baeaff

Browse files
aperezdcSkCQ
authored andcommitted
Avoid usage of the clang::musttail attribute on ppc64le
Use of clang::musttail attribute is not supported by Clang on ppc64le and needs avoided be removed in Skia. For more information, see: - llvm/llvm-project#93267 - llvm/llvm-project#98859 - llvm/llvm-project#108014 Based on a patch originally by Dan Horák. Change-Id: Ib81146f375f9d00b0b364d9b5fd1c56a165e6d55 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/910216 Auto-Submit: Adrian Perez de Castro <[email protected]> Commit-Queue: Michael Ludwig <[email protected]> Reviewed-by: Florin Malita <[email protected]> Reviewed-by: Michael Ludwig <[email protected]>
1 parent 539ab9d commit 7baeaff

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

include/private/base/SkFeatures.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
#define SK_CPU_LOONGARCH 1
7070
#endif
7171

72+
#if defined(__powerpc__) || defined (__powerpc64__)
73+
#define SK_CPU_PPC 1
74+
#endif
75+
7276
/**
7377
* SK_CPU_SSE_LEVEL
7478
*

src/core/SkRasterPipeline.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ struct SkImageInfo;
2727
struct skcms_TransferFunction;
2828

2929
#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && \
30-
!defined(SK_CPU_LOONGARCH) && !(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK))
30+
!defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC) && \
31+
!(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK))
3132
// [[clang::musttail]] is disabled for the Android version of Skia running on Windows as it
3233
// causes crashes (This is probably related to http://crbug.com/1505442).
3334
#define SK_HAS_MUSTTAIL 1

0 commit comments

Comments
 (0)