From c2362cf43c5a3de9716b351a4496877c92409749 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sun, 6 Nov 2022 20:34:28 +0800 Subject: [PATCH] util: Test __PPC64__ for getting PIPE_ARCH_PPC_64 respond to __PPC64__ take effect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: e737a99a6fb ("Fix PPC detection on darwin") Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 7710cc8506be571ce83751c8f7afbe6fac256b36) --- .pick_status.json | 2 +- src/gallium/include/pipe/p_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c0225ba0f80..c17161c8101 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -130,7 +130,7 @@ "description": "util: Test __PPC64__ for getting PIPE_ARCH_PPC_64 respond to __PPC64__ take effect", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e737a99a6fbafe3ba4b5175eea25d1598dbeb9d8" }, diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index 26c6d6008a2..f35a7dc9f04 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -98,7 +98,7 @@ #endif #endif -#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) +#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__) || defined(__PPC64__) #define PIPE_ARCH_PPC #if defined(__ppc64__) || defined(__PPC64__) #define PIPE_ARCH_PPC_64