From f8adc62df477edf69a97e91aa53ebefdb9a76dae Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Fri, 22 Nov 1991 19:09:03 +0000 Subject: [PATCH] const lint --- bfd/ChangeLog | 1 + bfd/aoutx.h | 2 +- bfd/bfd.c | 23 +++++++++++------------ bfd/coffcode.h | 4 ++-- bfd/targets.c | 34 ++++++++++++++++++++++++++-------- 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 16e0c724d86..797d75d8a79 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,6 @@ Fri Nov 22 08:11:42 1991 John Gilmore (gnu at cygnus.com) + * aoutx.h, bfd.c, coffcode.h, ieee.c, oasys.c, targets.c: CONST lint. * libbfd-in.h, libbfd.h, aoutx.h, coffcode.h, elf.c, libaout.h: Rename ALIGN to BFD_ALIGN to avoid conflict with BSD . * libbfd.c: Lint. diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 070dddccfca..89e07cdf709 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -1606,7 +1606,7 @@ DEFUN(NAME(aout,print_symbol),(ignore_abfd, afile, symbol, how), case bfd_print_symbol_all: { CONST char *section_name = symbol->section == (asection *)NULL ? - "*abs" : symbol->section->name; + (CONST char *)"*abs" : symbol->section->name; bfd_print_symbol_vandf((PTR)file,symbol); diff --git a/bfd/bfd.c b/bfd/bfd.c index ccf53ce1e49..1e6d49b4c3b 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -166,7 +166,7 @@ $}; extern char *strerror(); -short _bfd_host_big_endian = 0x0100; +CONST short _bfd_host_big_endian = 0x0100; /* Accessing the above as (*(char*)&_bfd_host_big_endian), will return 1 if the host is big-endian, 0 otherwise. (assuming that a short is two bytes long!!! FIXME) @@ -279,18 +279,17 @@ get_reloc_upper_bound (abfd, asect) } unsigned int -bfd_canonicalize_reloc (abfd, asect, location, symbols) - bfd *abfd; - sec_ptr asect; - arelent **location; - asymbol **symbols; +DEFUN(bfd_canonicalize_reloc,(abfd, asect, location, symbols), + bfd *abfd AND + sec_ptr asect AND + arelent **location AND + asymbol **symbols) { - if (abfd->format != bfd_object) { - bfd_error = invalid_operation; - return 0; - } - - return BFD_SEND (abfd, _bfd_canonicalize_reloc, (abfd, asect, location, symbols)); + if (abfd->format != bfd_object) { + bfd_error = invalid_operation; + return 0; + } + return BFD_SEND (abfd, _bfd_canonicalize_reloc, (abfd, asect, location, symbols)); } diff --git a/bfd/coffcode.h b/bfd/coffcode.h index f50945745e3..0410c00f9d2 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1747,8 +1747,8 @@ DEFUN(coff_print_symbol,(ignore_abfd, filep, symbol, how), case bfd_print_symbol_nm: case bfd_print_symbol_all: { - CONST char *section_name = symbol->section == (asection *) NULL ? - "*abs" : symbol->section->name; + CONST char *section_name = symbol->section == (asection *) NULL ? + (CONST char *)"*abs" : symbol->section->name; bfd_print_symbol_vandf((PTR) file, symbol); fprintf(file, " %-5s %s %s %s", diff --git a/bfd/targets.c b/bfd/targets.c index d89e7bcb91d..9335627dd44 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -322,6 +322,22 @@ $} bfd_target; *--- */ + +/* The default is to define a target_vector containing just the + DEFAULT_TARGET. (This is to save space in the executables.) + You can override this by giving an explicit target_vector using + the SELECT_VECTOR macro. + Or define ALL_TARGETS macro to get all of the available targets. */ + + +#if MINIMIZE && defined(DEFAULT_VECTOR) && !defined(SELECT_VECS) +#ifdef TRAD_CORE +#define SELECT_VECS &DEFAULT_VECTOR,&trad_core_vec +#else +#define SELECT_VECS &DEFAULT_VECTOR +#endif +#endif + extern bfd_target ecoff_little_vec; extern bfd_target ecoff_big_vec; extern bfd_target sunos_big_vec; @@ -335,7 +351,7 @@ extern bfd_target elf_little_vec; extern bfd_target elf_big_vec; extern bfd_target ieee_vec; extern bfd_target oasys_vec; -extern bfd_target m88k_bcs_vec; +extern bfd_target m88kbcs_vec; extern bfd_target m68kcoff_vec; extern bfd_target i386coff_vec; extern bfd_target i386aout_vec; @@ -343,6 +359,10 @@ extern bfd_target a29kcoff_big_vec; extern bfd_target trad_core_vec; extern bfd_target rs6000coff_vec; +#ifdef DEFAULT_VECTOR +extern bfd_target DEFAULT_VECTOR; +#endif + #ifdef SELECT_VECS bfd_target *target_vector[] = { @@ -351,9 +371,6 @@ SELECT_VECS, }; #else -#ifdef DEFAULT_VECTOR -extern bfd_target DEFAULT_VECTOR; -#endif #ifdef GNU960 #define ICOFF_LITTLE_VEC icoff_little_vec @@ -382,7 +399,7 @@ extern bfd_target DEFAULT_VECTOR; #endif #define IEEE_VEC ieee_vec -#define M88K_BCS_VEC m88k_bcs_vec +#define M88KBCS_VEC m88kbcs_vec #define SREC_VEC srec_vec #define M68KCOFF_VEC m68kcoff_vec #define I386COFF_VEC i386coff_vec @@ -431,8 +448,8 @@ bfd_target *target_vector[] = { #endif #endif -#ifdef M88K_BCS_VEC - &M88K_BCS_VEC, +#ifdef M88KBCS_VEC + &M88KBCS_VEC, #endif #ifdef SREC_VEC @@ -518,7 +535,8 @@ DEFUN(bfd_find_target,(target_name, abfd), { bfd_target **target; extern char *getenv (); - CONST char *targname = (target_name ? target_name : getenv ("GNUTARGET")); + CONST char *targname = (target_name ? target_name : + (CONST char *) getenv ("GNUTARGET")); /* This is safe; the vector cannot be null */ if (targname == NULL || !strcmp (targname, "default")) { -- 2.30.2