diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-05-12 14:39:52 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-05-12 14:39:52 +0200 |
| commit | 52ea13f2c135cdec424dc6a55346ec1250d54d2e (patch) | |
| tree | 1033e436c7254a80837566b283da2839ef79c67e /gcc | |
| parent | 6876e5bcd4e69cec6ef3507bb4ca64e22373b379 (diff) | |
| download | gcc-52ea13f2c135cdec424dc6a55346ec1250d54d2e.zip gcc-52ea13f2c135cdec424dc6a55346ec1250d54d2e.tar.gz gcc-52ea13f2c135cdec424dc6a55346ec1250d54d2e.tar.bz2 | |
[multiple changes]
2015-05-12 Thomas Quinot <quinot@adacore.com>
* g-sercom.ads, g-sercom-linux.adb (GNAT.Serial_Communications.
Data_Rate): New literals B75, B110, B150, B300, B600.
2015-05-12 Doug Rupp <rupp@adacore.com>
* init.c (__gnat_init_float) [vxworks]: For e500v2,
do nothing and leave the responsibility to install the handler
and enable the exceptions to the BSP.
From-SVN: r223062
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/ada/g-sercom-linux.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/g-sercom.ads | 12 | ||||
| -rw-r--r-- | gcc/ada/init.c | 7 |
4 files changed, 29 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7a90775..2912051 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,14 @@ +2015-05-12 Thomas Quinot <quinot@adacore.com> + + * g-sercom.ads, g-sercom-linux.adb (GNAT.Serial_Communications. + Data_Rate): New literals B75, B110, B150, B300, B600. + +2015-05-12 Doug Rupp <rupp@adacore.com> + + * init.c (__gnat_init_float) [vxworks]: For e500v2, + do nothing and leave the responsibility to install the handler + and enable the exceptions to the BSP. + 2015-05-12 Robert Dewar <dewar@adacore.com> * sem_ch9.adb, einfo.ads, exp_intr.adb: Minor reformatting. diff --git a/gcc/ada/g-sercom-linux.adb b/gcc/ada/g-sercom-linux.adb index 7a56382..f12d6ac 100644 --- a/gcc/ada/g-sercom-linux.adb +++ b/gcc/ada/g-sercom-linux.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2007-2013, AdaCore -- +-- Copyright (C) 2007-2015, AdaCore -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -58,7 +58,12 @@ package body GNAT.Serial_Communications is pragma Import (C, fcntl, "fcntl"); C_Data_Rate : constant array (Data_Rate) of unsigned := - (B1200 => OSC.B1200, + (B75 => OSC.B75, + B110 => OSC.B110, + B150 => OSC.B150, + B300 => OSC.B300, + B600 => OSC.B600, + B1200 => OSC.B1200, B2400 => OSC.B2400, B4800 => OSC.B4800, B9600 => OSC.B9600, diff --git a/gcc/ada/g-sercom.ads b/gcc/ada/g-sercom.ads index 18ee984..9987011 100644 --- a/gcc/ada/g-sercom.ads +++ b/gcc/ada/g-sercom.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 2007-2014, AdaCore -- +-- Copyright (C) 2007-2015, AdaCore -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -50,7 +50,8 @@ package GNAT.Serial_Communications is -- cases, an explicit port name can be passed directly to Open. type Data_Rate is - (B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200); + (B75, B110, B150, B300, B600, B1200, B2400, B4800, B9600, + B19200, B38400, B57600, B115200); -- Speed of the communication type Data_Bits is (CS8, CS7); @@ -122,7 +123,12 @@ private end record; Data_Rate_Value : constant array (Data_Rate) of Interfaces.C.unsigned := - (B1200 => 1_200, + (B75 => 75, + B110 => 110, + B150 => 150, + B300 => 300, + B600 => 600, + B1200 => 1_200, B2400 => 2_400, B4800 => 4_800, B9600 => 9_600, diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 7b8b870..3738b71 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -2017,11 +2017,8 @@ __gnat_init_float (void) #if defined (_ARCH_PPC) && !defined (_SOFT_FLOAT) && (!defined (VTHREADS) || defined (__VXWORKSMILS__)) #if defined (__SPE__) { - const unsigned long spefscr_mask = 0xfffffff3; - unsigned long spefscr; - asm ("mfspr %0, 512" : "=r" (spefscr)); - spefscr = spefscr & spefscr_mask; - asm ("mtspr 512, %0\n\tisync" : : "r" (spefscr)); + /* For e500v2, do nothing and leave the responsibility to install the + handler and enable the exceptions to the BSP. */ } #else asm ("mtfsb0 25"); |