This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[RFA:] gas/Makefile.am: Exclude i860 from CPU_OBJ_VALID aout-case and conditionalize coff-case


I regenerated dependencies (make dep-am in gas) after adding (untested)
.file and .loc support for CRIS since tc-cris.c now includes dwarf2dbg.h.

I noticed an error when the i860 dependencies were generated; tc-i860.h
has an #error for object formats other than ELF.  So I think it should be
removed from the aout case, and also the coff case together with CRIS,
which also has no coff support.

There are probably several other targets that should be excluded, but I
think most should still be included.  The other CPU_OBJ_VALID cases have
explicit inclusion, but I don't know by heart which targets have coff
support.  I wanted to be cautious that I did not exclude any valid targets
so I made the coff case use by-default inclusion.

It's just a nit anyway; if dependency generation fails, the dependency-
macro isn't emitted, and unused dependency-macros are harmless.

Ok to commit?

	* Makefile.am (CPU_OBJ_VALID): Add case to filter out invalid coff
	targets.  Remove i860 from valid a.out targets.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.29
diff -p -c -r1.29 Makefile.am
*** Makefile.am	2000/11/28 15:39:15	1.29
--- Makefile.am	2000/11/28 17:48:26
*************** CPU_OBJ_VALID = \
*** 100,113 ****
  	case $$o in \
  	aout) \
  	  case $$c in \
! 	  a29k | arm | cris | i386 | i860 | m68k | mips | ns32k | sparc | tahoe | tic30 | vax) \
  	    valid=yes ;; \
  	  esac ;; \
  	bout) \
  	  case $$c in \
  	  i960) valid=yes ;; \
  	  esac ;; \
! 	coff) valid=yes ;; \
  	ecoff) \
  	  case $$c in \
  	  mips | alpha) valid=yes ;; \
--- 100,117 ----
  	case $$o in \
  	aout) \
  	  case $$c in \
! 	  a29k | arm | cris | i386 | m68k | mips | ns32k | sparc | tahoe | tic30 | vax) \
  	    valid=yes ;; \
  	  esac ;; \
  	bout) \
  	  case $$c in \
  	  i960) valid=yes ;; \
  	  esac ;; \
! 	coff) valid=yes; \
! 	  case $$c in \
! 	  cris | i860) \
! 	    valid= ;; \
! 	  esac ;; \
  	ecoff) \
  	  case $$c in \
  	  mips | alpha) valid=yes ;; \
*************** DEPTC_avr_elf = $(srcdir)/config/obj-elf
*** 968,977 ****
  DEPTC_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
    $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h subsegs.h $(INCDIR)/obstack.h \
    $(INCDIR)/opcode/cris.h dwarf2dbg.h
- DEPTC_cris_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-cris.h \
-   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-   subsegs.h $(INCDIR)/obstack.h $(INCDIR)/opcode/cris.h \
-   dwarf2dbg.h
  DEPTC_cris_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
    $(INCDIR)/bfdlink.h $(srcdir)/config/tc-cris.h subsegs.h \
--- 972,977 ----
*************** DEPOBJ_avr_elf = $(srcdir)/config/obj-el
*** 1328,1336 ****
  DEPOBJ_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
    $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
    $(INCDIR)/obstack.h
- DEPOBJ_cris_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-cris.h \
-   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-   $(INCDIR)/obstack.h subsegs.h
  DEPOBJ_cris_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
    $(INCDIR)/bfdlink.h $(srcdir)/config/tc-cris.h subsegs.h \
--- 1328,1333 ----
*************** DEP_avr_elf = $(srcdir)/config/obj-elf.h
*** 1640,1647 ****
    $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h
  DEP_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
    $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
- DEP_cris_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-cris.h \
-   $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
  DEP_cris_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
    $(INCDIR)/bfdlink.h $(srcdir)/config/tc-cris.h
--- 1637,1642 ----

brgds, H-P

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]