From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2419 invoked from network); 11 Jan 2022 00:25:43 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 11 Jan 2022 00:25:43 -0000 Received: (qmail 9408 invoked by uid 550); 11 Jan 2022 00:25:40 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 9376 invoked from network); 11 Jan 2022 00:25:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641860728; bh=c2gmS1mwVBLCEeVbDTioUQiNSPFqinxNkutID6/rKE4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=eu712jGvQ+/ovKGDEKGAJXq3WzWT+ADfEIzueNxgc5pPKLil14FS25aTx/6/KHpFO FajvPAK2FAGmD7aTX+xSNjOPhk47i4znpp/epHo4HRZzkw6xTNUAHz3Z64fmbwG5YZ +i3/8ZPpyOLR7XULa0f1AShOiORt5UKCEyUi8q5ReENbgkIEHZqaN3zBl4Q0a+Uru2 DqJDMnZSxXX2vg3Mq8M8odMTCbirDeHHeKOwuN/2ajaOm3iuHK8B6WKaXGA7tlCDd5 3V4NtM71LW3wu13n97Zs5FuO2r0rErVuc9b1EVLNJKsz524e4am+CqY2lSzunAW/cM 0/GZTsdgQmicA== From: Heinrich Schuchardt To: musl@lists.openwall.com Cc: =?UTF-8?q?Milan=20P=20=2E=20Stani=C4=87?= , Heinrich Schuchardt Date: Tue, 11 Jan 2022 01:25:18 +0100 Message-Id: <20220111002518.178068-1-heinrich.schuchardt@canonical.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH 1/1] honor __WCHAR_TYPE__ on x86_64, arm, arm64, riscv64 Some programs like U-Boot are compiled with GCC option -fshort-wchar. In this case wchar_t must be a 16 bit type. Signed-off-by: Heinrich Schuchardt --- arch/aarch64/bits/alltypes.h.in | 5 +++++ arch/arm/bits/alltypes.h.in | 4 ++++ arch/riscv64/bits/alltypes.h.in | 4 ++++ arch/x86_64/bits/alltypes.h.in | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/arch/aarch64/bits/alltypes.h.in b/arch/aarch64/bits/alltypes.h.in index c547ca0b..c0263348 100644 --- a/arch/aarch64/bits/alltypes.h.in +++ b/arch/aarch64/bits/alltypes.h.in @@ -11,8 +11,13 @@ #define __LONG_MAX 0x7fffffffffffffffL #ifndef __cplusplus +#ifdef __WCHAR_TYPE__ +TYPEDEF __WCHAR_TYPE__ wchar_t; +#else TYPEDEF unsigned wchar_t; #endif +#endif + TYPEDEF unsigned wint_t; TYPEDEF int blksize_t; diff --git a/arch/arm/bits/alltypes.h.in b/arch/arm/bits/alltypes.h.in index d62bd7bd..9596466b 100644 --- a/arch/arm/bits/alltypes.h.in +++ b/arch/arm/bits/alltypes.h.in @@ -12,8 +12,12 @@ #define __LONG_MAX 0x7fffffffL #ifndef __cplusplus +#ifdef __WCHAR_TYPE__ +TYPEDEF __WCHAR_TYPE__ wchar_t; +#else TYPEDEF unsigned wchar_t; #endif +#endif TYPEDEF float float_t; TYPEDEF double double_t; diff --git a/arch/riscv64/bits/alltypes.h.in b/arch/riscv64/bits/alltypes.h.in index 4579d174..f8f8b7e5 100644 --- a/arch/riscv64/bits/alltypes.h.in +++ b/arch/riscv64/bits/alltypes.h.in @@ -6,8 +6,12 @@ #define __LONG_MAX 0x7fffffffffffffffL #ifndef __cplusplus +#ifdef __WCHAR_TYPE__ +TYPEDEF __WCHAR_TYPE__ wchar_t; +#else TYPEDEF int wchar_t; #endif +#endif TYPEDEF int blksize_t; TYPEDEF unsigned int nlink_t; diff --git a/arch/x86_64/bits/alltypes.h.in b/arch/x86_64/bits/alltypes.h.in index 5cd8a299..748ff632 100644 --- a/arch/x86_64/bits/alltypes.h.in +++ b/arch/x86_64/bits/alltypes.h.in @@ -6,8 +6,12 @@ #define __LONG_MAX 0x7fffffffffffffffL #ifndef __cplusplus +#ifdef __WCHAR_TYPE__ +TYPEDEF __WCHAR_TYPE__ wchar_t; +#else TYPEDEF int wchar_t; #endif +#endif #if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2 TYPEDEF long double float_t; -- 2.33.1