From patchwork Fri Sep 12 02:07:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten ter Huurne X-Patchwork-Id: 388465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 1C0C614007B for ; Fri, 12 Sep 2014 12:07:40 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5D930A1A68; Fri, 12 Sep 2014 02:07:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kqPSULCOOgZH; Fri, 12 Sep 2014 02:07:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9275CA1A94; Fri, 12 Sep 2014 02:07:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BFB1B1C1E6B for ; Fri, 12 Sep 2014 02:07:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B5D1291D4C for ; Fri, 12 Sep 2014 02:07:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1yVLqPq9BT7M for ; Fri, 12 Sep 2014 02:07:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id 56E7191D3D for ; Fri, 12 Sep 2014 02:07:35 +0000 (UTC) Received: from mfilter34-d.gandi.net (mfilter34-d.gandi.net [217.70.178.165]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id DDC3E17208C; Fri, 12 Sep 2014 04:07:33 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter34-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter34-d.gandi.net (mfilter34-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id GxkS1Tsgt97K; Fri, 12 Sep 2014 04:07:32 +0200 (CEST) X-Originating-IP: 88.159.34.112 Received: from starbug-2.treewalker.org (unknown [88.159.34.112]) (Authenticated sender: relay@treewalker.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 4BDD817208B; Fri, 12 Sep 2014 04:07:32 +0200 (CEST) Received: from hyperion.trinair2002 (hyperion.trinair2002 [192.168.0.43]) by starbug-2.treewalker.org (Postfix) with ESMTP id D030631876; Fri, 12 Sep 2014 04:07:31 +0200 (CEST) From: Maarten ter Huurne To: buildroot@busybox.net Date: Fri, 12 Sep 2014 04:07:29 +0200 Message-Id: <1410487649-1365-1-git-send-email-maarten@treewalker.org> X-Mailer: git-send-email 1.8.4.5 Subject: [Buildroot] [PATCH] musl: Add post-1.1.4 commit to provide max_align_t X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Without this, including libstdc++'s fails. Signed-off-by: Maarten ter Huurne --- package/musl/musl-0001-add-max_align_t.patch | 153 +++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 package/musl/musl-0001-add-max_align_t.patch diff --git a/package/musl/musl-0001-add-max_align_t.patch b/package/musl/musl-0001-add-max_align_t.patch new file mode 100644 index 0000000..6423337 --- /dev/null +++ b/package/musl/musl-0001-add-max_align_t.patch @@ -0,0 +1,153 @@ +From 321f4fa9067185aa6bb47403dfba46e8cfe917d3 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Wed, 20 Aug 2014 21:20:14 +0000 +Subject: add max_align_t definition for C11 and C++11 + +unfortunately this needs to be able to vary by arch, because of a huge +mess GCC made: the GCC definition, which became the ABI, depends on +quirks in GCC's definition of __alignof__, which does not match the +formal alignment of the type. + +GCC's __alignof__ unexpectedly exposes the an implementation detail, +its "preferred alignment" for the type, rather than the formal/ABI +alignment of the type, which it only actually uses in structures. on +most archs the two values are the same, but on some (at least i386) +the preferred alignment is greater than the ABI alignment. + +I considered using _Alignas(8) unconditionally, but on at least one +arch (or1k), the alignment of max_align_t with GCC's definition is +only 4 (even the "preferred alignment" for these types is only 4). +--- +diff --git a/arch/arm/bits/alltypes.h.in b/arch/arm/bits/alltypes.h.in +index 0d750cc..183c4c4 100644 +--- a/arch/arm/bits/alltypes.h.in ++++ b/arch/arm/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/i386/bits/alltypes.h.in b/arch/i386/bits/alltypes.h.in +index 502c882..8ba8f6f 100644 +--- a/arch/i386/bits/alltypes.h.in ++++ b/arch/i386/bits/alltypes.h.in +@@ -27,6 +27,8 @@ TYPEDEF long double float_t; + TYPEDEF long double double_t; + #endif + ++TYPEDEF struct { _Alignas(8) long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/microblaze/bits/alltypes.h.in b/arch/microblaze/bits/alltypes.h.in +index 4657d14..a03e1b8 100644 +--- a/arch/microblaze/bits/alltypes.h.in ++++ b/arch/microblaze/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/mips/bits/alltypes.h.in b/arch/mips/bits/alltypes.h.in +index 4657d14..a03e1b8 100644 +--- a/arch/mips/bits/alltypes.h.in ++++ b/arch/mips/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/or1k/bits/alltypes.h.in b/arch/or1k/bits/alltypes.h.in +index 0d750cc..183c4c4 100644 +--- a/arch/or1k/bits/alltypes.h.in ++++ b/arch/or1k/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/powerpc/bits/alltypes.h.in b/arch/powerpc/bits/alltypes.h.in +index 378124c..ee7f137 100644 +--- a/arch/powerpc/bits/alltypes.h.in ++++ b/arch/powerpc/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/sh/bits/alltypes.h.in b/arch/sh/bits/alltypes.h.in +index 378124c..ee7f137 100644 +--- a/arch/sh/bits/alltypes.h.in ++++ b/arch/sh/bits/alltypes.h.in +@@ -13,6 +13,8 @@ TYPEDEF unsigned wint_t; + TYPEDEF float float_t; + TYPEDEF double double_t; + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/arch/x32/bits/alltypes.h.in b/arch/x32/bits/alltypes.h.in +index 8930efa..8e396c9 100644 +--- a/arch/x32/bits/alltypes.h.in ++++ b/arch/x32/bits/alltypes.h.in +@@ -18,6 +18,8 @@ TYPEDEF float float_t; + TYPEDEF double double_t; + #endif + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long long time_t; + TYPEDEF long long suseconds_t; + +diff --git a/arch/x86_64/bits/alltypes.h.in b/arch/x86_64/bits/alltypes.h.in +index 34b7d6a..7b4f3e7 100644 +--- a/arch/x86_64/bits/alltypes.h.in ++++ b/arch/x86_64/bits/alltypes.h.in +@@ -18,6 +18,8 @@ TYPEDEF float float_t; + TYPEDEF double double_t; + #endif + ++TYPEDEF struct { long long __ll; long double __ld; } max_align_t; ++ + TYPEDEF long time_t; + TYPEDEF long suseconds_t; + +diff --git a/include/stddef.h b/include/stddef.h +index 0a32919..bd75385 100644 +--- a/include/stddef.h ++++ b/include/stddef.h +@@ -10,6 +10,9 @@ + #define __NEED_ptrdiff_t + #define __NEED_size_t + #define __NEED_wchar_t ++#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L ++#define __NEED_max_align_t ++#endif + + #include + +-- +cgit v0.9.0.3-65-g4555