From 7e80976fdf3f0af87780f6490f39a1d500fc9886 Mon Sep 17 00:00:00 2001 From: Yuanfang Chen Date: Thu, 17 Mar 2022 10:12:28 -0700 Subject: [PATCH] [PS4] Make __BIGGEST_ALIGNMENT__ 32bytes So it matches `__STDCPP_DEFAULT_NEW_ALIGNMENT__`. Reviewed By: probinson, aaron.ballman Differential Revision: https://reviews.llvm.org/D118850 --- clang/include/clang/Basic/TargetInfo.h | 2 +- clang/lib/Basic/Targets/OSTargets.h | 1 + clang/test/Preprocessor/init.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index 94da7ac593a0..470d153d845d 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -101,10 +101,10 @@ struct TransferrableTargetInfo { unsigned char AccumScale; unsigned char LongAccumScale; - unsigned char SuitableAlign; unsigned char DefaultAlignForAttributeAligned; unsigned char MinGlobalAlign; + unsigned short SuitableAlign; unsigned short NewAlign; unsigned MaxVectorAlign; unsigned MaxTLSAlign; diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index f61652d285a8..9dd5debf1c47 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -570,6 +570,7 @@ public: case llvm::Triple::x86_64: this->MCountName = ".mcount"; this->NewAlign = 256; + this->SuitableAlign = 256; break; } } diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index 33354e8975fd..2d488159ea2c 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -1247,6 +1247,7 @@ // RUN: %clang_cc1 -E -dM -ffreestanding -fgnuc-version=4.2.1 -triple=x86_64-scei-ps4 < /dev/null | FileCheck -match-full-lines -check-prefix PS4 %s // // PS4:#define _LP64 1 +// PS4:#define __BIGGEST_ALIGNMENT__ 32 // PS4:#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ // PS4:#define __CHAR16_TYPE__ unsigned short // PS4:#define __CHAR32_TYPE__ unsigned int