From: Alan Modra Date: Wed, 19 Apr 2000 10:04:54 +0000 (+0000) Subject: Move some things over from the main branch. X-Git-Tag: binutils-2_10~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ec58645b02c3032502a5bff99085be55c7fa93a;p=thirdparty%2Fbinutils-gdb.git Move some things over from the main branch. My obj-multi dependency fix. Michael Sokolov's FLEX,YACC makefile fix, and define SEEK_SET in as.h Nick's avr makefile fixes. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index 0cae5c9c35b..49ff090b210 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,26 @@ +2000-04-19 Alan Modra + + * Makefile.am: (CPU_MULTI_VALID): Remove. + (MULTI_CPU_TYPES): Define. + (MULTI_CPU_OBJ_VALID): Define. + (DEPTC): Use the above. + (DEPOBJ): Same here. + (DEP2): And here. + Regenerate dependencies. + * Makefile.in: Regenerate. + +2000-04-19 Michael Sokolov + + * Makefile.am (FLEX, LEX): Get them from configure. + + * as.h (SEEK_SET): Define if undefined. + +2000-04-09 Nick Clifton + + * Makefile.am (CPU_TYPES): Add 'avr'. + (TARGET_CPU_CFILES): Add 'tc-avr.c'. + (TARGET_CPU_HFILES): Add 'tc-avr.h'. + 2000-04-05 Alexandre Oliva * config/tc-sparc.c (sparc_ip): Avoid string pasting. diff --git a/gas/Makefile.am b/gas/Makefile.am index cefb86e04b5..49b52f73a9c 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -9,8 +9,8 @@ SUBDIRS = doc po tooldir = $(exec_prefix)/$(target_alias) -YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi` -LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi` +YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` +LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi` MKDEP = gcc -MM @@ -38,6 +38,7 @@ CPU_TYPES = \ alpha \ arc \ arm \ + avr \ d10v \ d30v \ fr30 \ @@ -119,12 +120,23 @@ CPU_OBJ_VALID = \ esac ;; \ esac; -# This is like CPU_OBJ_VALID, for the obj=multi case. +# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. -CPU_MULTI_VALID = \ +MULTI_CPU_TYPES = i386 mips + +MULTI_CPU_OBJ_VALID = \ valid= ; \ - case $$c in \ - i386 | mips) valid=yes ;; \ + case $$o in \ + aout) \ + case $$c in \ + i386) valid=yes ;; \ + esac ;; \ + coff) valid=yes ;; \ + ecoff) \ + case $$c in \ + mips) valid=yes ;; \ + esac ;; \ + elf) valid=yes ;; \ esac; # Regular source files. @@ -196,6 +208,7 @@ TARGET_CPU_CFILES = \ config/tc-alpha.c \ config/tc-arc.c \ config/tc-arm.c \ + config/tc-avr.c \ config/tc-d10v.c \ config/tc-d30v.c \ config/tc-fr30.c \ @@ -231,6 +244,7 @@ TARGET_CPU_HFILES = \ config/tc-alpha.h \ config/tc-arc.h \ config/tc-arm.h \ + config/tc-avr.h \ config/tc-d10v.h \ config/tc-d30v.h \ config/tc-fr30.h \ @@ -757,19 +771,15 @@ DEPTC: $(TARGET_CPU_CFILES) echo 'DEPTC_hppa_som = $$(srcdir)/config/tc-hppa.h subsegs.h \' >> DEPTCA echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ - echo '$$(DEPTC_'"$${c}"'_coff) \' >> DEPTCA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPTC_'"$${c}"'_ecoff) \' >> DEPTCA; \ + echo '$$(DEPTC_'"$${c}_$${o}"') \' >> DEPTCA; \ else true; fi; \ - echo '$$(DEPTC_'"$${c}"'_elf)' >> DEPTCA; \ - else true; fi; \ + done; \ + echo '' >> DEPTCA; \ done mv -f DEPTCA DEPTC @@ -800,19 +810,15 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPOBJA echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ - echo '$$(DEPOBJ_'"$${c}"'_coff) \' >> DEPOBJA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPOBJ_'"$${c}"'_ecoff) \' >> DEPOBJA; \ + echo '$$(DEPOBJ_'"$${c}_$${o}"') \' >> DEPOBJA; \ else true; fi; \ - echo '$$(DEPOBJ_'"$${c}"'_elf)' >> DEPOBJA; \ - else true; fi; \ + done; \ + echo '' >> DEPOBJA; \ done mv -f DEPOBJA DEPOBJ @@ -835,19 +841,15 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) done; \ done echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ - echo '$$(DEP_'"$${c}"'_coff) \' >> DEP2a; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}"'_ecoff) \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ else true; fi; \ - echo '$$(DEP_'"$${c}"'_elf)' >> DEP2a; \ - else true; fi; \ + done; \ + echo '' >> DEP2a; \ done mv -f DEP2a DEP2 @@ -986,6 +988,14 @@ DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(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-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ @@ -1292,7 +1302,8 @@ DEPTC_z8k_elf = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ $(BFDDIR)/som.h -DEPTC_i386_multi = $(DEPTC_i386_coff) $(DEPTC_i386_elf) +DEPTC_i386_multi = $(DEPTC_i386_aout) $(DEPTC_i386_coff) \ + $(DEPTC_i386_elf) DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ @@ -1341,6 +1352,14 @@ DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(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-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ + subsegs.h +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(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-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ @@ -1616,7 +1635,8 @@ DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -DEPOBJ_i386_multi = $(DEPOBJ_i386_coff) $(DEPOBJ_i386_elf) +DEPOBJ_i386_multi = $(DEPOBJ_i386_aout) $(DEPOBJ_i386_coff) \ + $(DEPOBJ_i386_elf) DEPOBJ_mips_multi = $(DEPOBJ_mips_coff) $(DEPOBJ_mips_ecoff) \ $(DEPOBJ_mips_elf) DEP_a29k_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ @@ -1648,6 +1668,11 @@ DEP_arm_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ DEP_arm_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-arm.h +DEP_avr_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h +DEP_avr_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-avr.h DEP_d10v_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h DEP_d10v_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ @@ -1831,7 +1856,8 @@ DEP_z8k_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-z8k.h DEP_hppa_som = $(BFDDIR)/som.h -DEP_i386_multi = $(DEP_i386_coff) $(DEP_i386_elf) +DEP_i386_multi = $(DEP_i386_aout) $(DEP_i386_coff) \ + $(DEP_i386_elf) DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) $(OBJS): $(DEP_@target_cpu_type@_@obj_format@) diff --git a/gas/Makefile.in b/gas/Makefile.in index e4b806546c1..569b98eb535 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -113,8 +113,8 @@ SUBDIRS = doc po tooldir = $(exec_prefix)/$(target_alias) -YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi` -LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi` +YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` +LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi` MKDEP = gcc -MM @@ -142,6 +142,7 @@ CPU_TYPES = \ alpha \ arc \ arm \ + avr \ d10v \ d30v \ fr30 \ @@ -226,12 +227,23 @@ CPU_OBJ_VALID = \ esac; -# This is like CPU_OBJ_VALID, for the obj=multi case. +# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. -CPU_MULTI_VALID = \ +MULTI_CPU_TYPES = i386 mips + +MULTI_CPU_OBJ_VALID = \ valid= ; \ - case $$c in \ - i386 | mips) valid=yes ;; \ + case $$o in \ + aout) \ + case $$c in \ + i386) valid=yes ;; \ + esac ;; \ + coff) valid=yes ;; \ + ecoff) \ + case $$c in \ + mips) valid=yes ;; \ + esac ;; \ + elf) valid=yes ;; \ esac; @@ -306,6 +318,7 @@ TARGET_CPU_CFILES = \ config/tc-alpha.c \ config/tc-arc.c \ config/tc-arm.c \ + config/tc-avr.c \ config/tc-d10v.c \ config/tc-d30v.c \ config/tc-fr30.c \ @@ -342,6 +355,7 @@ TARGET_CPU_HFILES = \ config/tc-alpha.h \ config/tc-arc.h \ config/tc-arm.h \ + config/tc-avr.h \ config/tc-d10v.h \ config/tc-d30v.h \ config/tc-fr30.h \ @@ -647,6 +661,16 @@ DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h + +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(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-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h + DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ @@ -1024,7 +1048,9 @@ DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ $(BFDDIR)/som.h -DEPTC_i386_multi = $(DEPTC_i386_coff) $(DEPTC_i386_elf) +DEPTC_i386_multi = $(DEPTC_i386_aout) $(DEPTC_i386_coff) \ + $(DEPTC_i386_elf) + DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) @@ -1086,6 +1112,16 @@ DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ + subsegs.h + +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(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-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h + DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ @@ -1432,7 +1468,9 @@ DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -DEPOBJ_i386_multi = $(DEPOBJ_i386_coff) $(DEPOBJ_i386_elf) +DEPOBJ_i386_multi = $(DEPOBJ_i386_aout) $(DEPOBJ_i386_coff) \ + $(DEPOBJ_i386_elf) + DEPOBJ_mips_multi = $(DEPOBJ_mips_coff) $(DEPOBJ_mips_ecoff) \ $(DEPOBJ_mips_elf) @@ -1476,6 +1514,13 @@ DEP_arm_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-arm.h +DEP_avr_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h + +DEP_avr_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-avr.h + DEP_d10v_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h @@ -1728,7 +1773,9 @@ DEP_z8k_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h DEP_hppa_som = $(BFDDIR)/som.h -DEP_i386_multi = $(DEP_i386_coff) $(DEP_i386_elf) +DEP_i386_multi = $(DEP_i386_aout) $(DEP_i386_coff) \ + $(DEP_i386_elf) + DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) @@ -2456,19 +2503,15 @@ DEPTC: $(TARGET_CPU_CFILES) echo 'DEPTC_hppa_som = $$(srcdir)/config/tc-hppa.h subsegs.h \' >> DEPTCA echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ - echo '$$(DEPTC_'"$${c}"'_coff) \' >> DEPTCA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPTC_'"$${c}"'_ecoff) \' >> DEPTCA; \ + echo '$$(DEPTC_'"$${c}_$${o}"') \' >> DEPTCA; \ else true; fi; \ - echo '$$(DEPTC_'"$${c}"'_elf)' >> DEPTCA; \ - else true; fi; \ + done; \ + echo '' >> DEPTCA; \ done mv -f DEPTCA DEPTC @@ -2499,19 +2542,15 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPOBJA echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ - echo '$$(DEPOBJ_'"$${c}"'_coff) \' >> DEPOBJA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPOBJ_'"$${c}"'_ecoff) \' >> DEPOBJA; \ + echo '$$(DEPOBJ_'"$${c}_$${o}"') \' >> DEPOBJA; \ else true; fi; \ - echo '$$(DEPOBJ_'"$${c}"'_elf)' >> DEPOBJA; \ - else true; fi; \ + done; \ + echo '' >> DEPOBJA; \ done mv -f DEPOBJA DEPOBJ @@ -2534,19 +2573,15 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) done; \ done echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ - echo '$$(DEP_'"$${c}"'_coff) \' >> DEP2a; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}"'_ecoff) \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ else true; fi; \ - echo '$$(DEP_'"$${c}"'_elf)' >> DEP2a; \ - else true; fi; \ + done; \ + echo '' >> DEP2a; \ done mv -f DEP2a DEP2 diff --git a/gas/as.h b/gas/as.h index 2106b339ab1..c8d37879d40 100644 --- a/gas/as.h +++ b/gas/as.h @@ -211,6 +211,10 @@ extern char **environ; #define EXIT_FAILURE 1 #endif +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif + #define obstack_chunk_alloc xmalloc #define obstack_chunk_free xfree