From 01f0729a1fe9aa0907652c35b00d46ae5f239b17 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 4 Aug 2011 09:54:54 +0200 Subject: [PATCH] [multiple changes] 2011-08-04 Eric Botcazou * sem_elab.adb (Check_Internal_Call_Continue): Change the type of the elaboration counter to Standard_Short_Integer. * sem_util.adb (Build_Elaboration_Entity): Likewise. * bindgen.adb (Gen_Elab_Externals_Ada): Adjust to above change. (Gen_Elab_Externals_C): Likewise. 2011-08-04 Ed Falis * system-vxworks-arm.ads, system-vxworks-sparcv9.ads, system-vxworks-ppc.ads, system-vxworks-m68k.ads, system-vxworks-mips.ads, system-vxworks-x86.ads (Always_Compatible_Rep): set to False for all VxWorks targets. From-SVN: r177321 --- gcc/ada/ChangeLog | 15 +++++++++++++++ gcc/ada/bindgen.adb | 6 +++--- gcc/ada/sem_elab.adb | 2 +- gcc/ada/sem_util.adb | 8 +++++--- gcc/ada/system-vxworks-arm.ads | 4 ++-- gcc/ada/system-vxworks-m68k.ads | 4 ++-- gcc/ada/system-vxworks-mips.ads | 4 ++-- gcc/ada/system-vxworks-ppc.ads | 4 ++-- gcc/ada/system-vxworks-sparcv9.ads | 4 ++-- gcc/ada/system-vxworks-x86.ads | 4 ++-- 10 files changed, 36 insertions(+), 19 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fa4fbdb6c4a..66df48b0c9a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,18 @@ +2011-08-04 Eric Botcazou + + * sem_elab.adb (Check_Internal_Call_Continue): Change the type of the + elaboration counter to Standard_Short_Integer. + * sem_util.adb (Build_Elaboration_Entity): Likewise. + * bindgen.adb (Gen_Elab_Externals_Ada): Adjust to above change. + (Gen_Elab_Externals_C): Likewise. + +2011-08-04 Ed Falis + + * system-vxworks-arm.ads, system-vxworks-sparcv9.ads, + system-vxworks-ppc.ads, system-vxworks-m68k.ads, + system-vxworks-mips.ads, system-vxworks-x86.ads + (Always_Compatible_Rep): set to False for all VxWorks targets. + 2011-08-04 Robert Dewar * par_sco.adb, prj-proc.adb, make.adb, bindgen.adb, prj.adb, prj.ads, diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index 53abc17c04c..1eab63c5de3 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -1241,9 +1241,9 @@ package body Bindgen is case VM_Target is when No_VM | JVM_Target => - Set_String (" : Integer; pragma Import (Ada, "); + Set_String (" : Short_Integer; pragma Import (Ada, "); when CLI_Target => - Set_String (" : Integer; pragma Import (CIL, "); + Set_String (" : Short_Integer; pragma Import (CIL, "); end case; Set_String ("E"); @@ -1320,7 +1320,7 @@ package body Bindgen is (No_Run_Time_Mode and then Is_Predefined_File_Name (U.Sfile)) then - Set_String ("extern int "); + Set_String ("extern short int "); Get_Name_String (U.Uname); Set_Unit_Name; Set_String ("_E;"); diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb index d5d4ac3256d..f96fbb950a1 100644 --- a/gcc/ada/sem_elab.adb +++ b/gcc/ada/sem_elab.adb @@ -2158,7 +2158,7 @@ package body Sem_Elab is Make_Object_Declaration (Loce, Defining_Identifier => Ent, Object_Definition => - New_Occurrence_Of (Standard_Integer, Loce), + New_Occurrence_Of (Standard_Short_Integer, Loce), Expression => Make_Integer_Literal (Loc, Uint_0))); diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9948a61c3d2..07ada79096e 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -954,7 +954,7 @@ package body Sem_Util is Name_Buffer (Name_Len + 2) := 'E'; Name_Len := Name_Len + 2; - -- Create elaboration flag + -- Create elaboration counter Elab_Ent := Make_Defining_Identifier (Loc, Chars => Name_Find); Set_Elaboration_Entity (Spec_Id, Elab_Ent); @@ -962,8 +962,10 @@ package body Sem_Util is Decl := Make_Object_Declaration (Loc, Defining_Identifier => Elab_Ent, - Object_Definition => New_Occurrence_Of (Standard_Integer, Loc), - Expression => Make_Integer_Literal (Loc, Uint_0)); + Object_Definition => + New_Occurrence_Of (Standard_Short_Integer, Loc), + Expression => + Make_Integer_Literal (Loc, Uint_0)); Push_Scope (Standard_Standard); Add_Global_Declaration (Decl); diff --git a/gcc/ada/system-vxworks-arm.ads b/gcc/ada/system-vxworks-arm.ads index 2c144afb6cd..7990959199d 100644 --- a/gcc/ada/system-vxworks-arm.ads +++ b/gcc/ada/system-vxworks-arm.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks Version ARM) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -149,7 +149,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; diff --git a/gcc/ada/system-vxworks-m68k.ads b/gcc/ada/system-vxworks-m68k.ads index 83bb9656b94..2e3cb20e009 100644 --- a/gcc/ada/system-vxworks-m68k.ads +++ b/gcc/ada/system-vxworks-m68k.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks version M68K) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -149,7 +149,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; diff --git a/gcc/ada/system-vxworks-mips.ads b/gcc/ada/system-vxworks-mips.ads index 035e542cbaf..2741068361d 100644 --- a/gcc/ada/system-vxworks-mips.ads +++ b/gcc/ada/system-vxworks-mips.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks Version Mips) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -149,7 +149,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; diff --git a/gcc/ada/system-vxworks-ppc.ads b/gcc/ada/system-vxworks-ppc.ads index 38a9def0f6e..c5c55145661 100644 --- a/gcc/ada/system-vxworks-ppc.ads +++ b/gcc/ada/system-vxworks-ppc.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks 5 and MILS Version PPC) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -149,7 +149,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; diff --git a/gcc/ada/system-vxworks-sparcv9.ads b/gcc/ada/system-vxworks-sparcv9.ads index 5d15daa50a0..c7207118fde 100644 --- a/gcc/ada/system-vxworks-sparcv9.ads +++ b/gcc/ada/system-vxworks-sparcv9.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks Version Sparc/64) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -151,7 +151,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; diff --git a/gcc/ada/system-vxworks-x86.ads b/gcc/ada/system-vxworks-x86.ads index d028ca9103b..7780b4dd816 100644 --- a/gcc/ada/system-vxworks-x86.ads +++ b/gcc/ada/system-vxworks-x86.ads @@ -7,7 +7,7 @@ -- S p e c -- -- (VxWorks 5 Version x86) -- -- -- --- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -149,7 +149,7 @@ private Support_Composite_Assign : constant Boolean := True; Support_Composite_Compare : constant Boolean := True; Support_Long_Shifts : constant Boolean := True; - Always_Compatible_Rep : constant Boolean := True; + Always_Compatible_Rep : constant Boolean := False; Suppress_Standard_Library : constant Boolean := False; Use_Ada_Main_Program_Name : constant Boolean := True; ZCX_By_Default : constant Boolean := False; -- 2.30.2