Skip to content

R
riscv-gcc-1
Commit 19d7de5b by Tristan Gingold Committed by Tristan Gingold
Options

Makefile.in: Remove .sym rule (not used). 

2012-02-09  Tristan Gingold  <gingold@adacore.com>

	* gcc-interface/Makefile.in: Remove .sym rule (not used).
	Remove adamsg.o object (requires native message compiler).
	* init.c (CMA$_EXIT_THREAD, MTH$_FLOOVEMAT, SS$_INTDIV): Define as a
	macro instead of as extern int.
	(ADA$_ALREADY_OPEN, ADA$_CONSTRAINT_ERRO, ADA$_DATA_ERROR)
	(ADA$_DEVICE_ERROR, ADA$_END_ERROR, ADA$_FAC_MODE_MISMAT)
	(ADA$_IOSYSFAILED, ADA$_KEYSIZERR, ADA$_KEY_MISMATCH)
	(ADA$_LAYOUT_ERROR, ADA$_LINEXCMRS, ADA$_MAXLINEXC)
	(ADA$_MODE_ERROR, ADA$_MRN_MISMATCH, ADA$_MRS_MISMATCH)
	(ADA$_NAME_ERROR, ADA$_NOT_OPEN, ADA$_ORG_MISMATCH)
	(ADA$_PROGRAM_ERROR, ADA$_RAT_MISMATCH, ADA$_RFM_MISMATCH)
	(ADA$_STAOVF, ADA$_STATUS_ERROR, ADA$_STORAGE_ERROR)
	(ADA$_UNSUPPORTED, ADA$_USE_ERROR): Likewise.
	(struct cond_except): Field cond is now an unsigned int.
	(dec_ada_cond_except_table): Adjust.
	(cond_except_table): Likewise.
	(cond_resignal_table): Likewise.
	(__gnat_default_resignal_p): Fix style.

From-SVN: r184041
parent 15ed19ff
Showing with 90 additions and 81 deletions
gcc/ada/ChangeLog
2012-02-09 Tristan Gingold <gingold@adacore.com>
* gcc-interface/Makefile.in: Remove .sym rule (not used).
Remove adamsg.o object (requires native message compiler).
* init.c (CMA$_EXIT_THREAD, MTH$_FLOOVEMAT, SS$_INTDIV): Define as a
macro instead of as extern int.
(ADA$_ALREADY_OPEN, ADA$_CONSTRAINT_ERRO, ADA$_DATA_ERROR)
(ADA$_DEVICE_ERROR, ADA$_END_ERROR, ADA$_FAC_MODE_MISMAT)
(ADA$_IOSYSFAILED, ADA$_KEYSIZERR, ADA$_KEY_MISMATCH)
(ADA$_LAYOUT_ERROR, ADA$_LINEXCMRS, ADA$_MAXLINEXC)
(ADA$_MODE_ERROR, ADA$_MRN_MISMATCH, ADA$_MRS_MISMATCH)
(ADA$_NAME_ERROR, ADA$_NOT_OPEN, ADA$_ORG_MISMATCH)
(ADA$_PROGRAM_ERROR, ADA$_RAT_MISMATCH, ADA$_RFM_MISMATCH)
(ADA$_STAOVF, ADA$_STATUS_ERROR, ADA$_STORAGE_ERROR)
(ADA$_UNSUPPORTED, ADA$_USE_ERROR): Likewise.
(struct cond_except): Field cond is now an unsigned int.
(dec_ada_cond_except_table): Adjust.
(cond_except_table): Likewise.
(cond_resignal_table): Likewise.
(__gnat_default_resignal_p): Fix style.
2012-02-08 Vincent Celier <celier@adacore.com> 2012-02-08 Vincent Celier <celier@adacore.com>
* gcc-interface/Make-lang.in: Add g-byorma.o to gnatbind objects * gcc-interface/Make-lang.in: Add g-byorma.o to gnatbind objects
......
gcc/ada/gcc-interface/Makefile.in
...@@ -1487,10 +1487,6 @@ hyphen = _ ...@@ -1487,10 +1487,6 @@ hyphen = _
LN = cp -p LN = cp -p
LN_S = cp -p LN_S = cp -p
.SUFFIXES: .sym
.o.sym:
@ gnu:[bin]vmssymvec $<
endif endif
ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(targ))),) ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(targ))),)
...@@ -1566,16 +1562,11 @@ ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(targ))) ...@@ -1566,16 +1562,11 @@ ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(targ)))
endif endif
endif endif
adamsg.o: adamsg.msg
-$(DECC) --cc=message adamsg.msg -o adamsg.o
EXTRA_GNATMAKE_OBJS = mlib-tgt-vms_common.o EXTRA_GNATMAKE_OBJS = mlib-tgt-vms_common.o
GMEM_LIB = gmemlib GMEM_LIB = gmemlib
EH_MECHANISM=-gcc EH_MECHANISM=-gcc
GNATLIB_SHARED=gnatlib-shared-vms GNATLIB_SHARED=gnatlib-shared-vms
EXTRA_LIBGNAT_SRCS+=adamsg.msg
EXTRA_LIBGNAT_OBJS+=adamsg.o
EXTRA_GNATRTL_NONTASKING_OBJS+=s-po32gl.o EXTRA_GNATRTL_NONTASKING_OBJS+=s-po32gl.o
EXTRA_GNATRTL_TASKING_OBJS=s-tpopde.o EXTRA_GNATRTL_TASKING_OBJS=s-tpopde.o
EXTRA_GNATTOOLS = \ EXTRA_GNATTOOLS = \
......
gcc/ada/init.c
...@@ -1117,12 +1117,12 @@ int __gnat_features_set = 0; ...@@ -1117,12 +1117,12 @@ int __gnat_features_set = 0;
/* These codes are in standard message libraries. */ /* These codes are in standard message libraries. */
extern int C$_SIGKILL; extern int C$_SIGKILL;
extern int CMA$_EXIT_THREAD;
extern int SS$_DEBUG; extern int SS$_DEBUG;
extern int SS$_INTDIV;
extern int LIB$_KEYNOTFOU; extern int LIB$_KEYNOTFOU;
extern int LIB$_ACTIMAGE; extern int LIB$_ACTIMAGE;
extern int MTH$_FLOOVEMAT; /* Some ACVC_21 CXA tests */ #define CMA$_EXIT_THREAD 4227492
#define MTH$_FLOOVEMAT 1475268 /* Some ACVC_21 CXA tests */
#define SS$_INTDIV 1156
/* These codes are non standard, which is to say the author is /* These codes are non standard, which is to say the author is
not sure if they are defined in the standard message libraries not sure if they are defined in the standard message libraries
...@@ -1131,7 +1131,7 @@ extern int MTH$_FLOOVEMAT; /* Some ACVC_21 CXA tests */ ...@@ -1131,7 +1131,7 @@ extern int MTH$_FLOOVEMAT; /* Some ACVC_21 CXA tests */
#define FDL$_UNPRIKW 11829410 #define FDL$_UNPRIKW 11829410
struct cond_except { struct cond_except {
const int *cond; unsigned int cond;
const struct Exception_Data *except; const struct Exception_Data *except;
}; };
...@@ -1181,76 +1181,73 @@ extern struct Exception_Data *Coded_Exception (Exception_Code); ...@@ -1181,76 +1181,73 @@ extern struct Exception_Data *Coded_Exception (Exception_Code);
extern Exception_Code Base_Code_In (Exception_Code); extern Exception_Code Base_Code_In (Exception_Code);
/* DEC Ada exceptions are not defined in a header file, so they /* DEC Ada exceptions are not defined in a header file, so they
must be declared as external addresses. */ must be declared. */
extern int ADA$_PROGRAM_ERROR; #define ADA$_ALREADY_OPEN 0x0031a594
extern int ADA$_LOCK_ERROR; #define ADA$_CONSTRAINT_ERRO 0x00318324
extern int ADA$_EXISTENCE_ERROR; #define ADA$_DATA_ERROR 0x003192c4
extern int ADA$_KEY_ERROR; #define ADA$_DEVICE_ERROR 0x003195e4
extern int ADA$_KEYSIZERR; #define ADA$_END_ERROR 0x00319904
extern int ADA$_STAOVF; #define ADA$_FAC_MODE_MISMAT 0x0031a8b3
extern int ADA$_CONSTRAINT_ERRO; #define ADA$_IOSYSFAILED 0x0031af04
extern int ADA$_IOSYSFAILED; #define ADA$_KEYSIZERR 0x0031aa3c
extern int ADA$_LAYOUT_ERROR; #define ADA$_KEY_MISMATCH 0x0031a8e3
extern int ADA$_STORAGE_ERROR; #define ADA$_LAYOUT_ERROR 0x00319c24
extern int ADA$_DATA_ERROR; #define ADA$_LINEXCMRS 0x0031a8f3
extern int ADA$_DEVICE_ERROR; #define ADA$_MAXLINEXC 0x0031a8eb
extern int ADA$_END_ERROR; #define ADA$_MODE_ERROR 0x00319f44
extern int ADA$_MODE_ERROR; #define ADA$_MRN_MISMATCH 0x0031a8db
extern int ADA$_NAME_ERROR; #define ADA$_MRS_MISMATCH 0x0031a8d3
extern int ADA$_STATUS_ERROR; #define ADA$_NAME_ERROR 0x0031a264
extern int ADA$_NOT_OPEN; #define ADA$_NOT_OPEN 0x0031a58c
extern int ADA$_ALREADY_OPEN; #define ADA$_ORG_MISMATCH 0x0031a8bb
extern int ADA$_USE_ERROR; #define ADA$_PROGRAM_ERROR 0x00318964
extern int ADA$_UNSUPPORTED; #define ADA$_RAT_MISMATCH 0x0031a8cb
extern int ADA$_FAC_MODE_MISMAT; #define ADA$_RFM_MISMATCH 0x0031a8c3
extern int ADA$_ORG_MISMATCH; #define ADA$_STAOVF 0x00318cac
extern int ADA$_RFM_MISMATCH; #define ADA$_STATUS_ERROR 0x0031a584
extern int ADA$_RAT_MISMATCH; #define ADA$_STORAGE_ERROR 0x00318c84
extern int ADA$_MRS_MISMATCH; #define ADA$_UNSUPPORTED 0x0031a8ab
extern int ADA$_MRN_MISMATCH; #define ADA$_USE_ERROR 0x0031a8a4
extern int ADA$_KEY_MISMATCH;
extern int ADA$_MAXLINEXC;
extern int ADA$_LINEXCMRS;
/* DEC Ada specific conditions. */ /* DEC Ada specific conditions. */
static const struct cond_except dec_ada_cond_except_table [] = { static const struct cond_except dec_ada_cond_except_table [] = {
{&ADA$_PROGRAM_ERROR, &program_error}, {ADA$_PROGRAM_ERROR, &program_error},
{&ADA$_USE_ERROR, &Use_Error}, {ADA$_USE_ERROR, &Use_Error},
{&ADA$_KEYSIZERR, &program_error}, {ADA$_KEYSIZERR, &program_error},
{&ADA$_STAOVF, &storage_error}, {ADA$_STAOVF, &storage_error},
{&ADA$_CONSTRAINT_ERRO, &constraint_error}, {ADA$_CONSTRAINT_ERRO, &constraint_error},
{&ADA$_IOSYSFAILED, &Device_Error}, {ADA$_IOSYSFAILED, &Device_Error},
{&ADA$_LAYOUT_ERROR, &Layout_Error}, {ADA$_LAYOUT_ERROR, &Layout_Error},
{&ADA$_STORAGE_ERROR, &storage_error}, {ADA$_STORAGE_ERROR, &storage_error},
{&ADA$_DATA_ERROR, &Data_Error}, {ADA$_DATA_ERROR, &Data_Error},
{&ADA$_DEVICE_ERROR, &Device_Error}, {ADA$_DEVICE_ERROR, &Device_Error},
{&ADA$_END_ERROR, &End_Error}, {ADA$_END_ERROR, &End_Error},
{&ADA$_MODE_ERROR, &Mode_Error}, {ADA$_MODE_ERROR, &Mode_Error},
{&ADA$_NAME_ERROR, &Name_Error}, {ADA$_NAME_ERROR, &Name_Error},
{&ADA$_STATUS_ERROR, &Status_Error}, {ADA$_STATUS_ERROR, &Status_Error},
{&ADA$_NOT_OPEN, &Use_Error}, {ADA$_NOT_OPEN, &Use_Error},
{&ADA$_ALREADY_OPEN, &Use_Error}, {ADA$_ALREADY_OPEN, &Use_Error},
{&ADA$_USE_ERROR, &Use_Error}, {ADA$_USE_ERROR, &Use_Error},
{&ADA$_UNSUPPORTED, &Use_Error}, {ADA$_UNSUPPORTED, &Use_Error},
{&ADA$_FAC_MODE_MISMAT, &Use_Error}, {ADA$_FAC_MODE_MISMAT, &Use_Error},
{&ADA$_ORG_MISMATCH, &Use_Error}, {ADA$_ORG_MISMATCH, &Use_Error},
{&ADA$_RFM_MISMATCH, &Use_Error}, {ADA$_RFM_MISMATCH, &Use_Error},
{&ADA$_RAT_MISMATCH, &Use_Error}, {ADA$_RAT_MISMATCH, &Use_Error},
{&ADA$_MRS_MISMATCH, &Use_Error}, {ADA$_MRS_MISMATCH, &Use_Error},
{&ADA$_MRN_MISMATCH, &Use_Error}, {ADA$_MRN_MISMATCH, &Use_Error},
{&ADA$_KEY_MISMATCH, &Use_Error}, {ADA$_KEY_MISMATCH, &Use_Error},
{&ADA$_MAXLINEXC, &constraint_error}, {ADA$_MAXLINEXC, &constraint_error},
{&ADA$_LINEXCMRS, &constraint_error}, {ADA$_LINEXCMRS, &constraint_error},
{0, 0} {0, 0}
}; };
#if 0 #if 0
/* Already handled by a pragma Import_Exception /* Already handled by a pragma Import_Exception
in Aux_IO_Exceptions */ in Aux_IO_Exceptions */
{&ADA$_LOCK_ERROR, &Lock_Error}, {ADA$_LOCK_ERROR, &Lock_Error},
{&ADA$_EXISTENCE_ERROR, &Existence_Error}, {ADA$_EXISTENCE_ERROR, &Existence_Error},
{&ADA$_KEY_ERROR, &Key_Error}, {ADA$_KEY_ERROR, &Key_Error},
#endif #endif
#endif /* IN_RTS */ #endif /* IN_RTS */
...@@ -1258,8 +1255,8 @@ static const struct cond_except dec_ada_cond_except_table [] = { ...@@ -1258,8 +1255,8 @@ static const struct cond_except dec_ada_cond_except_table [] = {
/* Non-DEC Ada specific conditions. We could probably also put /* Non-DEC Ada specific conditions. We could probably also put
SS$_HPARITH here and possibly SS$_ACCVIO, SS$_STKOVF. */ SS$_HPARITH here and possibly SS$_ACCVIO, SS$_STKOVF. */
static const struct cond_except cond_except_table [] = { static const struct cond_except cond_except_table [] = {
{&MTH$_FLOOVEMAT, &constraint_error}, {MTH$_FLOOVEMAT, &constraint_error},
{&SS$_INTDIV, &constraint_error}, {SS$_INTDIV, &constraint_error},
{0, 0} {0, 0}
}; };
...@@ -1297,7 +1294,7 @@ resignal_predicate (int code); ...@@ -1297,7 +1294,7 @@ resignal_predicate (int code);
static const int * const cond_resignal_table [] = { static const int * const cond_resignal_table [] = {
&C$_SIGKILL, &C$_SIGKILL,
&CMA$_EXIT_THREAD, (int *)CMA$_EXIT_THREAD,
&SS$_DEBUG, &SS$_DEBUG,
&LIB$_KEYNOTFOU, &LIB$_KEYNOTFOU,
&LIB$_ACTIMAGE, &LIB$_ACTIMAGE,
...@@ -1324,8 +1321,8 @@ __gnat_default_resignal_p (int code) ...@@ -1324,8 +1321,8 @@ __gnat_default_resignal_p (int code)
return 1; return 1;
for (i = 0, iexcept = 0; for (i = 0, iexcept = 0;
cond_resignal_table [i] && cond_resignal_table [i]
!(iexcept = LIB$MATCH_COND (&code, &cond_resignal_table [i])); && !(iexcept = LIB$MATCH_COND (&code, &cond_resignal_table [i]));
i++); i++);
return iexcept; return iexcept;
...@@ -1410,7 +1407,7 @@ __gnat_handle_vms_condition (int *sigargs, void *mechargs) ...@@ -1410,7 +1407,7 @@ __gnat_handle_vms_condition (int *sigargs, void *mechargs)
msg = message; msg = message;
exception->Name_Length = 19; exception->Name_Length = 19;
/* ??? The full name really should be get sys$getmsg returns. */ /* ??? The full name really should be get SYS$GETMSG returns. */
exception->Full_Name = "IMPORTED_EXCEPTION"; exception->Full_Name = "IMPORTED_EXCEPTION";
exception->Import_Code = base_code; exception->Import_Code = base_code;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment