From 92817a6ad7beb7c4565a8c6d51fde04f47f47dd3 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Tue, 21 May 2013 19:18:11 +0100
Subject: [PATCH] Allow platforms to specify size of long double; seperate
 alignment from size.

--HG--
branch : dtrg-videocore
---
 lib/descr/fe        |  2 +-
 plat/cpm/descr      |  8 ++++++++
 plat/linux386/descr | 14 +++++++++++---
 plat/linux68k/descr | 14 +++++++++++---
 plat/linuxppc/descr | 14 +++++++++++---
 plat/pc86/descr     |  8 ++++++++
 plat/rpi/descr      | 16 ++++++++++++----
 7 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/lib/descr/fe b/lib/descr/fe
index a8d610362..4e85c64b3 100644
--- a/lib/descr/fe
+++ b/lib/descr/fe
@@ -84,7 +84,7 @@ name cem
 		-DEM_SSIZE={s} -DEM_LSIZE={l} -DEM_FSIZE={f} -DEM_DSIZE={d}) \
 		-D_EM_WSIZE={w} -D_EM_PSIZE={p} \
 		-D_EM_SSIZE={s} -D_EM_LSIZE={l} -D_EM_FSIZE={f} -D_EM_DSIZE={d} \
-		-Vw{w}.{w}i{w}.{w}p{p}.{w}f{f}.{w}s{s}.{s}l{l}.{w}d{d}.{w} \
+		-Vw{w}.{wa}i{w}.{wa}p{p}.{pa}f{f}.{fa}s{s}.{sa}l{l}.{la}d{d}.{da}x{x}.{xa} \
 		{CC_ALIGN?} \
 		{CEM_F?} {LFLAG?} < >
 	callname acc
diff --git a/plat/cpm/descr b/plat/cpm/descr
index a72f50276..2d626295a 100644
--- a/plat/cpm/descr
+++ b/plat/cpm/descr
@@ -3,11 +3,19 @@
 # $Revision$
 
 var w=2
+var wa=1
 var p=2
+var pa=1
 var s=2
+var sa=1
 var l=4
+var la=1
 var f=4
+var fa=1
 var d=8
+var da=1
+var x=8
+var xa=1
 var ARCH=i80
 var PLATFORM=cpm
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
diff --git a/plat/linux386/descr b/plat/linux386/descr
index ff2b26dfb..3bdd9d768 100644
--- a/plat/linux386/descr
+++ b/plat/linux386/descr
@@ -3,11 +3,19 @@
 # $Revision$
 
 var w=4
-var p=4
+var wa=4
+var p={w}
+var pa={w}
 var s=2
-var l=4
-var f=4
+var sa={s}
+var l={w}
+var la={w}
+var f={w}
+var fa={w}
 var d=8
+var da={d}
+var x=8
+var xa={x}
 var ARCH=i386
 var PLATFORM=linux386
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
diff --git a/plat/linux68k/descr b/plat/linux68k/descr
index 14f973d52..997ec7154 100644
--- a/plat/linux68k/descr
+++ b/plat/linux68k/descr
@@ -3,11 +3,19 @@
 # $Revision: 1.1 $
 
 var w=4
-var p=4
+var wa=4
+var p={w}
+var pa={w}
 var s=2
-var l=4
-var f=4
+var sa={s}
+var l={w}
+var la={w}
+var f={w}
+var fa={w}
 var d=8
+var da={d}
+var x=8
+var xa={x}
 var ARCH=m68020
 var PLATFORM=linux68k
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
diff --git a/plat/linuxppc/descr b/plat/linuxppc/descr
index 3311f24c6..69b00fbc5 100644
--- a/plat/linuxppc/descr
+++ b/plat/linuxppc/descr
@@ -3,11 +3,19 @@
 # $Revision: 1.1 $
 
 var w=4
-var p=4
+var wa=4
+var p={w}
+var pa={w}
 var s=2
-var l=4
-var f=4
+var sa={s}
+var l={w}
+var la={w}
+var f={w}
+var fa={w}
 var d=8
+var da={d}
+var x=8
+var xa={x}
 var ARCH=powerpc
 var PLATFORM=linuxppc
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
diff --git a/plat/pc86/descr b/plat/pc86/descr
index a3f11fc4f..c282e9cc7 100644
--- a/plat/pc86/descr
+++ b/plat/pc86/descr
@@ -3,11 +3,19 @@
 # $Revision$
 
 var w=2
+var wa=1
 var p=2
+var pa=1
 var s=2
+var sa=1
 var l=4
+var la=1
 var f=4
+var fa=1
 var d=8
+var da=1
+var x=8
+var xa=1
 var ARCH=i86
 var PLATFORM=pc86
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
diff --git a/plat/rpi/descr b/plat/rpi/descr
index 23862840d..6daff9606 100644
--- a/plat/rpi/descr
+++ b/plat/rpi/descr
@@ -3,11 +3,19 @@
 # $Revision$
 
 var w=4
-var p=4
+var wa=4
+var p={w}
+var pa={w}
 var s=2
-var l=4
-var f=4
-var d=4
+var sa={s}
+var l={w}
+var la={w}
+var f={w}
+var fa={w}
+var d={w}
+var da={w}
+var x={w}
+var xa={w}
 var ARCH=vc4
 var PLATFORM=rpi
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}