From 556d1a44c8c7d5d72b0ee30146128013bde4f2af Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 26 May 2015 11:42:58 +0200 Subject: [PATCH] [multiple changes] 2015-05-26 Doug Rupp * init-vxsim.c (CPU): define as __VXSIM_CPU__ * sigtramp-vxworks-vxsim.c (CPU): Likewise. sigtramp-vxworks-target.inc: Add check for SIMLINUX. * sigtramp.h: Likewise. 2015-05-26 Robert Dewar * sem_aux.adb, sem_disp.adb, sem_util.ads: Add comment. * sem_util.adb: Minor reformatting From-SVN: r223675 --- gcc/ada/ChangeLog | 12 ++++++++++++ gcc/ada/init-vxsim.c | 7 +------ gcc/ada/sem_aux.adb | 1 + gcc/ada/sem_disp.adb | 3 +++ gcc/ada/sem_util.adb | 1 - gcc/ada/sem_util.ads | 2 +- gcc/ada/sigtramp-vxworks-target.inc | 2 +- gcc/ada/sigtramp-vxworks-vxsim.c | 7 +------ gcc/ada/sigtramp.h | 2 +- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 960a118..c6e49b6 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,15 @@ +2015-05-26 Doug Rupp + + * init-vxsim.c (CPU): define as __VXSIM_CPU__ + * sigtramp-vxworks-vxsim.c (CPU): Likewise. + sigtramp-vxworks-target.inc: Add check for SIMLINUX. + * sigtramp.h: Likewise. + +2015-05-26 Robert Dewar + + * sem_aux.adb, sem_disp.adb, sem_util.ads: Add comment. + * sem_util.adb: Minor reformatting + 2015-05-26 Yannick Moy * inline.adb (Has_Initialized_Type): Adapt to new names. diff --git a/gcc/ada/init-vxsim.c b/gcc/ada/init-vxsim.c index f3c05f1..9466dbc 100644 --- a/gcc/ada/init-vxsim.c +++ b/gcc/ada/init-vxsim.c @@ -34,12 +34,7 @@ structure is different for vxsim vs. real hardware. */ #undef CPU - -#ifndef __RTP__ -#define CPU SIMNT -#else -#define CPU SIMPENTIUM -#endif +#define CPU __VXSIM_CPU__ #include "vxWorks.h" #include "tconfig.h" diff --git a/gcc/ada/sem_aux.adb b/gcc/ada/sem_aux.adb index 63f74d9..97a6e1b 100644 --- a/gcc/ada/sem_aux.adb +++ b/gcc/ada/sem_aux.adb @@ -481,6 +481,7 @@ package body Sem_Aux is if Ekind (E) = E_String_Literal_Subtype then return String_Literal_Low_Bound (E); else + -- Why is this not Type_Low_Bound (E)??? return Low_Bound (Scalar_Range (E)); end if; end Get_Low_Bound; diff --git a/gcc/ada/sem_disp.adb b/gcc/ada/sem_disp.adb index 52eda74..1cbaef3 100644 --- a/gcc/ada/sem_disp.adb +++ b/gcc/ada/sem_disp.adb @@ -2243,6 +2243,9 @@ package body Sem_Disp is -- Is_Overriding_Subprogram -- ------------------------------ + -- Seems inefficient, build a whole list of subprograms to see if it + -- is non-empty??? + function Is_Overriding_Subprogram (E : Entity_Id) return Boolean is Inherited : constant Subprogram_List := Inherited_Subprograms (E); begin diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 99bf2ba..b2f6a57 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -5683,7 +5683,6 @@ package body Sem_Util is begin Encl_Unit := Enclosing_Comp_Unit_Node (N); - while Present (Encl_Unit) and then Nkind (Unit (Encl_Unit)) = N_Subunit loop diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 8394b10..f899e759 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -537,7 +537,7 @@ package Sem_Util is -- or indirectly (through a subunit) at the root of a subtree containing -- N. This may be either the same as Enclosing_Comp_Unit_Node, or if -- Enclosing_Comp_Unit_Node returns a subunit, then the corresponding - -- library unit. + -- library unit. If no such item is found, returns Empty??? function Enclosing_CPP_Parent (Typ : Entity_Id) return Entity_Id; -- Returns the closest ancestor of Typ that is a CPP type. diff --git a/gcc/ada/sigtramp-vxworks-target.inc b/gcc/ada/sigtramp-vxworks-target.inc index c89ece0..f31594d 100644 --- a/gcc/ada/sigtramp-vxworks-target.inc +++ b/gcc/ada/sigtramp-vxworks-target.inc @@ -314,7 +314,7 @@ TCR("ldmfd sp, {r"S(CFA_REG)", fp, sp, pc}") #elif defined (i386) -#if CPU == SIMNT || CPU == SIMPENTIUM +#if CPU == SIMNT || CPU == SIMPENTIUM || CPU == SIMLINUX #define COMMON_CFI(REG) \ ".cfi_offset " S(REGNO_##REG) "," S(REG_SET_##REG) #else diff --git a/gcc/ada/sigtramp-vxworks-vxsim.c b/gcc/ada/sigtramp-vxworks-vxsim.c index 7e9f2b8..918d9e5 100644 --- a/gcc/ada/sigtramp-vxworks-vxsim.c +++ b/gcc/ada/sigtramp-vxworks-vxsim.c @@ -34,12 +34,7 @@ ********************************************************/ #undef CPU - -#ifndef __RTP__ -#define CPU SIMNT -#else -#define CPU SIMPENTIUM -#endif +#define CPU __VXSIM_CPU__ #include "sigtramp.h" /* See sigtramp.h for a general explanation of functionality. */ diff --git a/gcc/ada/sigtramp.h b/gcc/ada/sigtramp.h index 2be20e5..bf872f5 100644 --- a/gcc/ada/sigtramp.h +++ b/gcc/ada/sigtramp.h @@ -62,7 +62,7 @@ typedef struct ucontext system headers so call it something unique. */ typedef void __sigtramphandler_t (int signo, void *siginfo, void *sigcontext); -#if CPU == SIMNT || CPU == SIMPENTIUM +#if CPU == SIMNT || CPU == SIMPENTIUM || CPU == SIMLINUX /* Vxsim requires a specially compiled handler. */ void __gnat_sigtramp_vxsim (int signo, void *siginfo, void *sigcontext, __sigtramphandler_t * handler); -- 2.7.4