gas/ChangeLog

   1 2014-07-04  Alan Modra  <amodra@gmail.com>
   2
   3         * configure.ac: Rename from configure.in.
   4         * Makefile.in: Regenerate.
   5         * config.in: Regenerate.
   6         * doc/Makefile.in: Regenerate.
   7
   8 2014-07-04  Alan Modra  <amodra@gmail.com>
   9
  10         * doc/Makefile.am (CONFIG_STATUS_DEPENDENCIES): Delete.
  11         * doc/Makefile.in: Regenerate.
  12
  13 2014-07-04  Alan Modra  <amodra@gmail.com>
  14
  15         * configure.in: Include bfd/version.m4.
  16         (AC_INIT, AM_INIT_AUTOMAKE): Use modern form.
  17         (BFD_VERSION): Delete.
  18         * configure.com: Get bfd version from bfd/version.m4.
  19         * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in.
  20         * configure: Regenerate.
  21         * Makefile.in: Regenerate.
  22         * doc/Makefile.in: Regenerate.
  23
  24 2014-07-01  Barney Stratford   <barney_stratford@fastmail.fm>
  25             Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
  26             Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
  27             Soundararajan  <Sounderarajan.D@atmel.com>
  28
  29         * config/tc-avr.c (mcu_types): Add avrtiny arch.
  30         Add avrtiny arch devices attiny4, attiny5, attiny9, attiny10, attiny20
  31         and attiny40.
  32         (md_show_usage): Add avrtiny arch in usage message.
  33         (avr_operand): validate and issue error for invalid register for
  34         avrtiny.
  35         add new reloc exp for 16 bit lds/sts instruction.
  36         (md_apply_fix): check 16 bit lds/sts operand for out of range and
  37         encode.
  38         (md_assemble): check ISA for arch and issue diagnostic.
  39         * NEWS: Mention new support.
  40         * doc/c-avr.texi: Document support for avrtiny architecture.
  41
  42 2014-06-27  Alan Modra  <amodra@gmail.com>
  43
  44         * config/obj-macho.c (obj_mach_o_set_symbol_qualifier): Don't set
  45         SYM_MACHO_FIELDS_NOT_VALIDATED after reporting an error.
  46         (obj_mach_o_frob_label): Avoid cascading errors.
  47         (obj_mach_o_frob_symbol): Don't set SYM_MACHO_FIELDS_NOT_VALIDATED.
  48
  49 2014-06-18  DJ Delorie  <dj@redhat.com>
  50
  51         * config/rx-parse.y (BSET, BCLR, BTST, BNOT, BMCMD): Make .B
  52         suffix optional.
  53
  54 2014-06-17  Hans-Peter Nilsson  <hp@bitrange.com>
  55
  56         * config/tc-mmix.c (loc_assert_s): New member frag.
  57         (s_loc): Set it.
  58         (mmix_md_end): If an error is reported for a LOC expression, patch
  59         up the related frag.
  60
  61 2014-06-17  Chris Metcalf  <cmetcalf@tilera.com>
  62
  63         PR gas/16908
  64         * macro.c (buffer_and_nest): Honour #line directives inside
  65         macros.
  66
  67 2014-06-17 Jiong Wang <jiong.wang@arm.com>
  68
  69         * config/tc-arm.c (depr_it_insns): New check for inc/dec sp.
  70
  71 2014-06-17  Hans-Peter Nilsson  <hp@axis.com>
  72
  73         * config/tc-cris.c (cris_bad): New function.
  74         (cris_process_instruction): Where applicable, use it instead of
  75         as_bad.
  76
  77 2014-06-16  Nick Clifton  <nickc@redhat.com>
  78
  79         * config/tc-aarch64.c (md_apply_fix): Ignore unused relocs.
  80
  81 2014-06-16  Jiong Wang  <jiong.wang@arm.com>
  82
  83         * config/tc-aarch64.c (END_OF_INSN): New macro.
  84         (parse_operands): Handle operand given and in wrong format when
  85         operand is optional.
  86
  87 2014-06-16  Alan Modra  <amodra@gmail.com>
  88
  89         * write.h (subsegs_finish): Delete declaration.
  90         * write.c (subsegs_finish): Make static.
  91         (write_object_file): Call subsegs_finish from here.  Don't print
  92         warning and error count here..
  93         * as.c (main): ..do so here instead.  Remove dead code for "no
  94         object file generated".  Split out count strings to better support
  95         internationalisation.  Don't call subsegs_finish. Tidy setting of
  96         "keep_it".  Run write_object_file even after errors.
  97         (keep_it): Make static.
  98         * config/obj-elf.c (elf_frob_symbol): Remove assert.
  99         (elf_frob_file_before_adjust): Likewise.
 100
 101 2014-06-16  Alan Modra  <amodra@gmail.com>
 102
 103         * config/tc-dlx.c (machine_ip): Move initialisation of the_insn
 104         earlier.
 105
 106 2014-06-16  Alan Modra  <amodra@gmail.com>
 107
 108         * config/tc-i386.c (reloc): Don't avoid pcrel check for
 109         BFD_RELOC_SIZE64.  Return NO_RELOC on failing pcrel check.
 110
 111 2014-06-16  Alan Modra  <amodra@gmail.com>
 112
 113         * config/tc-tic6x.c (s_tic6x_ehtype): Clear after frag_more.
 114         (tic6x_output_exidx_entry): Likewise.
 115         (md_apply_fix): Simplify 1 byte md_number_to_chars.
 116
 117 2014-06-16  Alan Modra  <amodra@gmail.com>
 118
 119         * config/tc-tic54x.c (tic54x_mlib): Don't write garbage past
 120         end of archive to temp file.
 121         (tic54x_start_line_hook): Start scan for parallel on next line,
 122         not one char into next line (which may overrun the buffer).
 123
 124 2014-06-16  Alan Modra  <amodra@gmail.com>
 125
 126         * config/tc-vax.c (md_apply_fix): Rewrite.
 127         (tc_gen_reloc, vax_cons, vax_cons_fix_new): Style: Use NO_RELOC
 128         define rather than the equivalent BFD_RELOC_NONE.
 129
 130 2014-06-16  Alan Modra  <amodra@gmail.com>
 131
 132         * config/tc-arm.c (s_arm_elf_cons): Initialise after frag_more.
 133         (md_apply_fix): Delete now unnecessary zeroing for BFD_RELOC_ARM_GOT*
 134         and BFD_RELOC_ARM_TLS* relocs.  Simplify BFD_RELOC_8 case.
 135
 136 2014-06-16  Alan Modra  <amodra@gmail.com>
 137
 138         * config/tc-cris.c (md_create_long_jump): Follow "short" jump
 139         with a nop rather than leaving uninitialised.
 140
 141 2014-06-13  Chen Gang  <gang.chen.5i5j@gmail.com>
 142
 143         * config/tc-score7.c: Replace sprintf with strcpy where
 144         appropriate.
 145         (s7_b32_relax_to_b16): Use symbol_get_frag() to access a symbol's
 146         frag.
 147         * config/tc-score.c (s3_relax_branch_inst16): Likewise.
 148         (s3_relax_cmpbranch_inst32): Likewise.
 149
 150 2014-06-07  Alan Modra  <amodra@gmail.com>
 151
 152         * config/tc-ppc.c (ppc_insert_operand): Handle PPC_OPERAND_SIGNOPT
 153         on unsigned fields.  Comment on PPC_OPERAND_SIGNOPT signed fields
 154         in 64-bit mode.
 155
 156 2014-06-02  Martin Storsjo  <martin@martin.st>
 157
 158         * doc/c-aarch64.texi: Fix the documentation on :pg_hi21:.
 159
 160 2014-06-05  Joel Brobecker  <brobecker@adacore.com>
 161
 162         * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
 163         bfd's development.sh.
 164         * Makefile.in, configure: Regenerate.
 165
 166 2014-06-03  Nick Clifton  <nickc@redhat.com>
 167
 168         * config/tc-msp430.c (OPTION_WARN_INTR_NOPS): Use y instead of z.
 169         (OPTION_NO_WARN_INTR_NOPS): Use Y instead of Z.
 170         * doc/c-msp430.texi: Update command line option description.
 171
 172 2014-05-22  Alan Modra  <amodra@gmail.com>
 173
 174         * listing.c (listing_warning, listing_error): Add space after colon.
 175         * messages.c (as_warn_internal, as_bad_internal): Use the same
 176         string as above.
 177
 178 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 179
 180         * config/tc-mips.c (file_mips_opts_checked): New static global.
 181         (s_module): New static function.
 182         (file_ase): Remove.
 183         (mips_pseudo_table): Add .module handler.
 184         (mips_set_ase): Add opts argument and use instead of mips_opts.
 185         (md_assemble): Use file_mips_check_options.
 186         (md_parse_option): Update to use file_mips_opts instead of mips_opts.
 187         (mips_set_architecture): Delete function.  Moved to...
 188         (mips_after_parse_args): Here.  All logic now applies to
 189         file_mips_opts first and then copies the final state to mips_opts.
 190         Move error checking and defaults inference to mips_check_options and
 191         file_mips_check_options.
 192         (mips_check_options): New static function.  Common option checking for
 193         command line, .module and .set.  Use .module values in error messages
 194         instead of refering to command line options.
 195         (file_mips_check_options): New static function.  A wrapper for
 196         mips_check_options with file_mips_opts.  Updates BFD arch based on
 197         final options.
 198         (s_mipsset): Split into s_mipsset and parse_code_option.  Settings
 199         supported by both .set and .module are moved to parse_code_option.
 200         Warnings and errors are kept in s_mipsset because when
 201         parse_code_option is used with s_module the warnings are deferred
 202         until code is generated.  Any setting supporting 'default' value is
 203         kept in s_mipsset as it is not applicable to s_module. Inferred
 204         settings are also kept in s_mipsset as s_module does not infer any
 205         settings.  Use mips_check_options.
 206         (parse_code_option): New static function derived from s_mipsset.
 207         (s_module): New static function that implements .module.  Allows file
 208         level settings to be changed until code is generated.
 209         (s_cpload, s_cpsetup, s_cplocal): Use file_mips_check_options.
 210         (s_cprestore, s_cpreturn, s_cpadd, mips_address_bytes): Likewise.
 211         (mips_elf_final_processing): Update file_ase to file_mips_opts.ase.
 212         (md_mips_end): Use file_mips_check_options.
 213         * doc/c-mips.texi: Document .module.
 214
 215 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 216
 217         * messages.c (as_warn_internal): Remove extra whitespace from
 218         warning messages.
 219
 220 2014-05-20  Matthew Fortune  <matthew.fortune@imgtec.com>
 221
 222         * config/tc-mips.c (FP64_ASES): Add ASE_MSA.
 223         (mips_after_parse_args): Do not select ASE_MSA without -mfp64.
 224
 225 2014-05-20  Mike Stump  <mikestump@comcast.net>
 226
 227         * messages.c (as_warn_internal): Ensure we don't interleave output
 228         within a single line when make -j is used.
 229         (as_bad_internal): Likewise.
 230
 231 2014-05-20  Richard Sandiford  <rdsandiford@googlemail.com>
 232
 233         * config/obj-elf.h (obj_elf_seen_attribute): Declare.
 234         * config/obj-elf.c (recorded_attribute_info): New structure.
 235         (recorded_attributes): New variable.
 236         (record_attribute, obj_elf_seen_attribute): New functions.
 237         (obj_elf_vendor_attribute): Record which attributes have been seen.
 238
 239 2014-05-20  Nick Clifton  <nickc@redhat.com>
 240
 241         * config/tc-msp430.c (CHECK_RELOC_MSP430): Add OP parameter.
 242         Generate BFD_RELOC_MSP430_ABS_HI16 if vshift is 1.
 243         (msp430_srcoperand): Store vshift value in operand.
 244
 245 2014-05-19  Nick Clifton  <nickc@redhat.com>
 246
 247         PR gas/16858
 248         * config/tc-i386.c (md_apply_fix): Improve the detection of code
 249         symbols for 32-bit PE targets.
 250
 251 2014-05-18  Richard Sandiford  <rdsandiford@googlemail.com>
 252
 253         * config/tc-mips.c (md_obj_begin): Delete.
 254         (md_obj_end): Fold into...
 255         (md_mips_end): ...here.  Move to end of file.
 256
 257 2014-05-17  Nick Clifton  <nickc@redhat.com>
 258
 259         PR gas/16946
 260         * config/tc-v850.c (handle_ctoff): Generate an error if called
 261         when using the RH850 ABI.
 262
 263 2014-05-16  Kaushik Phata  <Kaushik.Phatak@kpit.com>
 264
 265         * config/tc-rl78.c (enum options): Add OPTION_32BIT_DOUBLES
 266         and OPTION_64BIT_DOUBLES.
 267         (md_longopts): Add -m32bit-doubles and -m64bit-doubles.
 268         (md_parse_option): Parse -m32bit-doubles and -m64bit-doubles.
 269         (md_show_usage): Show all of the RL78 options.
 270         (rl78_float_cons): New static functions.
 271         (md_pseudo_table): Update handler for "double".
 272         * doc/c-rl78.texi: Document new options.
 273         * doc/as.texinfo: Likewise.
 274
 275 2014-05-13  Matthew Fortune  <matthew.fortune@imgtec.com>
 276
 277         * config/tc-mips.c (mips_set_options): Rename gp32 to gp throughout.
 278         (HAVE_32BIT_GPRS, HAVE_64BIT_GPRS): Remove. Re-implement via GPR_SIZE.
 279         (HAVE_32BIT_FPRS, HAVE_64BIT_FPRS): Remove. Re-implement via FPR_SIZE.
 280         (GPR_SIZE, FPR_SIZE): New macros. Use throughout.
 281
 282 2014-05-08  Matthew Fortune  <matthew.fortune@imgtec.com>
 283
 284         * config/tc-mips.c (md_parse_option): Update missed file_mips_isa
 285         references.
 286
 287 2014-05-08  Matthew Fortune  <matthew.fortune@imgtec.com>
 288
 289         * config/tc-mips.c (mips_set_options): Rename fp32 field to fp.
 290         Update fp32 == 0 to fp == 64 and fp32 == 1 to fp != 64 throughout.
 291         (file_mips_gp32, file_mips_fp32, file_mips_soft_float,
 292         file_mips_single_float, file_mips_isa, file_mips_arch): Merge into
 293         one struct...
 294         (file_mips_opts): Here. New static global. Update throughout.
 295         (mips_opts): Update defaults for gp32 and fp.
 296
 297 2014-05-08  Matthew Fortune  <matthew.fortune@imgtec.com>
 298
 299         * config/tc-mips.c (streq): Define.
 300         (mips_convert_symbolic_attribute): New function.
 301         * config/tc-mips.h (CONVERT_SYMBOLIC_ATTRIBUTE): Define.
 302         (mips_convert_symbolic_attribute): New prototype.
 303
 304 2014-05-02  Max Filippov  <jcmvbkbc@gmail.com>
 305
 306         * config/tc-xtensa.c (md_apply_fix): mark BFD_RELOC_XTENSA_DIFF*
 307         fixups as signed.
 308
 309 2014-05-07  Andrew Bennett  <andrew.bennett@imgtec.com>
 310
 311         * tc-mips.c (ISA_SUPPORTS_MIPS16E): Add mips32r3, mips32r5, mips64r3
 312         and mips64r5.
 313         (ISA_HAS_64BIT_FPRS): Likewise.
 314         (ISA_HAS_ROR): Likewise.
 315         (ISA_HAS_ODD_SINGLE_FPR): Likewise.
 316         (ISA_HAS_MXHC1): Likewise.
 317         (hilo_interlocks): Likewise.
 318         (md_longopts): Likewise.
 319         (ISA_HAS_64BIT_REGS): Add mips64r3 and mips64r5.
 320         (ISA_HAS_DROR): Likewise.
 321         (options): Add OPTION_MIPS32R3, OPTION_MIPS32R5, OPTION_MIPS64R3, and
 322         OPTION_MIPS64R5.
 323         (mips_isa_rev): Add support for mips32r3, mips32r5, mips64r3 and
 324         mips64r5.
 325         (md_parse_option): Likewise.
 326         (s_mipsset): Likewise.
 327         (mips_cpu_info_table): Add entries for mips32r3, mips32r5, mips64r3
 328         and mips64r5.  Also change p5600 entry to be mips32r5.
 329         * configure.in: Add support for mips32r3, mips32r5, mips64r3 and
 330         mips64r5.
 331         * configure: Regenerate.
 332         * doc/c-mips.texi: Document the -mips32r3, -mips32r5, -mips64r3 and
 333         -mips64r5 command line options.
 334         * doc/as.texinfo: Likewise.
 335
 336 2014-04-28  Nick Clifton  <nickc@redhat.com>
 337
 338         PR gas/16858
 339         * config/tc-i386.c (md_apply_fix): Do not adjust value of
 340         pc-relative fixes against weak symbols.
 341
 342 2014-04-26  Alan Modra  <amodra@gmail.com>
 343
 344         * po/POTFILES.in: Regenerate.
 345
 346 2014-04-24  Nick Clifton  <nickc@redhat.com>
 347
 348         * config/tc-arm.c (s_ltorg): Only create a mapping symbol for ELF
 349         based targets.
 350
 351 2014-04-23  Will Newton  <will.newton@linaro.org>
 352
 353         * config/tc-arm.c (s_ltorg): Call make_mapping_symbol
 354         directly instead of mapping_state.
 355
 356 2014-04-23  Andrew Bennett  <andrew.bennett@imgtec.com>
 357
 358         * config/tc-mips.c (options): Add OPTION_XPA and OPTION_NO_XPA.
 359         (md_longopts): Add xpa and no-xpa command line options.
 360         (mips_ases): Add MIPS XPA ASE.
 361         (mips_cpu_info_table): Update p5600 entry to allow the XPA ASE.
 362         * doc/as.texinfo: Document the MIPS XPA command line options.
 363         * doc/c-mips.texi: Document the MIPS XPA command line options,
 364         and assembler directives.
 365
 366 2014-04-22  Sandra Loosemore  <sandra@codesourcery.com>
 367
 368         * config/tc-nios2.c (nios2_consume_arg): Add case for 'E' to
 369         unbreak self-test mode.
 370
 371 2014-04-22  Max Filippov  <jcmvbkbc@gmail.com>
 372
 373         * config/tc-xtensa.c (xtensa_handle_align): record alignment for the
 374         first section frag.
 375
 376 2014-04-22  Christian Svensson  <blue@cmd.nu>
 377
 378         * Makefile.am: Remove openrisc and or32 support.  Add support for or1k.
 379         * configure.in: Likewise.
 380         * configure.tgt: Likewise.
 381         * doc/as.texinfo: Likewise.
 382         * config/obj-coff.h: Likewise.
 383         * config/tc-or1k.c: New file.
 384         * config/tc-or1k.h: New file.
 385         * config/tc-openrisc.c: Delete.
 386         * config/tc-openrisc.h: Delete.
 387         * config/tc-or32.c: Delete.
 388         * config/tc-or32.h: Delete.
 389         * Makefile.in: Regenerate.
 390         * configure: Regenerate.
 391
 392 2014-04-16  Alan Modra  <amodra@gmail.com>
 393
 394         * config/tc-tilegx.h (TC_CONS_FIX_NEW): Add RELOC arg.
 395         * config/tc-tilepro.h (TC_CONS_FIX_NEW): Likewise.
 396
 397 2014-04-10  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 398
 399         * config/tc-avr.c: Add new flag mlink-relax.
 400         (md_show_usage): Add flag and help text.
 401         (md_parse_option): Record whether link relax is turned on.
 402         (relaxable_section): New.
 403         (avr_validate_fix_sub): New.
 404         (avr_force_relocation): New.
 405         (md_apply_fix): Generate DIFF reloc.
 406         (avr_allow_local_subtract): New.
 407
 408         * config/tc-avr.h (TC_LINKRELAX_FIXUP): Define to 0.
 409         (TC_FORCE_RELOCATION): Define.
 410         (TC_FORCE_RELOCATION_SUB_SAME): Define.
 411         (TC_VALIDATE_FIX_SUB): Define.
 412         (avr_force_relocation): Declare.
 413         (avr_validate_fix_sub): Declare.
 414         (md_allow_local_subtract): Define.
 415         (avr_allow_local_subtract): Declare.
 416
 417 2014-04-10  Andrew Bennett  <andrew.bennett@imgtec.com>
 418
 419         * config/tc-mips.c (mips_cpu_info_table): Add P5600
 420         configuation.
 421         * doc/c-mips.texi: Document p5600.
 422
 423 2014-04-09  Nick Clifton  <nickc@redhat.com>
 424
 425         * config/tc-rl78.h (TC_CONS_FIX_NEW): Add RELOC parameter.
 426         * config/tc-z80.h (TC_CONS_FIX_NEW): Discard RELOC parameter.
 427         * config/tc-aarch64.h (TC_CONS_FIX_NEW): Discard RELOC parameter.
 428         * read.c (emit_expr_fix): Mark the r parameter as potentially
 429         unused.
 430
 431 2014-04-09  Alan Modra  <amodra@gmail.com>
 432
 433         * config/tc-ppc.c (warn_476, last_insn, last_seg, last_subseg):
 434         New static vars.
 435         (md_longopts, md_parse_option, md_show_usage): Add --ppc476-workaround.
 436         (ppc_elf_cons_fix_check): New function.
 437         (md_assemble): Set last_insn, last_seg, last_subseg.
 438         (ppc_byte, md_apply_fix): Handle warn_476.
 439         * config/tc-ppc.h (TC_CONS_FIX_CHECK): Define.
 440         (ppc_elf_cons_fix_check): Declare.
 441         * read.c (cons_worker): Invoke TC_CONS_FIX_CHECK.
 442
 443 2014-04-09  Alan Modra  <amodra@gmail.com>
 444
 445         * gas/config/tc-alpha.h (TC_CONS_FIX_NEW): Add RELOC parameter.
 446         * gas/config/tc-arc.c (arc_cons_fix_new): Add reloc parameter.
 447         * gas/config/tc-arc.h (arc_cons_fix_new): Update prototype.
 448         (TC_CONS_FIX_NEW): Add RELOC parameter.
 449         * gas/config/tc-arm.c (cons_fix_new_arm): Similarly
 450         * gas/config/tc-arm.h (cons_fix_new_arm, TC_CONS_FIX_NEW): Similarly.
 451         * gas/config/tc-cr16.c (cr16_cons_fix_new): Similarly.
 452         * gas/config/tc-cr16.h (cr16_cons_fix_new, TC_CONS_FIX_NEW): Similarly.
 453         * gas/config/tc-crx.h (TC_CONS_FIX_NEW): Similarly.
 454         * gas/config/tc-m32c.c (m32c_cons_fix_new): Similarly.
 455         * gas/config/tc-m32c.h (m32c_cons_fix_new, TC_CONS_FIX_NEW): Similarly.
 456         * gas/config/tc-mn10300.c (mn10300_cons_fix_new): Similarly.
 457         * gas/config/tc-mn10300.h (mn10300_cons_fix_new, TC_CONS_FIX_NEW):
 458         Similarly.
 459         * gas/config/tc-ns32k.c (cons_fix_new_ns32k): Similarly.
 460         * gas/config/tc-ns32k.h (cons_fix_new_ns32k): Similarly.
 461         * gas/config/tc-pj.c (pj_cons_fix_new_pj): Similarly.
 462         * gas/config/tc-pj.h (pj_cons_fix_new_pj, TC_CONS_FIX_NEW): Similarly.
 463         * gas/config/tc-rx.c (rx_cons_fix_new): Similarly.
 464         * gas/config/tc-rx.h (rx_cons_fix_new, TC_CONS_FIX_NEW): Similarly.
 465         * gas/config/tc-sh.c (sh_cons_fix_new): Similarly.
 466         * gas/config/tc-sh.h (sh_cons_fix_new, TC_CONS_FIX_NEW): Similarly.
 467         * gas/config/tc-tic54x.c (tic54x_cons_fix_new): Similarly.
 468         * gas/config/tc-tic54x.h (tic54x_cons_fix_new, TC_CONS_FIX_NEW):
 469         Similarly.
 470         * gas/config/tc-tic6x.c (tic6x_cons_fix_new): Similarly.
 471         * gas/config/tc-tic6x.h (tic6x_cons_fix_new, TC_CONS_FIX_NEW):
 472         Similarly.
 473         * gas/config/tc-arc.c (arc_parse_cons_expression): Return reloc.
 474         * gas/config/tc-arc.h (arc_parse_cons_expression): Update proto.
 475         * gas/config/tc-avr.c (exp_mod_data): Make global.
 476         (pexp_mod_data): Delete.
 477         (avr_parse_cons_expression): Return exp_mod_data pointer.
 478         (avr_cons_fix_new): Add exp_mod_data_t pointer param.
 479         (exp_mod_data_t): Move typedef..
 480         * gas/config/tc-avr.h: ..to here.
 481         (exp_mod_data): Declare.
 482         (TC_PARSE_CONS_RETURN_TYPE, TC_PARSE_CONS_RETURN_NONE): Define.
 483         (avr_parse_cons_expression, avr_cons_fix_new): Update prototype.
 484         (TC_CONS_FIX_NEW): Update.
 485         * gas/config/tc-hppa.c (hppa_field_selector): Delete static var.
 486         (cons_fix_new_hppa): Add hppa_field_selector param.
 487         (fix_new_hppa): Adjust.
 488         (parse_cons_expression_hppa): Return field selector.
 489         * gas/config/tc-hppa.h (parse_cons_expression_hppa): Update proto.
 490         (cons_fix_new_hppa): Likewise.
 491         (TC_PARSE_CONS_RETURN_TYPE, TC_PARSE_CONS_RETURN_NONE): Define.
 492         * gas/config/tc-i386.c (got_reloc): Delete static var.
 493         (x86_cons_fix_new): Add reloc param.
 494         (x86_cons): Return got reloc.
 495         * gas/config/tc-i386.h (x86_cons, x86_cons_fix_new): Update proto.
 496         (TC_CONS_FIX_NEW): Add RELOC param.
 497         * gas/config/tc-ia64.c (ia64_cons_fix_new): Add reloc param.  Adjust
 498         calls.
 499         * gas/config/tc-ia64.h (ia64_cons_fix_new): Update prototype.
 500         (TC_CONS_FIX_NEW): Add reloc param.
 501         * gas/config/tc-microblaze.c (parse_cons_expression_microblaze):
 502         Return reloc.
 503         (cons_fix_new_microblaze): Add reloc param.
 504         * gas/config/tc-microblaze.h: Formatting.
 505         (parse_cons_expression_microblaze): Update proto.
 506         (cons_fix_new_microblaze): Likewise.
 507         * gas/config/tc-nios2.c (nios2_tls_ldo_reloc): Delete static var.
 508         (nios2_cons): Return ldo reloc.
 509         (nios2_cons_fix_new): Delete.
 510         * gas/config/tc-nios2.h (nios2_cons): Update prototype.
 511         (nios2_cons_fix_new, TC_CONS_FIX_NEW): Delete.
 512         * gas/config/tc-ppc.c (md_pseudo_table): Remove quad, long, word,
 513         short.  Make llong use cons.
 514         (ppc_elf_suffix): Return BFD_RELOC_NONE rather than BFD_RELOC_UNUSED.
 515         (ppc_elf_cons): Delete.
 516         (ppc_elf_parse_cons): New function.
 517         (ppc_elf_validate_fix): Don't check for BFD_RELOC_UNUSED.
 518         (md_assemble): Use BFD_RELOC_NONE rather than BFD_RELOC_UNUSED.
 519         * gas/config/tc-ppc.h (TC_PARSE_CONS_EXPRESSION): Define
 520         (ppc_elf_parse_cons): Declare.
 521         * gas/config/tc-sparc.c (sparc_cons_special_reloc): Delete static var.
 522         (sparc_cons): Return reloc specifier.
 523         (cons_fix_new_sparc): Add reloc specifier param.
 524         (sparc_cfi_emit_pcrel_expr): Use emit_expr_with_reloc.
 525         * gas/config/tc-sparc.h (TC_PARSE_CONS_RETURN_TYPE): Define.
 526         (TC_PARSE_CONS_RETURN_NONE): Define.
 527         (sparc_cons, cons_fix_new_sparc): Update prototype.
 528         * gas/config/tc-v850.c (hold_cons_reloc): Delete static var.
 529         (v850_reloc_prefix): Use BFD_RELOC_NONE rather than BFD_RELOC_UNUSED.
 530         (md_assemble): Likewise.
 531         (parse_cons_expression_v850): Return reloc.
 532         (cons_fix_new_v850): Add reloc parameter.
 533         * gas/config/tc-v850.h (parse_cons_expression_v850): Update proto.
 534         (cons_fix_new_v850): Likewise.
 535         * gas/config/tc-vax.c (vax_cons_special_reloc): Delete static var.
 536         (vax_cons): Return reloc.
 537         (vax_cons_fix_new): Add reloc parameter.
 538         * gas/config/tc-vax.h (vax_cons, vax_cons_fix_new): Update proto.
 539         * gas/config/tc-xstormy16.c (xstormy16_cons_fix_new): Add reloc param.
 540         * gas/config/tc-xstormy16.h (xstormy16_cons_fix_new): Update proto.
 541         * gas/dwarf2dbg.c (TC_PARSE_CONS_RETURN_NONE): Provide default.
 542         (emit_fixed_inc_line_addr): Adjust exmit_expr_fix calls.
 543         * gas/read.c (TC_PARSE_CONS_EXPRESSION): Return value.
 544         (do_parse_cons_expression): Adjust.
 545         (cons_worker): Pass return value from TC_PARSE_CONS_EXPRESSION
 546         to emit_expr_with_reloc.
 547         (emit_expr_with_reloc): New function handling reloc, mostly
 548         extracted from..
 549         (emit_expr): ..here.
 550         (emit_expr_fix): Add reloc param.  Adjust TC_CONS_FIX_NEW invocation.
 551         Handle reloc.
 552         (parse_mri_cons): Convert to ISO.
 553         * gas/read.h (TC_PARSE_CONS_RETURN_TYPE): Define.
 554         (TC_PARSE_CONS_RETURN_NONE): Define.
 555         (emit_expr_with_reloc): Declare.
 556         (emit_expr_fix): Update prototype.
 557         * gas/write.c (write_object_file): Update TC_CONS_FIX_NEW invocation.
 558
 559 2014-04-03  Ilya Tocar  <ilya.tocar@intel.com>
 560
 561         * config/tc-i386.c (cpu_arch): Add .se1.
 562         * doc/c-i386.texi: Document .se1/se1.
 563
 564 2014-04-02  DJ Delorie  <dj@redhat.com>
 565
 566         * config/tc-rl78.c (md_apply_fix): Add overflow warnings for
 567         pc-relative branches.
 568
 569 2014-04-02  Nick Clifton  <nickc@redhat.com>
 570
 571         PR gas/16765
 572         * config/tc-arm.c (create_unwind_entry): Report an error if an
 573         attempt to recreate an unwind directive is encountered.
 574
 575 2014-03-27  Nick Clifton  <nickc@redhat.com>
 576
 577         * config/tc-score.c (s3_parse_pce_inst): Add "%s" parameter to
 578         sprintf in order to avoid a compile time warning.
 579
 580 2014-03-26  Nick Clifton  <nickc@redhat.com>
 581
 582         * config/tc-rl78.c (rl78_op): Issue an error message if a 16-bit
 583         relocation is used on an 8-bit operand or vice versa.
 584         (tc_gen_reloc): Use the RL78_16U relocation for RL78_CODE.
 585         (md_apply_fix): Add support for RL78_HI8, RL78_HI16 and RL78_LO16.
 586
 587 2014-03-25  Nick Clifton  <nickc@redhat.com>
 588
 589         * config/obj-coff-seh.c (obj_coff_seh_code): New function -
 590         switches the current segment back to the code segment recorded
 591         when seh_proc was last invoked.
 592         * config/obj-coff-seh.h (SEH_CMDS): Add seh_code.
 593
 594 2014-03-25  Alan Modra  <amodra@gmail.com>
 595
 596         * config/tc-ppc.c (ppc_is_toc_sym): Revert 2014-03-05.
 597         (md_assemble): Likewise.  Warn.
 598
 599 2014-03-21  David Weatherford <weath@cadence.com>
 600             Max Filippov <jcmvbkbc@gmail.com>
 601
 602         * config/tc-xtensa.c (xtensa_check_frag_count)
 603         xtensa_create_trampoline_frag,
 604         xtensa_maybe_create_trampoline_frag, init_trampoline_frag,
 605         find_trampoline_seg, search_trampolines, get_best_trampoline,
 606         check_and_update_trampolines, add_jump_to_trampoline,
 607         dump_trampolines): New functions.
 608         (md_parse_option): Add cases for --[no-]trampolines options.
 609         (md_assemble, finish_vinsn, xtensa_end): Add call to
 610         xtensa_check_frag_count.
 611         (xg_assemble_vliw_tokens): Add call to
 612         xtensa_maybe_create_trampoline_frag.
 613         (xtensa_relax_frag): Relax fragments with RELAX_TRAMPOLINE state.
 614         (relax_frag_immed): Relax jump instructions that cannot reach its
 615         target.
 616         * config/tc-xtensa.h (xtensa_relax_statesE::RELAX_TRAMPOLINE): New
 617         relax state.
 618         * doc/as.texinfo: Document --[no-]trampolines command-line options.
 619         * doc/c-xtensa.texi: Document trampolines relaxation and command
 620         line options.
 621         * frags.c (get_frag_count, clear_frag_count): New function.
 622         (frag_alloc): Increment totalfrags counter.
 623         * frags.h (get_frag_count, clear_frag_count): New function.
 624
 625 2014-03-20  DJ Delorie  <dj@redhat.com>
 626
 627         * config/rl78-defs.h (RL78_RELAX_NONE, RL78_RELAX_BRANCH): Add.
 628         * config/rl78-parse.y (BC, BNC, BZ, BNZ, BH, BHZ, bt_bf): Call
 629         rl78_relax().
 630         * config/tc-rl78.h (md_relax_frag): Define.
 631         (rl78_relax_frag): Declare.
 632         * config/tc-rl78.c (rl78_relax): Add.
 633         (md_assemble): Set up the variable frags also when relaxing.
 634         (op_type_T): New.
 635         (rl78_opcode_type): New.
 636         (rl78_frag_fix_value): New.
 637         (md_estimate_size_before_relax): New-ish.
 638         (rl78_relax_frag): New.
 639         (md_convert_frag): New-ish.
 640
 641 2014-03-20  Richard Sandiford  <rdsandiford@googlemail.com>
 642
 643         * config/tc-mips.h (DIFF_EXPR_OK, CFI_DIFF_EXPR_OK): Define.
 644         * config/tc-mips.c (md_pcrel_from): Remove error message.
 645         (md_apply_fix): Convert PC-relative BFD_RELOC_32s to
 646         BFD_RELOC_32_PCREL.  Report a specific error message for unhandled
 647         PC-relative expressions.  Handle BFD_RELOC_8.
 648
 649 2014-03-19  Jose E. Marchesi  <jose.marchesi@oracle.com>
 650
 651         * config/tc-sparc.c (hpriv_reg_table): Added entries for
 652         %hstick_offset and %hstick_enable.
 653         * doc/c-sparc.texi (Sparc-Regs): Document the %hstick_offset and
 654         %hstick_enable hyperprivileged registers.
 655
 656 2014-03-19  Daniel Gutson <daniel.gutson@tallertechnologies.com>
 657             Nick Clifton  <nickc@redhat.com>
 658
 659         * config/tc-arm.c (codecomposer_syntax): New flag that states whether the
 660         CCS syntax compatibility mode is on or off.
 661         (asmfunc_states): New enum to represent the asmfunc directive state.
 662         (asmfunc_state): New variable holding the asmfunc directive state.
 663         (comment_chars): Rename to arm_comment_chars.
 664         (line_separator_chars): Rename to arm_line_separator_chars.
 665         (s_ccs_ref): New function that handles the .ref directive.
 666         (asmfunc_debug): New function.
 667         (s_ccs_asmfunc): New function that handles the .asmfunc directive.
 668         (s_ccs_endasmfunc): New function that handles the .endasmfunc directive.
 669         (s_ccs_def): New function that handles the .def directive.
 670         (tc_start_label_without_colon): New function.
 671         (md_pseudo_table): Added new CCS directives.
 672         (arm_ccs_mode): New function that handles the -mccs command line option.
 673         (arm_long_opts): Added new -mccs command line option.
 674         * config/tc-arm.h (LABELS_WITHOUT_COLONS): New macro.
 675         (TC_START_LABEL_WITHOUT_COLON): New macro.
 676         (tc_start_label_without_colon): Added extern function declaration.
 677         (tc_comment_chars): Define.
 678         (tc_line_separator_chars): Define.
 679         * app.c (do_scrub_begin): Use tc_line_separator_chars, if defined.
 680         * read.c (read_begin): Likewise.
 681         * doc/as.texinfo: Add documentation for the -mccs command line
 682         option.
 683         * doc/c-arm.texi: Likewise.
 684         * doc/internals.texi: Document tc_line_separator_chars.
 685         * NEWS: Mention the new feature.
 686
 687 2014-03-18  Jiong Wang  <jiong.wang@arm.com>
 688
 689         * config/tc-aarch64.c (aarch64_opts): Add new option
 690         "mno-verbose-error".
 691         (verbose_error_p): Initialize to 1.
 692         * doc/c-aarch64.texi (AArch64 Options): Document -mverbose-error
 693         and -mno-verbose-error.
 694
 695 2014-03-17  Nick Clifton  <nickc@redhat.com>
 696
 697         PR gas/16694
 698         * config/tc-arm.c (tc_arm_regname_to_dw2regnum): Parse VFP
 699         registers as well.
 700
 701 2014-03-13  Richard Earnshaw  <rearnsha@arm.com>
 702             Jiong Wang  <Jiong.Wang@arm.com>
 703
 704         * doc/c-aarch64.texi: Clean up some formatting issues.
 705         (AArch64 Options): Document -mcpu and -march.
 706         (AArch64 Extensions): New node.
 707
 708 2014-03-13  Tristan Gingold  <gingold@adacore.com>
 709
 710         * config/tc-i386.c (use_big_obj): Declare.
 711         (OPTION_MBIG_OBJ): Define.
 712         (md_longopts): Add -mbig-obj option.
 713         (md_parse_option): Handle it.
 714         (md_show_usage): Display help for this option.
 715         (i386_target_format): Use bigobj for x86-64 if -mbig-obj.
 716         * doc/c-i386.texi: Document the option.
 717
 718 2014-03-12  Nick Clifton  <nickc@redhat.com>
 719
 720         PR gas/16688
 721         * config/tc-aarch64.c (literal_expression): New structure.
 722         (literal_pool): Replace exp array with literal_expression array.
 723         (add_to_lit_pool): When adding a bignum cache the big value.
 724         (s_ltorg): When emitting a bignum initialise the global bignum
 725         array from the cached value.
 726
 727 2014-03-12  Alan Modra  <amodra@gmail.com>
 728
 729         * Makefile.in: Regenerate.
 730         * config.in: Regenerate.
 731         * doc/Makefile.in: Regenerate.
 732
 733 2014-03-06  Pitchumani Sivanupandi  <pitchumani.s@atmel.com>
 734         Vishnu KS <Vishnu.k_s@atmel.com>
 735         Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 736         Soundararajan <Soundararajan.dhakshinamoorthy@atmel.com>
 737
 738         * gas/tc-avr.c: Add new devices
 739         avr25: ata5272, attiny828
 740         avr35: ata5505, attiny1634
 741         avr4: atmega8a, ata6285, ata6286, atmega48pa
 742         avr5: at90pwm161, ata5790, ata5795, atmega164pa, atmega165pa,
 743         atmega168pa, atmega32a, atmega64rfr2, atmega644rfr2, atmega64a,
 744         atmega16hva2
 745         avr51: atmega128a, atmega1284
 746         avrxmega2: atxmega16a4u, atxmega16c4, atxmega32a4u, atxmega32c4,
 747         atxmega32e5, atxmega16e5, atxmega8e5
 748         avrxmega4: atxmega64a3u, atxmega64a4u, atxmega64b1, atxmega64b3,
 749         atxmega64c3, atxmega64d4
 750         avrxmega6: atxmega128a3u, atxmega128b3, atxmega128c3,
 751         atxmega128d4, atxmega192a3u, atxmega192c3, atxmega256a3u,
 752         atxmega256c3, atxmega384c3, atxmega384d3
 753         avrxmega7: atxmega128a4u
 754         * doc/c-avr.texi: Ditto.
 755
 756 2014-03-05  Alan Modra  <amodra@gmail.com>
 757
 758         Update copyright years.
 759
 760 2014-03-05  Alan Modra  <amodra@gmail.com>
 761
 762         * config/tc-ppc.c (ppc_elf_suffix): Support @localentry.
 763         (md_apply_fix): Support R_PPC64_ADDR64_LOCAL.
 764
 765 2014-03-05  Alan Modra  <amodra@gmail.com>
 766
 767         * config/tc-ppc.c (md_assemble): Move code adjusting reloc types
 768         later.  Merge absolute and relative branch reloc selection.
 769         Generate 16-bit relocs for most 16-bit insn fields given a
 770         non-constant expression.
 771
 772 2014-03-05  Alan Modra  <amodra@gmail.com>
 773
 774         * config/tc-ppc.c (ppc_is_toc_sym): Remove OBJ_ELF support.
 775         (md_assemble): Don't call ppc_is_toc_sym for ELF.
 776
 777 2014-03-04  Heiher  <r@hev.cc>
 778
 779         * config/tc-mips.c (mips_cpu_info_table): Use ISA_MIPS64R2 for
 780         Loongson-3A.
 781
 782 2014-03-03  Nick Clifton  <nickc@redhat.com>
 783
 784         * config/msp430/msp430.c: Replace known mcu array with known
 785         msp430 ISA mcu name array.
 786         Accept any name for -mmcu option.
 787         Add -mz option to warn about missing NOP following an interrupt
 788         status change.
 789         (check_for_nop): New.
 790         (msp430_operands): Emit a warning, if requested, when an interrupt
 791         changing instruction is not followed by a NOP.
 792         * doc/c-msp430.c: Document -mz option.
 793
 794 2014-03-03  Alan Modra  <amodra@gmail.com>
 795
 796         * config/bfin-lex-wrapper.c: Correct copyright date.
 797         * config/obj-fdpicelf.c: Likewise.
 798         * config/obj-fdpicelf.h: Likewise.
 799         * config/tc-frv.c: Correct copyright punctuation.
 800         * config/tc-ip2k.c: Likewise.
 801         * config/tc-iq2000.c: Likewise.
 802         * config/tc-mep.c: Likewise.
 803         * config/tc-tic4x.c: Likewise.
 804         * config/tc-tic4x.h: Likewise.
 805
 806 2014-03-01  Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
 807
 808         * config/tc-avr.c: Remove atxmega16x1.
 809
 810 2014-02-28  Alan Modra  <amodra@gmail.com>
 811
 812         * dwarf2dbg.c (out_debug_line): Correct .debug_line header_length
 813         field for 64-bit dwarf.
 814
 815 2014-02-21  Ilya Tocar  <ilya.tocar@intel.com>
 816
 817         * config/tc-i386.c (cpu_arch): Add .prefetchwt1.
 818         * doc/c-i386.texi: Document .prefetchwt1/prefetchwt1.
 819
 820 2014-02-12  Ilya Tocar  <ilya.tocar@intel.com>
 821
 822         * config/tc-i386.c (cpu_arch): Add .clflushopt, .xsavec, .xsaves.
 823         * doc/c-i386.texi: Document .xsavec/xsavec/.xsaves/xsaves/
 824         clflushopt/.clfushopt.
 825
 826 2014-02-10  Alan Modra  <amodra@gmail.com>
 827
 828         * po/POTFILES.in: Regenerate.
 829         * po/gas.pot: Regenerate.
 830
 831 2014-02-03  Sandra Loosemore  <sandra@codesourcery.com>
 832
 833         * config/tc-nios2.c (md_apply_fix): Test for new relocs.
 834         (nios2_special_reloc): Add %call_lo, %call_hiadj, %got_lo,
 835         %got_hiadj relocation operators.  Sort table and add comment
 836         to explain ordering.
 837         (nios2_fix_adjustable): Test for new relocs.
 838         * doc/c-nios2.texi (Nios II Relocations): Document new relocation
 839         operators.
 840
 841 2014-01-30  Sandra Loosemore  <sandra@codesourcery.com>
 842
 843         * config/tc-nios2.c (md_apply_fix): Handle BFD_RELOC_NIOS2_CALL26_NOAT.
 844         (nios2_assemble_args_m): Likewise.
 845         (md_assemble): Likewise.
 846
 847 2014-01-24  DJ Delorie  <dj@redhat.com>
 848
 849         * config/tc-msp430.c (msp430_section): Always flag data sections,
 850         regardless of -md.
 851         (msp430_frob_section): New.  Make sure all sections are noticed if
 852         they have content.
 853         (msp430_lcomm): New.  Flag bss if .lcomm is seen.
 854         (msp430_comm): New.  Likewise.
 855         (md_pseudo_table): Add them.
 856         * config/tc-msp430.h (msp430_frob_section): Declare.
 857         (tc_frob_section): Define.
 858
 859 2014-01-23  Nick Clifton  <nickc@redhat.com>
 860
 861         * config/tc-msp430.c (show_mcu_list): Delete.
 862         (md_parse_option): Accept any MCU name.  Accept several more
 863         variants for the -mcpu option.
 864         (md_show_usage): Do not call show_mcu_list.
 865
 866 2014-01-22  DJ Delorie  <dj@redhat.com>
 867
 868         * config/tc-msp430.c (msp430_refsym): New: ".refsym <symbol>"
 869         * doc/c-msp430.texi (MSP430 Directives): Document it.
 870
 871 2014-01-22  Michael Zolotukhin  <michael.v.zolotukhin@gmail.com>
 872
 873         * config/tc-i386.c (check_VecOperands): Remove regzmm from AVX2
 874         gather assert.
 875
 876 2014-01-22  Michael Zolotukhin  <michael.v.zolotukhin@gmail.com>
 877
 878         PR gas/16489
 879         * config/tc-i386.c (check_VecOperands): Add check for invalid
 880         register set in AVX512 gathers.
 881
 882 2014-01-22  Alan Modra  <amodra@gmail.com>
 883
 884         * config/tc-tic4x.c (md_shortopts): s/CONST/const/.
 885
 886 2014-01-21  DJ Delorie  <dj@redhat.com>
 887
 888         * config/tc-rl78.c (require_end_of_expr): New.
 889         (md_operand): Call it.
 890         (rl78_cons_fix_new): Mark LO16, HI16, ahd HI8 internal relocations
 891         as not overflowing.
 892
 893 2014-01-17  Will Newton  <will.newton@linaro.org>
 894
 895         * config/tc-arm.c (do_vfp_nsyn_cvt_fpv8): Set OP to 1
 896         for the s32.f64 flavours of VCVT.
 897
 898 2014-01-14  Nick Clifton  <nickc@redhat.com>
 899
 900         PR gas/16434
 901         * config/tc-z80.c (wrong_match): Provide format string to
 902         as_warn.
 903         (parse_exp_not_indexed): Delete unused variable dummy.
 904         (emit_byte): Delete unused variable fixp.
 905
 906 2014-01-08  H.J. Lu  <hongjiu.lu@intel.com>
 907
 908         * config/tc-i386.c (regbnd): Removed.
 909         (vec_disp8): Likewise.
 910
 911 2014-01-08  H.J. Lu  <hongjiu.lu@intel.com>
 912
 913         * as.c (parse_args): Update copyright year to 2014.
 914
 915 2014-01-07  Tom Tromey  <tromey@redhat.com>
 916
 917         * config/tc-tic30.c (debug): Avoid old VA_* compatibility
 918         wrappers.
 919
 920 2014-01-07  Tom Tromey  <tromey@redhat.com>
 921
 922         * config/tc-microblaze.h (parse_cons_expression_microblaze): Don't
 923         use PARAMS.
 924
 925 2014-01-07  Tom Tromey  <tromey@redhat.com>
 926
 927         * config/tc-xc16x.h: Don't use ANSI_PROTOTYPES.
 928
 929 2013-01-07  Philipp Tomsich  <philipp.tomsich@theobroma-systems.com>
 930
 931         * config/tc-aarch64.c (aarch64_cpus): Add entry for "xgene-1"
 932
 933 For older changes see ChangeLog-2013
 934 \f
 935 Copyright (C) 2014 Free Software Foundation, Inc.
 936
 937 Copying and distribution of this file, with or without modification,
 938 are permitted in any medium without royalty provided the copyright
 939 notice and this notice are preserved.
 940
 941 Local Variables:
 942 mode: change-log
 943 left-margin: 8
 944 fill-column: 74
 945 version-control: never
 946 End: