Message ID | 20170403142327.GA29110@maggie |
---|---|
State | New |
Headers | show |
> On S/390 UNITS_PER_WORD is: > 8 with -m64 > 4 with -m31 > 8 with -m31 -mzarch > > This has been chosen to support use of 64 bit registers also in 32 bit > code. Code compiled with -m31 -mzarch is supposed to adhere to the 32 > bit ABI. In order to make that work it was required to prevent > UNITS_PER_WORD from being used in ABI-relevant contexts. That's why > Ulrich added the TARGET_UNWIND_WORD_MODE in 2008 (for SPU). We do that for 32-bit SPARC on Solaris (-mv8plus) but UNITS_PER_WORD is 4. > Now I could either fix this by reverting that change for S/390 > (similiar to what Andreas Schwab did to fix the BZ) or I could just > use the size of the long data type (as we do in the ABI-relevant parts > of the backend as well). Which one do you prefer? Having System.Word_Size != Standard'Word_Size is a bit disturbing. Does it work to change only Memory_Size to 2 ** Long_Integer'Size? This will also correct the definition of Address below.
diff --git a/gcc/ada/system-linux-s390.ads b/gcc/ada/system-linux-s390.ads index 485a8de..144c46d 100644 --- a/gcc/ada/system-linux-s390.ads +++ b/gcc/ada/system-linux-s390.ads @@ -69,7 +69,7 @@ package System is Null_Address : constant Address; Storage_Unit : constant := 8; - Word_Size : constant := Standard'Word_Size; + Word_Size : constant := Long_Integer'Size; Memory_Size : constant := 2 ** Word_Size; -- Address comparison