From f5dac0d772d88d78496319189d9578be5c0f486e Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 20 May 2008 14:52:23 +0200 Subject: [PATCH] s-winext.ads: Replace representation clause by pragma Pack. * s-winext.ads: Replace representation clause by pragma Pack. Gives equivalent representation, but has the advantage of allowing compilation of this file under 64 bits platforms. * s-os_lib.adb (Normalize_Pathname): Mark Cur_Dir constant. * s-osinte-irix.ads: (Alternate_Stack_Size): Add dummy declaration. * adaint.c: Don't define dummy implementation of convert_addresses on ppc-linux. From-SVN: r135649 --- gcc/ada/adaint.c | 1 + gcc/ada/s-os_lib.adb | 2 +- gcc/ada/s-osinte-irix.ads | 7 +++++++ gcc/ada/s-winext.ads | 32 +------------------------------- 4 files changed, 10 insertions(+), 32 deletions(-) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 62e540c9448..391a424a094 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -2882,6 +2882,7 @@ _flush_cache() && defined (__SVR4)) \ && ! (defined (linux) && (defined (i386) || defined (__x86_64__))) \ && ! (defined (linux) && defined (__ia64__)) \ + && ! (defined (linux) && defined (powerpc)) \ && ! defined (__FreeBSD__) \ && ! defined (__hpux__) \ && ! defined (__APPLE__) \ diff --git a/gcc/ada/s-os_lib.adb b/gcc/ada/s-os_lib.adb index ff65720d6e4..f3e369cf853 100755 --- a/gcc/ada/s-os_lib.adb +++ b/gcc/ada/s-os_lib.adb @@ -1896,7 +1896,7 @@ package body System.OS_Lib is and then Path_Buffer (2) /= Directory_Separator then declare - Cur_Dir : String := Get_Directory (""); + Cur_Dir : constant String := Get_Directory (""); -- Get the current directory to get the drive letter begin diff --git a/gcc/ada/s-osinte-irix.ads b/gcc/ada/s-osinte-irix.ads index 15bd4007225..01b01b54222 100644 --- a/gcc/ada/s-osinte-irix.ads +++ b/gcc/ada/s-osinte-irix.ads @@ -261,6 +261,13 @@ package System.OS_Interface is PTHREAD_CREATE_DETACHED : constant := 1; + ----------- + -- Stack -- + ----------- + + Alternate_Stack_Size : constant := 0; + -- No alternate signal stack is used on this platform + --------------------------------------- -- Nonstandard Thread Initialization -- --------------------------------------- diff --git a/gcc/ada/s-winext.ads b/gcc/ada/s-winext.ads index a0091ff74d3..e00ae7bdd17 100644 --- a/gcc/ada/s-winext.ads +++ b/gcc/ada/s-winext.ads @@ -98,37 +98,7 @@ package System.Win32.Ext is wReserved1 : WORD; end record; pragma Convention (C, DCB); - - for DCB use record - DCBLENGTH at 0 range 0 .. 31; - BaudRate at 4 range 0 .. 31; - fBinary at 8 range 0 .. 0; - fParity at 8 range 1 .. 1; - fOutxCtsFlow at 8 range 2 .. 2; - fOutxDsrFlow at 8 range 3 .. 3; - fDtrControl at 8 range 4 .. 5; - fDsrSensitivity at 8 range 6 .. 6; - fTXContinueOnXoff at 8 range 7 .. 7; - fOutX at 9 range 0 .. 0; - fInX at 9 range 1 .. 1; - fErrorChar at 9 range 2 .. 2; - fNull at 9 range 3 .. 3; - fRtsControl at 9 range 4 .. 5; - fAbortOnError at 9 range 6 .. 6; - fDummy2 at 9 range 7 .. 23; - wReserved at 12 range 0 .. 15; - XonLim at 14 range 0 .. 15; - XoffLim at 16 range 0 .. 15; - ByteSize at 18 range 0 .. 7; - Parity at 19 range 0 .. 7; - StopBits at 20 range 0 .. 7; - XonChar at 21 range 0 .. 7; - XoffChar at 22 range 0 .. 7; - ErrorChar at 23 range 0 .. 7; - EofChar at 24 range 0 .. 7; - EvtChar at 25 range 0 .. 7; - wReserved1 at 26 range 0 .. 15; - end record; + pragma Pack (DCB); type COMMTIMEOUTS is record ReadIntervalTimeout : DWORD; -- 2.30.2