Add support for the Infineon XC16X.

* readelf.c (get_machine_flags): Add logic for missing EF_SH flags.

* elf32-ppc.c (allocate_dynrelocs): Tweak undef weak handling.
* elf64-ppc.c (allocate_dynrelocs): Likewise.

* cygpath.cc (get_long_name): Load GetLongPathNameA instead of incorrect
GetLongPathName.
(doit): Create mixed filename after converting to short or long pathname
respectively.

* ps.cc (main): Set aflag if -p option is given.

PR ld/2218
* elf64-ppc.c (allocate_dynrelocs): Ensure undef weak sym is
dynamic.
(ppc64_elf_relocate_section): Check output reloc section size.
* elf32-ppc.c (allocate_dynrelocs): Simplify undef weak test.

*** empty log message ***

daily update

2006-02-16  Jeff Johnston  <jjohnstn@redhat.com>

        * libc/sys/linux/aio.c: Define _GNU_SOURCE so struct aioinit
        will be defined.
        * libc/sys/linux/sys/types.h: Move <sys/config.h> ahead of
        <features.h> to preset special flags.

* cygwin.din: Export sigignore and sigset.
* exceptions.cc (sigset): New function.
(sigignore): New function.
* include/cygwin/signal.h (SIG_HOLD): Define.
(sigignore): Declare.
(sigset): Declare.
* include/cygwin/version.h: Bump API minor number to 154.

2006-02-16  H.J. Lu  <hongjiu.lu@intel.com>

PR ld/2322
* elf.c (get_segment_type): New function.
(_bfd_elf_print_private_bfd_data): Use it.
(print_segment_map): New function.
(assign_file_positions_for_segments): Call print_segment_map
when there are not enough room for program headers.

* ps.cc (longopts): Add --process option.
(opts): Add -p option.
(usage): Mention -p/--process option.
(main): Handle -p option.
* utils.sgml: Describe -p/--process option.

bfd:
* config.bfd (mips*el-*-netbsd*, mips*-*-netbsd*): Use
traditional MIPS ELF targets.

gas:
* configure.tgt: set emulation for mips-*-netbsd*

ld:
* configure.tgt (mips*el-*-netbsd*, mips*-*-netbsd*):
Use the traditional target.

*** empty log message ***

daily update

2006-02-15  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/2338
* dwarf2.c (check_function_name): New function.
(_bfd_dwarf2_find_nearest_line): Use check_function_name to
check if function is correct.

minor comment restructuring

minor comment restructuring

2006-02-15  Paul Brook  <paul@codesourcery.com>

* arm-tdep.c (arm_skip_prologue, thumb_get_next_pc, arm_get_next_pc):
Load insn opcodes as unsigned values.

* linux-low.c (regsets_store_inferior_registers): Read the regset
from the target before filling it.

* elflink.c (_bfd_elf_default_action_discarded): Return 0 for
debug sections.
(elf_link_input_bfd): Adjust comments.

* regtool.cc (usage): Clarify help for "-K".

* libc/include/sys/time.h (struct timeval): Change member types
according to SUSv3.
* libc/include/sys/types.h (useconds_t): Change to unsigned
according to SUSv3.
(suseconds_t): Define type.

*** empty log message ***

daily update

Update copyright notice

* doublest.h (DOUBLEST): Use long double only if we can scan
it in.  Undefine HAVE_LONG_DOUBLE otherwise.
(DOUBLEST_FORMAT): New.
* c-exp.y (parse_number): Use it.
* jv-exp.y (parse_number): Likewise.
* objc-exp.y (parse_number): Likewise.
* p-exp.y (parse_number): Likewise.
* varobj.c (free_variable): Silence type-punning warnings.
* tui/tui-data.h (struct tui_list): Change type of list member.
* tui/tui-data.c: Remove no-longer-needed type casts.
(source_windows): Silence type-punning warnings.
* tui/tui-stack.c, tui/tui-win.c, tui/tui-winsource.c: Likewise.

Fix PR breakpoints/2080.
* i386-tdep.c (struct i386_frame_cache): Add stack_align member.
(i386_analyze_stack_align): New function.
(i386_analyze_prologue): Use i386_analyze_stack_align.
(i386_frame_cache): Deal with stack realignment.

2006-02-14  Paolo Bonzini  <bonzini@gnu.org>

Sync from gcc:

2006-01-31  Richard Guenther  <rguenther@suse.de>
    Paolo Bonzini  <bonzini@gnu.org>

        * Makefile.def (target_modules): Add libgcc-math target module.
        * configure.in (target_libraries): Add libgcc-math target library.
        (--enable-libgcc-math): New configure switch.
        * Makefile.in: Re-generate.
        * configure: Re-generate.
        * libgcc-math: New toplevel directory.

2006-01-18  Richard Henderson  <rth@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
            Diego Novillo  <dnovillo@redhat.com>

        * libgomp: New directory.
        * Makefile.def: Add target_module libgomp.
        * Makefile.in: Regenerate.
        * configure.in (target_libraries): Add target-libgomp.
        * configure: Regenerate.

2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
    Andreas Schwab  <schwab@suse.de>

* configure: Regenerate.

config:
2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
            Andreas Schwab  <schwab@suse.de>

        * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name.
(ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1.

Use more functions from gdb-ui.el.
(gdb-break-list-regexp): Match "what" field if present.
(gdb-stack-list-frames-regexp): Match "from" field if present.
(gdb-stack-list-frames-handler): Present output like "info
breakpoints" so regexps can be shared with gdb-ui

*** empty log message ***

gas/
* config.in: Rebuilt.
binutils/
* config.in: Rebuilt.

* config/tc-xtensa.c (xg_add_opcode_fix): Number operands starting
from 1, not 0, in error messages.
(md_assemble): Simplify special-case check for ENTRY instructions.
(tinsn_has_invalid_symbolic_operands): Do not include opcode and
operand in error message.

*** empty log message ***

daily update

* gdb.arch/i386-prologue.exp: Add testcase for PR breakpoints/2080.

* include/mntent.h: Add missing #include.

* gentls_offsets: Fix typo in error message.

gdb/testsuite/ChangeLog:
2006-02-13  Jim Blandy  <jimb@redhat.com>

* gdb.base/scope.exp (test_at_main): Remove logic to handle the
case where it takes two "next" commands to skip past the init
call.

2006-02-13  Jeff Johnston  <jjohnstn@redhat.com>
            David Carne  <davidcarne@gmail.com>

        * libc/string/strndup_r.c (_strndup_r): Use strnlen logic
        instead of strlen to determine number of bytes to copy.
        * libc/string/strnlen.c (strnlen): Fix so check for max limit occurs
        before looking at storage location.

gas:
* configure.tgt (arm-*-linux-gnueabi*): Change to
arm-*-linux-*eabi*.

ld:
* configure.tgt (arm*b-*-linux-gnueabi): Change to
arm*b-*-linux-*eabi.
(arm*-*-linux-gnueabi): Change to arm*-*-linux-*eabi.

2006-02-13  Earnie Boyd  <earnie@users.sf.net>

* Makefile.in (libmsvcr80.a): Add import lib.
(libmsvcr80d.a): Ditto.

Reviewed and approved by Jim Blandy

2006-02-12  Fred Fish  <fnf@specifix.com>
* gdb.base/scope.exp (test_at_main): Use gdb_test_multiple
to handle cases where it takes two "next" commands to skip
past the init call.

* gdbint.texinfo (Watchpoints): Delete
        TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT.

*** empty log message ***

daily update

2006-02-12  H.J. Lu  <hongjiu.lu@intel.com>

* gas/i386/x86-64-crx-suffix.d: Undo the last change.

merge from gcc

*** empty log message ***

daily update

gas/testsuite/

2006-02-11  H.J. Lu  <hongjiu.lu@intel.com>

* gas/i386/i386.exp: Add "x86-64-drx" and "x86-64-drx-suffix".

* gas/i386/x86-64-crx-suffix.d: Minor update.

* gas/i386/x86-64-drx-suffix.d: New file.
* gas/i386/x86-64-drx.d: Likewise.
* gas/i386/x86-64-drx.s: Likewise.

opcodes/

2006-02-11  H.J. Lu  <hongjiu.lu@intel.com>

* i386-dis.c (dis386_twobyte): Use "movZ" for debug register
moves.

gas/testsuite/

2006-02-11  H.J. Lu  <hongjiu.lu@intel.com>

* gas/i386/i386.exp: Add "x86-64-crx" and "x86-64-crx-suffix".

* gas/i386/x86-64-crx-suffix.d: New file.
* gas/i386/x86-64-crx.d: Likewise.
* gas/i386/x86-64-crx.s: Likewise.

opcodes/

2006-02-11  H.J. Lu  <hongjiu.lu@intel.com>

* i386-dis.c ('Z'): Add a new macro.
(dis386_twobyte): Use "movZ" for control register moves.

* fhandler_process.cc (format_process_stat): Use cygwin-derived start time even
on NT since it is the logical start time of the "process".
* pinfo.cc (set_myself): Don't set start time when it should have already been
set previously.

revert previously applied patch.

* times.cc (clock_getres): Use correct conversion from milliseconds to
seconds/nanoseconds.
(clock_setres): Use correct conversion to nanoseconds.

*** empty log message ***

daily update

* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire".  Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h".  Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise.  Pass an exception set to select.  Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c.  Add exception condition support.  Use serial_for_fd
and serial_wait_handle.  Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.

* Makefile.in (mingw-hdep.o, posix-hdep.o): New dependencies.
(ALLDEPFILES): Add mingw-hdep.c and posix-hdep.c.
* configure.ac: Add gdb_host_obs to CONFIG_OBS.  Set gdb_host_obs
to posix-hdep.o by default.
* configure: Regenerated.
* configure.host: Document gdb_host_obs.  Add an entry for
i[34567]86-*-mingw32*.
* mingw-hdep.c, posix-hdep.c: New files.
* utils.c (safe_strerror): Remove, moved to posix-hdep.o.

    * defs.h (gdb_osabi): New enum value GDB_OSABI_AIX.
        * osabi.c (gdb_osabi_name): Add name of new value GDB_OSABI_AIX.
        * rs6000-tdep.h: New file.
        * rs6000-tdep.c: Include "rs6000-tdep.h".
        (rs6000_gdbarch_init): Remove enabling of software single step.
        Will be done in the AIX-specific initialization routine.
        * rs6000-aix-tdep.c: New file.
        * config/powerpc/aix.mt (TDEPFILES): Add rs6000-aix-tdep.o.
        * Makefile.in (rs6000_tdep_h): New variable.
        (rs6000-tdep.o): Update dependencies.
        (rs6000-aix-tdep.o): New rule.

    * aix-thread.c (_initialize_aix_thread): Use add_setshow_boolean_cmd
        instead of add_setshow_zinteger_cmd to defined the aix-thread
        boolean setting.

* external.cc (sync_winenv): Rename from "setup_winenv".  Use same mechanism as
spawn to determine environment variables which should be converted back to
windows form.
(cygwin_internal): Reflect setup_winenv -> sync_winenv name change.
* include/sys/cygwin.h: Ditto.

2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>

* elf.c (copy_private_bfd_data): Minor update.

bfd/

2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/2258
* elf.c (copy_private_bfd_data): Renamed to ...
(rewrite_elf_program_header): This.
(copy_elf_program_header): New function.
(copy_private_bfd_data): Likewise.

binutils/

2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/2258
* readelf.c (process_program_headers): Use
ELF_IS_SECTION_IN_SEGMENT_MEMORY.

include/elf/

2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>

PR binutils/2258
* internal.h (ELF_IS_SECTION_IN_SEGMENT_FILE): New.
(ELF_IS_SECTION_IN_SEGMENT_MEMORY): Likewise.

(check_range): Ensure that the sign bit of a 32-bit value is propagated into
the upper bits of a 64-bit long.

Fix casts to allow for a 64-bit host.

Fix %hi() operator for 64-bit hosts.

Update to reflect changes in Emacs 22.0.50.

*** empty log message ***

(GDB/MI Breakpoint Table Commands): Add fullname and
times fields where needed.  Fix typos.  Update general form given
for output of -break-insert.
(GDB/MI): Abbreviate some unnecessarily long fullnames.

*** empty log message ***

* config/tc-xtensa.c (xg_assembly_relax): Increment steps_taken for
each relaxation step.

*** empty log message ***

daily update

Add missing ChangeLog entries.

* dwarf2read.c (struct dwarf2_per_cu_data): Reduce length to
30 bits.  Add load_all_dies flag.
(load_partial_dies): Load all DIEs if per_cu->load_all_dies is set.
Load DW_TAG_member by default.  Remove internal_error call.
(find_partial_die): Reload the compilation unit if we can not find
a DIE in the cache.  Call internal_error here if we still can not
find the DIE.

* fhandler_disk_file.cc (fhandler_disk_file::opendir): Only set
the dirent_get_d_ino flag on filesystems having useful File IDs.
Add comment explaining why.

2006-02-09  Eric Botcazou  <ebotcazou@libertysurf.fr>

* configure.in (CHECK_DECLS): Add vsnprintf.
* configure: Regenerate.
* messages.c (errno.h, stdarg.h, varargs.h, va_list):
Do not include/declare here, but...
* as.h: Move code detecting VARARGS idiom to the top.
(errno.h, stdarg.h, varargs.h, va_list): ...here.
(vsnprintf): Declare if not already declared.

* configure.in (CHECK_DECLS): Add snprintf and vsnprintf.
* configure: Regenerate.
* objdump.c (fprintf): Remove declaration.
* bucomm.h (fprintf): Declare if not already declared.
(snprintf): Likewise.
(vsnprintf): Likewise.

(print_one_breakpoint): Add break to case
bp_catch_vfork in switch statement.

*** empty log message ***

*** empty log message ***

2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>

PR ld/2290
* NEWS: Updated for the Linux linker search order change.

* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Call
gld${EMULATION_NAME}_check_ld_so_conf before checking default
search directories for DT_NEEDED entries.

2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>

* as.c (close_output_file): New.
(main): Register close_output_file with xatexit before
dump_statistics. Don't call output_file_close.

*** empty log message ***

daily update

* server.c (attach_inferior): Return SIGTRAP for a successful
attach.

2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>

* readelf.c (process_program_headers): Match PT_TLS segment
only with SHT_TLS sections.

* cygcheck.cc (find_on_path): Update copyright text.

* cygcheck.cc (find_on_path): Create copy of rv on successful access
check, since rv can be reused in subsequent calls.

* config/i386/nm-i386sol2.h: Update copyright year.
        * config/mips/nm-irix5.h: Ditto.
        * config/sparc/nm-sol2.h: Ditto.
        * s390-nat.c: Ditto.
        * ppc-linux-nat.c: Ditto.

* breakpoint.c (TARGET_REGION_OK_FOR_HW_WATCHPOINT): Delete.
* config/i386/nm-i386sol2.h (TARGET_REGION_OK_FOR_HW_WATCHPOINT): New.
(TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT): Delete.
* config/mips/nm-irix5.h (TARGET_REGION_OK_FOR_HW_WATCHPOINT): New.
(TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT): Delete.
* config/sparc/nm-sol2.h (TARGET_REGION_OK_FOR_HW_WATCHPOINT): New.
(TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT): Delete.
* inf-ttrace.c (inf_ttrace_region_ok_for_hw_watchpoint): New.
(inf_ttrace_region_size_ok_for_hw_watchpoint): Delete.
(inf_ttrace_target): Delete to_region_size_ok_for_hw_watchpoint and
add to_region_ok_for_hw_watchpoint.
* s390-nat.c (s390_region_size_ok_for_hw_watchpoint): Delete.
(s390_region_ok_for_hw_watchpoint): New.
(_initialize_s390_nat): Delete to_region_size_ok_for_hw_watchpoint
and add to_region_ok_for_hw_watchpoint.
* target.c (default_region_size_ok_for_hw_watchpoint,
debug_to_region_size_ok_for_hw_watchpoint): Delete prototype.
(update_current_target): Delete to_region_size_ok_for_hw_watchpoint
inheritance and default_region_size_ok_for_hw_watchpoint.
(default_region_ok_for_hw_watchpoint): If len is less than or equal
the length of void pointer, return ok.
(default_region_size_ok_for_hw_watchpoint): Delete.
(debug_to_region_size_ok_for_hw_watchpoint): Delete.
(setup_target_debug): Delete to_region_size_ok_for_hw_watchpoint.
* target.h (struct target_ops): Delete
to_region_size_ok_for_hw_watchpoint.
(TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT): Delete.

* ppc-linux-nat.c (PTRACE_GET_DEBUGREG, PTRACE_SET_DEBUGREG,
PTRACE_GETSIGINFO): Define.
(last_stopped_data_address): New.
(ppc_linux_check_watch_resources): New function.
(ppc_linux_region_ok_for_hw_watchpoint): New function.
(ppc_linux_insert_watchpoint): New function.
(ppc_linux_remove_watchpoint): New function.
(ppc_linux_stopped_data_address): New function.
(ppc_linux_stopped_by_watchpoint): New function.
(_initialize_ppc_linux_nat): Set the above hardware watchpoint
related target vectors.
* rs6000-tdep.c (rs6000_gdbarch_init): Set PPC architectures
to have nonsteppable watchpoint.
* target.c (default_region_ok_for_hw_watchpoint,
debug_to_region_ok_for_hw_watchpoint): New prototypes.
(update_current_target): Inherit to_region_ok_for_hw_watchpoint
and set default to_region_ok_for_hw_watchpoint.
(default_region_ok_for_hw_watchpoint): New function.
(debug_to_region_ok_for_hw_watchpoint): New function.
(setup_target_debug): Set to_region_ok_for_hw_watchpoint of
debug_target.
* target.h (struct target_ops): Add a new target vector
to_region_ok_for_hw_watchpoint.
(TARGET_REGION_OK_FOR_HW_WATCHPOINT): Define this if it is not
defined anyplace else.

tcl/ChangeLog:
* unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_BLOCKING_STYLE): Remove
unmatched single quote inside backticks.
* unix/configure: Rebuild.
tk/ChangeLog:
* unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_BLOCKING_STYLE): Remove
unmatched single quote inside backticks.
* unix/configure: Rebuild.

*** empty log message ***

daily update

    * symfile.c (add_symbol_file_command): Abort if the user forgot
        to provide the address when the file has been loaded.

    * gdb.ada/array_return.exp: Mark the last test as expected to fail
        on hppa32 targets.

* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.

* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here.  Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.

* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.

* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.

* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.

* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.

* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.