From 5f37d07c6e08778a5e16779bc5c0c419533b47a1 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sun, 4 Nov 2001 22:37:46 +0000 Subject: [PATCH] aof.h (aof_text_section, [...]): Don't declare. * arm/aof.h (aof_text_section, aof_data_section): Don't declare. (common_section): Delete unused variable. (ASM_OUTPUT_ASCII): Fix signed/unsigned warnings. (ASM_GENERATE_INTERNAL_LABEL): Fix format specifier warning. * arm-protos.h (arm_poke_function_name, aof_add_import, aof_delete_import): Const-ify. * arm.c (legitimize_pic_address): Wrap variables in the macro controlling their usage. (arm_finalize_pic): Mark variable with ATTRIBUTE_UNUSED. (arm_poke_function_name, pic_chain, import, aof_add_import, aof_delete_import): Const-ify. * i386.c (ix86_osf_output_function_prologue): Const-ify. * i386/sysv4.h (ASM_OUTPUT_FLOAT, ASM_OUTPUT_DOUBLE, ASM_OUTPUT_LONG_DOUBLE): Fix format specifier warnings. * i860/fx2800.h (DBX_OUTPUT_STANDARD_TYPES): Const-ify. * i860/sysv3.h: Add missing comment closure. * m68k/apollo68.h (ASM_RETURN_CASE_JUMP): Add missing semi-colon. * m88k/dgux.h (SELECT_RTX_SECTION): Add missing argument in call to symbolic_operand. * config.gcc (m680[02]0-*-*): Rename case from m68000-*-*. (i960-*-*): Set tmake_file. (sparc86x-*-elf*): Fix typo in header name. * sched-rgn.c (schedule_insns): Delete unused variable. From-SVN: r46776 --- gcc/ChangeLog | 28 ++++++++++++++++++++++++++++ gcc/config.gcc | 5 +++-- gcc/config/arm/aof.h | 9 +++------ gcc/config/arm/arm-protos.h | 6 +++--- gcc/config/arm/arm.c | 14 ++++++++------ gcc/config/i386/i386.c | 4 ++-- gcc/config/i386/sysv4.h | 12 ++++++------ gcc/config/i860/fx2800.h | 3 ++- gcc/config/i860/sysv3.h | 2 +- gcc/config/m68k/apollo68.h | 2 +- gcc/config/m88k/dgux.h | 2 +- gcc/sched-rgn.c | 2 -- 12 files changed, 58 insertions(+), 31 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5809897ce0..ffe0d7e002d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,31 @@ +2001-11-04 Kaveh R. Ghazi + + * arm/aof.h (aof_text_section, aof_data_section): Don't declare. + (common_section): Delete unused variable. + (ASM_OUTPUT_ASCII): Fix signed/unsigned warnings. + (ASM_GENERATE_INTERNAL_LABEL): Fix format specifier warning. + * arm-protos.h (arm_poke_function_name, aof_add_import, + aof_delete_import): Const-ify. + * arm.c (legitimize_pic_address): Wrap variables in the macro + controlling their usage. + (arm_finalize_pic): Mark variable with ATTRIBUTE_UNUSED. + (arm_poke_function_name, pic_chain, import, aof_add_import, + aof_delete_import): Const-ify. + * i386.c (ix86_osf_output_function_prologue): Const-ify. + * i386/sysv4.h (ASM_OUTPUT_FLOAT, ASM_OUTPUT_DOUBLE, + ASM_OUTPUT_LONG_DOUBLE): Fix format specifier warnings. + * i860/fx2800.h (DBX_OUTPUT_STANDARD_TYPES): Const-ify. + * i860/sysv3.h: Add missing comment closure. + * m68k/apollo68.h (ASM_RETURN_CASE_JUMP): Add missing semi-colon. + * m88k/dgux.h (SELECT_RTX_SECTION): Add missing argument in call + to symbolic_operand. + + * config.gcc (m680[02]0-*-*): Rename case from m68000-*-*. + (i960-*-*): Set tmake_file. + (sparc86x-*-elf*): Fix typo in header name. + + * sched-rgn.c (schedule_insns): Delete unused variable. + 2001-11-04 Neil Booth PR c/2820 diff --git a/gcc/config.gcc b/gcc/config.gcc index 583b3ac6543..13f3b4e02ea 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -236,7 +236,7 @@ x86_64-*-*) hppa*-*-* | parisc*-*-*) cpu_type=pa ;; -m68000-*-*) +m680[02]0-*-*) cpu_type=m68k ;; mips*-*-*) @@ -1528,6 +1528,7 @@ i960-*-rtems) ;; i960-*-*) # Default i960 environment. use_collect2=yes + tmake_file=i960/t-960bare c_target_objs="i960-c.o" cxx_target_objs="i960-c.o" ;; @@ -3149,7 +3150,7 @@ sparc86x-*-aout*) tmake_file=sparc/t-sp86x ;; sparc86x-*-elf*) - tm_file="sparc/sol2.h sparc./elf.h sparc/sp86x-elf.h" + tm_file="sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h" tmake_file=sparc/t-sp86x extra_parts="crtbegin.o crtend.o" ;; diff --git a/gcc/config/arm/aof.h b/gcc/config/arm/aof.h index 55b8eefda2d..d8fb2eb01f9 100644 --- a/gcc/config/arm/aof.h +++ b/gcc/config/arm/aof.h @@ -52,12 +52,10 @@ Boston, MA 02111-1307, USA. */ two areas with the same attributes will be linked adjacently in the resulting executable, so we have to be careful not to do pc-relative addressing across such boundaries. */ -char *aof_text_section (); #define TEXT_SECTION_ASM_OP aof_text_section () #define SELECT_RTX_SECTION(MODE,RTX,ALIGN) text_section (); -char *aof_data_section (); #define DATA_SECTION_ASM_OP aof_data_section () #define EXTRA_SECTIONS in_zero_init, in_common @@ -85,7 +83,6 @@ zero_init_section () \ void \ common_section () \ { \ - static int common_count = 1; \ if (in_section != in_common) \ { \ in_section = in_common; \ @@ -232,10 +229,10 @@ do { \ int i; \ const char *ptr = (PTR); \ fprintf ((STREAM), "\tDCB"); \ - for (i = 0; i < (LEN); i++) \ + for (i = 0; i < (long)(LEN); i++) \ fprintf ((STREAM), " &%02x%s", \ (unsigned ) *(ptr++), \ - (i + 1 < (LEN) \ + (i + 1 < (long)(LEN) \ ? ((i & 3) == 3 ? "\n\tDCB" : ",") \ : "\n")); \ } @@ -313,7 +310,7 @@ do { \ fprintf ((STREAM), "|%s|", NAME) #define ASM_GENERATE_INTERNAL_LABEL(STRING,PREFIX,NUM) \ - sprintf ((STRING), "*|%s..%d|", (PREFIX), (NUM)) + sprintf ((STRING), "*|%s..%ld|", (PREFIX), (long)(NUM)) #define ASM_FORMAT_PRIVATE_NAME(OUTVAR,NAME,NUMBER) \ ((OUTVAR) = (char *) alloca (strlen ((NAME)) + 10), \ diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 77a33e5cd0a..11accd34b32 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -122,7 +122,7 @@ extern const char * output_add_immediate PARAMS ((rtx *)); extern const char * arithmetic_instr PARAMS ((rtx, int)); extern void output_ascii_pseudo_op PARAMS ((FILE *, const unsigned char *, int)); extern const char * output_return_instruction PARAMS ((rtx, int, int)); -extern void arm_poke_function_name PARAMS ((FILE *, char *)); +extern void arm_poke_function_name PARAMS ((FILE *, const char *)); extern void arm_print_operand PARAMS ((FILE *, rtx, int)); extern void arm_print_operand_address PARAMS ((FILE *, rtx)); extern void arm_final_prescan_insn PARAMS ((rtx)); @@ -142,8 +142,8 @@ extern rtx aof_pic_entry PARAMS ((rtx)); extern void aof_dump_pic_table PARAMS ((FILE *)); extern char * aof_text_section PARAMS ((void)); extern char * aof_data_section PARAMS ((void)); -extern void aof_add_import PARAMS ((char *)); -extern void aof_delete_import PARAMS ((char *)); +extern void aof_add_import PARAMS ((const char *)); +extern void aof_delete_import PARAMS ((const char *)); extern void aof_dump_imports PARAMS ((FILE *)); extern void zero_init_section PARAMS ((void)); extern void common_section PARAMS ((void)); diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 92baca1a263..0475c58fc94 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -2251,7 +2251,9 @@ legitimize_pic_address (orig, mode, reg) { if (GET_CODE (orig) == SYMBOL_REF) { +#ifndef AOF_ASSEMBLER rtx pic_ref, address; +#endif rtx insn; int subregs = 0; @@ -2375,7 +2377,7 @@ legitimize_pic_address (orig, mode, reg) void arm_finalize_pic (prologue) - int prologue; + int prologue ATTRIBUTE_UNUSED; { #ifndef AOF_ASSEMBLER rtx l1, pic_tmp, pic_tmp2, seq, pic_rtx; @@ -7313,7 +7315,7 @@ output_return_instruction (operand, really_return, reverse) void arm_poke_function_name (stream, name) FILE * stream; - char * name; + const char * name; { unsigned long alignlength; unsigned long length; @@ -10675,7 +10677,7 @@ rtx aof_pic_label = NULL_RTX; struct pic_chain { struct pic_chain * next; - char * symname; + const char * symname; }; static struct pic_chain * aof_pic_chain = NULL; @@ -10765,14 +10767,14 @@ aof_data_section () struct import { struct import * next; - char * name; + const char * name; }; static struct import * imports_list = NULL; void aof_add_import (name) - char * name; + const char * name; { struct import * new; @@ -10788,7 +10790,7 @@ aof_add_import (name) void aof_delete_import (name) - char * name; + const char * name; { struct import ** old; diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 8fe70a2a71c..44353a96365 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1178,8 +1178,8 @@ ix86_osf_output_function_prologue (file, size) FILE *file; HOST_WIDE_INT size; { - char *prefix = ""; - char *lprefix = LPREFIX; + const char *prefix = ""; + const char *const lprefix = LPREFIX; int labelno = profile_label_no; #ifdef OSF_OS diff --git a/gcc/config/i386/sysv4.h b/gcc/config/i386/sysv4.h index b2540b7b35a..f60ec31fe5b 100644 --- a/gcc/config/i386/sysv4.h +++ b/gcc/config/i386/sysv4.h @@ -48,7 +48,7 @@ Boston, MA 02111-1307, USA. */ do { long value; \ REAL_VALUE_TO_TARGET_SINGLE ((VALUE), value); \ if (sizeof (int) == sizeof (long)) \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value); \ else \ fprintf((FILE), "%s0x%lx\n", ASM_LONG, value); \ } while (0) @@ -64,8 +64,8 @@ do { long value[2]; \ REAL_VALUE_TO_TARGET_DOUBLE ((VALUE), value); \ if (sizeof (int) == sizeof (long)) \ { \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value[0]); \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value[1]); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value[0]); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value[1]); \ } \ else \ { \ @@ -81,9 +81,9 @@ do { long value[3]; \ REAL_VALUE_TO_TARGET_LONG_DOUBLE ((VALUE), value); \ if (sizeof (int) == sizeof (long)) \ { \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value[0]); \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value[1]); \ - fprintf((FILE), "%s0x%x\n", ASM_LONG, value[2]); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value[0]); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value[1]); \ + fprintf((FILE), "%s0x%x\n", ASM_LONG, (int) value[2]); \ } \ else \ { \ diff --git a/gcc/config/i860/fx2800.h b/gcc/config/i860/fx2800.h index 3031611bc53..e86a91e2c2a 100644 --- a/gcc/config/i860/fx2800.h +++ b/gcc/config/i860/fx2800.h @@ -100,7 +100,8 @@ Boston, MA 02111-1307, USA. */ sets long & unsigned long in 18 & 19, not in 100 & 101 as shown above. */ #define DBX_OUTPUT_STANDARD_TYPES(syms) \ -{ char *dtyps[]={"", "char", "short int", "int", "logical*1", \ +{ static const char *const dtyps[] = { \ + "", "char", "short int", "int", "logical*1", \ "logical*2", "logical*4", "float", "double", "complex", \ "doublecomplex", "character", "void", "nil", "boolean", \ "unsigned char", "short unsigned int", "unsigned int", \ diff --git a/gcc/config/i860/sysv3.h b/gcc/config/i860/sysv3.h index 6f82d6e30d0..2b0eb00fb0b 100644 --- a/gcc/config/i860/sysv3.h +++ b/gcc/config/i860/sysv3.h @@ -97,7 +97,7 @@ extern const char *current_function_original_name; fprintf ((FILE), "\t.set .,.+%u\n", (ROUNDED)); \ } while (0) -/* The routine used to output string literals. +/* The routine used to output string literals. */ #define ASCII_DATA_ASM_OP "\t.byte\t" diff --git a/gcc/config/m68k/apollo68.h b/gcc/config/m68k/apollo68.h index bd44afab18a..38fd5dd5eff 100644 --- a/gcc/config/m68k/apollo68.h +++ b/gcc/config/m68k/apollo68.h @@ -182,7 +182,7 @@ Boston, MA 02111-1307, USA. */ if (TARGET_5200) \ return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ else \ - return "jmp %%pc@(2,%0:w)" \ + return "jmp %%pc@(2,%0:w)"; \ } while (0) /* Here are the new register names. */ diff --git a/gcc/config/m88k/dgux.h b/gcc/config/m88k/dgux.h index 380f336463d..a789f395450 100644 --- a/gcc/config/m88k/dgux.h +++ b/gcc/config/m88k/dgux.h @@ -298,7 +298,7 @@ func_ptr __DTOR_END__[1] = { (func_ptr) (-1) } #undef SELECT_RTX_SECTION #define SELECT_RTX_SECTION(MODE,RTX,ALIGN) \ { \ - if (flag_pic && symbolic_operand (RTX)) \ + if (flag_pic && symbolic_operand ((RTX), (MODE))) \ data_section (); \ else \ const_section (); \ diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c index 9e5020bed1e..299314a6838 100644 --- a/gcc/sched-rgn.c +++ b/gcc/sched-rgn.c @@ -2963,8 +2963,6 @@ schedule_insns (dump_file) for (rgn = 0; rgn < nr_regions; rgn++) if (RGN_NR_BLOCKS (rgn) == 1) { - int b; - sbitmap_zero (blocks); SET_BIT (blocks, rgn_bb_table[RGN_BLOCKS (rgn)]); -- 2.30.2