X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcris%2Fcris-desc.c;h=df452c9b2249bda0cf741231bd690e2812303626;hb=2310652a4f4b6568a96583e6930904e7c25efdcd;hp=e541c3699ae2558563b249bef1e679ffb8dddc1f;hpb=15c3d785c32724ff94d54a613fcb627d1da0b721;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/cris/cris-desc.c b/sim/cris/cris-desc.c
index e541c3699a..df452c9b22 100644
--- a/sim/cris/cris-desc.c
+++ b/sim/cris/cris-desc.c
@@ -700,11 +700,7 @@ CGEN_KEYWORD cris_cgen_opval_h_supr =
 
 /* The hardware table.  */
 
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define A(a) (1 << CGEN_HW_##a)
-#else
-#define A(a) (1 << CGEN_HW_/**/a)
-#endif
 
 const CGEN_HW_ENTRY cris_cgen_hw_table[] =
 {
@@ -776,11 +772,7 @@ const CGEN_HW_ENTRY cris_cgen_hw_table[] =
 
 /* The instruction field table.  */
 
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define A(a) (1 << CGEN_IFLD_##a)
-#else
-#define A(a) (1 << CGEN_IFLD_/**/a)
-#endif
 
 const CGEN_IFLD cris_cgen_ifld_table[] =
 {
@@ -840,16 +832,8 @@ const CGEN_MAYBE_MULTI_IFLD CRIS_F_DISP9_MULTI_IFIELD [] =
 
 /* The operand table.  */
 
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define A(a) (1 << CGEN_OPERAND_##a)
-#else
-#define A(a) (1 << CGEN_OPERAND_/**/a)
-#endif
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define OPERAND(op) CRIS_OPERAND_##op
-#else
-#define OPERAND(op) CRIS_OPERAND_/**/op
-#endif
 
 const CGEN_OPERAND cris_cgen_operand_table[] =
 {
@@ -1037,11 +1021,7 @@ const CGEN_OPERAND cris_cgen_operand_table[] =
 /* The instruction table.  */
 
 #define OP(field) CGEN_SYNTAX_MAKE_FIELD (OPERAND (field))
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define A(a) (1 << CGEN_INSN_##a)
-#else
-#define A(a) (1 << CGEN_INSN_/**/a)
-#endif
 
 static const CGEN_IBASE cris_cgen_insn_table[MAX_INSNS] =
 {
@@ -2666,11 +2646,7 @@ cris_cgen_rebuild_tables (CGEN_CPU_TABLE *cd)
    CGEN_CPU_OPEN_END:     terminates arguments
 
    ??? Simultaneous multiple isas might not make sense, but it's not (yet)
-   precluded.
-
-   ??? We only support ISO C stdargs here, not K&R.
-   Laziness, plus experiment to see if anything requires K&R - eventually
-   K&R will no longer be supported - e.g. GDB is currently trying this.  */
+   precluded.  */
 
 CGEN_CPU_DESC
 cris_cgen_cpu_open (enum cgen_cpu_open_arg arg_type, ...)