diff options
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/Makefile.am | 136 | ||||
| -rw-r--r-- | gas/Makefile.in | 136 |
3 files changed, 6 insertions, 272 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index c76e53e..dded370 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2010-02-05 Joseph Myers <joseph@codesourcery.com> + + * Makefile.am (CPU_TYPES, OBJ_FORMATS, CPU_OBJ_VALID, + MULTI_CPU_TYPES, MULTI_CPU_OBJ_VALID): Remove. + * Makefile.in: Regenerate. + 2010-02-03 Quentin Neill <quentin.neill@amd.com> * config/tc-i386.c (cpu_arch): Change amdfam15 to bdver1. diff --git a/gas/Makefile.am b/gas/Makefile.am index 87fbe3c..92f3b87 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -36,142 +36,6 @@ IT_SRCS=itbl-parse.c itbl-lex.c $(srcdir)/itbl-ops.c IT_DEPS=$(srcdir)/itbl-parse.y $(srcdir)/itbl-lex.l $(srcdir)/config/itbl-@target_cpu_type@.h IT_OBJS=itbl-parse.o itbl-lex.o itbl-ops.o -# CPU types. This is only used for dependency information. - -CPU_TYPES = \ - alpha \ - arc \ - arm \ - avr \ - bfin \ - cr16 \ - cris \ - crx \ - d10v \ - d30v \ - dlx \ - fr30 \ - frv \ - h8300 \ - hppa \ - i370 \ - i386 \ - i860 \ - i960 \ - ia64 \ - ip2k \ - lm32 \ - m32c \ - m32r \ - m68hc11 \ - m68k \ - maxq \ - mcore \ - mep \ - microblaze \ - mips \ - mmix \ - mn10200 \ - mn10300 \ - msp430 \ - mt \ - ns32k \ - openrisc \ - or32 \ - pdp11 \ - pj \ - ppc \ - rx \ - s390 \ - score \ - sh \ - sh64 \ - sparc \ - spu \ - tic30 \ - tic4x \ - tic54x \ - v850 \ - vax \ - xc16x \ - xstormy16 \ - xtensa \ - z80 \ - z8k - -# Object format types. This is only used for dependency information. -# We deliberately omit SOM, since it does not work as a cross assembler. - -OBJ_FORMATS = \ - aout \ - coff \ - ecoff \ - elf \ - evax \ - macho - -# This is an sh case which sets valid according to whether the CPU -# type in the shell variable c and the OS type in the shell variable o -# are supported. This helps cuts down on the amount of dependency -# information. - -CPU_OBJ_VALID = \ - valid= ; \ - case $$o in \ - aout) \ - case $$c in \ - arm | cris | i386 | m68k | ns32k | pdp11 | sparc | tic30 | vax) \ - valid=yes ;; \ - esac ;; \ - coff) \ - case $$c in \ - arm | h8300 | i386 | i960 | m68k | maxq | mcore | mips | or32 \ - | ppc | sh | sparc | tic* | xscale | z80 | z8k) \ - valid=yes ;; \ - esac ;; \ - ecoff) \ - case $$c in \ - mips | alpha) valid=yes ;; \ - esac ;; \ - elf) valid=yes ; \ - case $$c in \ - maxq | ns32k | tic* | z80 | z8k) valid= ;; \ - esac ;; \ - evax) \ - case $$c in \ - alpha) valid=yes ;; \ - esac ;; \ - macho) \ - case $$c in \ - i386) valid=yes ;; \ - esac ;; \ - vms) \ - case $$c in \ - vax) valid=yes ;; \ - esac ;; \ - esac; - -# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. - -MULTI_CPU_TYPES = i386 mips cris - -MULTI_CPU_OBJ_VALID = \ - valid= ; \ - case $$o in \ - aout) \ - case $$c in \ - i386 | cris) valid=yes ;; \ - esac ;; \ - coff) \ - case $$c in \ - i386 | mips) valid=yes ;; \ - esac ;; \ - ecoff) \ - case $$c in \ - mips) valid=yes ;; \ - esac ;; \ - elf) valid=yes ;; \ - esac; # Regular source files. diff --git a/gas/Makefile.in b/gas/Makefile.in index 5e37197..143d404 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -305,142 +305,6 @@ IT_SRCS = itbl-parse.c itbl-lex.c $(srcdir)/itbl-ops.c IT_DEPS = $(srcdir)/itbl-parse.y $(srcdir)/itbl-lex.l $(srcdir)/config/itbl-@target_cpu_type@.h IT_OBJS = itbl-parse.o itbl-lex.o itbl-ops.o -# CPU types. This is only used for dependency information. -CPU_TYPES = \ - alpha \ - arc \ - arm \ - avr \ - bfin \ - cr16 \ - cris \ - crx \ - d10v \ - d30v \ - dlx \ - fr30 \ - frv \ - h8300 \ - hppa \ - i370 \ - i386 \ - i860 \ - i960 \ - ia64 \ - ip2k \ - lm32 \ - m32c \ - m32r \ - m68hc11 \ - m68k \ - maxq \ - mcore \ - mep \ - microblaze \ - mips \ - mmix \ - mn10200 \ - mn10300 \ - msp430 \ - mt \ - ns32k \ - openrisc \ - or32 \ - pdp11 \ - pj \ - ppc \ - rx \ - s390 \ - score \ - sh \ - sh64 \ - sparc \ - spu \ - tic30 \ - tic4x \ - tic54x \ - v850 \ - vax \ - xc16x \ - xstormy16 \ - xtensa \ - z80 \ - z8k - - -# Object format types. This is only used for dependency information. -# We deliberately omit SOM, since it does not work as a cross assembler. -OBJ_FORMATS = \ - aout \ - coff \ - ecoff \ - elf \ - evax \ - macho - - -# This is an sh case which sets valid according to whether the CPU -# type in the shell variable c and the OS type in the shell variable o -# are supported. This helps cuts down on the amount of dependency -# information. -CPU_OBJ_VALID = \ - valid= ; \ - case $$o in \ - aout) \ - case $$c in \ - arm | cris | i386 | m68k | ns32k | pdp11 | sparc | tic30 | vax) \ - valid=yes ;; \ - esac ;; \ - coff) \ - case $$c in \ - arm | h8300 | i386 | i960 | m68k | maxq | mcore | mips | or32 \ - | ppc | sh | sparc | tic* | xscale | z80 | z8k) \ - valid=yes ;; \ - esac ;; \ - ecoff) \ - case $$c in \ - mips | alpha) valid=yes ;; \ - esac ;; \ - elf) valid=yes ; \ - case $$c in \ - maxq | ns32k | tic* | z80 | z8k) valid= ;; \ - esac ;; \ - evax) \ - case $$c in \ - alpha) valid=yes ;; \ - esac ;; \ - macho) \ - case $$c in \ - i386) valid=yes ;; \ - esac ;; \ - vms) \ - case $$c in \ - vax) valid=yes ;; \ - esac ;; \ - esac; - - -# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. -MULTI_CPU_TYPES = i386 mips cris -MULTI_CPU_OBJ_VALID = \ - valid= ; \ - case $$o in \ - aout) \ - case $$c in \ - i386 | cris) valid=yes ;; \ - esac ;; \ - coff) \ - case $$c in \ - i386 | mips) valid=yes ;; \ - esac ;; \ - ecoff) \ - case $$c in \ - mips) valid=yes ;; \ - esac ;; \ - elf) valid=yes ;; \ - esac; - - # Regular source files. GAS_CFILES = \ app.c \ |