From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6248 invoked by alias); 3 Jun 2014 07:48:48 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 6234 invoked by uid 89); 3 Jun 2014 07:48:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Jun 2014 07:48:46 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s537mjPw026742 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 3 Jun 2014 03:48:45 -0400 Received: from littlehelper.redhat.com (vpn1-6-66.ams2.redhat.com [10.36.6.66]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s537mhbc017123 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Tue, 3 Jun 2014 03:48:45 -0400 From: Nick Clifton To: binutils@sourceware.org Subject: Commit: GAS: MSP430: Change -mz command line option to -my Date: Tue, 03 Jun 2014 07:48:00 -0000 Message-ID: <87r4361lic.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2014-06/txt/msg00016.txt.bz2 Hi Guys, I am applying the patch below to change the -mz and -mZ command line options of the MSP430 port of GAS into -my and -mY respectively. This is because -mz is already in use by the generic part of gas and so was never received by the msp430 backend. Cheers Nick gas/ChangeLog 2014-06-03 Nick Clifton * config/tc-msp430.c (OPTION_WARN_INTR_NOPS): Use y instead of z. (OPTION_NO_WARN_INTR_NOPS): Use Y instead of Z. * doc/c-msp430.texi: Update command line option description. gas/testsuite/ChangeLog 2014-06-03 Nick Clifton * gas/msp430/bad.d: Use -my not -mz. diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index 2db0fc0..1398b8c 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -673,8 +673,8 @@ static bfd_boolean large_model = FALSE; #define OPTION_NO_INTR_NOPS 'N' #define OPTION_INTR_NOPS 'n' static bfd_boolean gen_interrupt_nops = FALSE; -#define OPTION_WARN_INTR_NOPS 'z' -#define OPTION_NO_WARN_INTR_NOPS 'Z' +#define OPTION_WARN_INTR_NOPS 'y' +#define OPTION_NO_WARN_INTR_NOPS 'Y' static bfd_boolean warn_interrupt_nops = TRUE; #define OPTION_MCPU 'c' #define OPTION_MOVE_DATA 'd' @@ -919,7 +919,7 @@ const pseudo_typeS md_pseudo_table[] = {NULL, NULL, 0} }; -const char *md_shortopts = "mm:,mP,mQ,ml,mN,mn,mz,mZ"; +const char *md_shortopts = "mm:,mP,mQ,ml,mN,mn,my,mY"; struct option md_longopts[] = { @@ -930,8 +930,8 @@ struct option md_longopts[] = {"ml", no_argument, NULL, OPTION_LARGE}, {"mN", no_argument, NULL, OPTION_NO_INTR_NOPS}, {"mn", no_argument, NULL, OPTION_INTR_NOPS}, - {"mZ", no_argument, NULL, OPTION_NO_WARN_INTR_NOPS}, - {"mz", no_argument, NULL, OPTION_WARN_INTR_NOPS}, + {"mY", no_argument, NULL, OPTION_NO_WARN_INTR_NOPS}, + {"my", no_argument, NULL, OPTION_WARN_INTR_NOPS}, {"md", no_argument, NULL, OPTION_MOVE_DATA}, {NULL, no_argument, NULL, 0} }; @@ -955,9 +955,9 @@ md_show_usage (FILE * stream) fprintf (stream, _(" -mn - insert a NOP after changing interrupts\n")); fprintf (stream, - _(" -mZ - do not warn about missing NOPs after changing interrupts\n")); + _(" -mY - do not warn about missing NOPs after changing interrupts\n")); fprintf (stream, - _(" -mz - warn about missing NOPs after changing interrupts (default)\n")); + _(" -my - warn about missing NOPs after changing interrupts (default)\n")); fprintf (stream, _(" -md - Force copying of data from ROM to RAM at startup\n")); } diff --git a/gas/doc/c-msp430.texi b/gas/doc/c-msp430.texi index c539946..cae3d8a 100644 --- a/gas/doc/c-msp430.texi +++ b/gas/doc/c-msp430.texi @@ -61,7 +61,7 @@ disables the generation of a NOP instruction following any instruction that might change the interrupts enabled/disabled state. This is the default behaviour. -@item -mz +@item -my tells the assembler to generate a warning message if a NOP does not immediately forllow an instruction that enables or disables interrupts. This is the default. @@ -70,7 +70,7 @@ Note that this option can be stacked with the @option{-mn} option so that the assembler will both warn about missing NOP instructions and then insert them automatically. -@item -mZ +@item -mY disables warnings about missing NOP instructions. @item -md diff --git a/gas/testsuite/gas/msp430/bad.d b/gas/testsuite/gas/msp430/bad.d index 1a067b5..749759e 100644 --- a/gas/testsuite/gas/msp430/bad.d +++ b/gas/testsuite/gas/msp430/bad.d @@ -1,4 +1,4 @@ #name: Diagnostics Quality #source: bad.s -#as: -mz +#as: -my #error-output: bad.l