From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 99817 invoked by alias); 30 Mar 2016 01:14:15 -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 99744 invoked by uid 89); 30 Mar 2016 01:14:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=gp, ori, ta X-HELO: paperclip.tbsaunde.org Received: from tbsaunde.org (HELO paperclip.tbsaunde.org) (66.228.47.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 Mar 2016 01:14:00 +0000 Received: from keg.corp.tor1.mozilla.com (unknown [66.207.193.21]) by paperclip.tbsaunde.org (Postfix) with ESMTPSA id 29B03C13E; Wed, 30 Mar 2016 01:07:59 +0000 (UTC) From: tbsaunde+binutils@tbsaunde.org To: binutils@sourceware.org Cc: Trevor Saunders Subject: [PATCH 4/7] cast the arg to md_assemble () to char * Date: Wed, 30 Mar 2016 01:14:00 -0000 Message-Id: <1459300381-19313-5-git-send-email-tbsaunde+binutils@tbsaunde.org> In-Reply-To: <1459300381-19313-1-git-send-email-tbsaunde+binutils@tbsaunde.org> References: <1459300381-19313-1-git-send-email-tbsaunde+binutils@tbsaunde.org> X-IsSubscribed: yes X-SW-Source: 2016-03/txt/msg00405.txt.bz2 From: Trevor Saunders For these targets its not clear how md_assemble can usefully be split up so that part can take const char *. There is also a fair number of targets that need md_assemble () to take a char *, so we can't easily make the argument const. So since there isn't many callers it seems easiest to just add a couple of casts. gas/ChangeLog: 2016-03-29 Trevor Saunders * config/tc-m32c.c (m32c_md_end): cast the argument to md_assemble to char *. (m32c_indirect_operand): Likewise. * config/tc-nds32.c (do_pseudo_b): Likewise. (do_pseudo_bal): Likewise. (do_pseudo_ls_bhw): Likewise. --- gas/config/tc-m32c.c | 8 ++++---- gas/config/tc-nds32.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c index 4b6e353..5496f7e 100644 --- a/gas/config/tc-m32c.c +++ b/gas/config/tc-m32c.c @@ -200,7 +200,7 @@ m32c_md_end (void) /* Pad with nops for objdump. */ n_nops = (32 - ((insn_size) % 32)) / 8; for (i = 1; i <= n_nops; i++) - md_assemble ("nop"); + md_assemble ((char *) "nop"); } } @@ -317,11 +317,11 @@ m32c_indirect_operand (char *str) } if (indirection[1] != none && indirection[2] != none) - md_assemble ("src-dest-indirect"); + md_assemble ((char *) "src-dest-indirect"); else if (indirection[1] != none) - md_assemble ("src-indirect"); + md_assemble ((char *) "src-indirect"); else if (indirection[2] != none) - md_assemble ("dest-indirect"); + md_assemble ((char *) "dest-indirect"); md_assemble (new_str); free (new_str); diff --git a/gas/config/tc-nds32.c b/gas/config/tc-nds32.c index 4c31f43..0d7d346 100644 --- a/gas/config/tc-nds32.c +++ b/gas/config/tc-nds32.c @@ -2202,8 +2202,8 @@ do_pseudo_b (int argc ATTRIBUTE_UNUSED, char *argv[], int pv ATTRIBUTE_UNUSED) { md_assemblef ("sethi $ta,hi20(%s)", arg_label); md_assemblef ("ori $ta,$ta,lo12(%s)", arg_label); - md_assemble ("add $ta,$ta,$gp"); - md_assemble ("jr $ta"); + md_assemble ((char *) "add $ta,$ta,$gp"); + md_assemble ((char *) "jr $ta"); } else { @@ -2223,8 +2223,8 @@ do_pseudo_bal (int argc ATTRIBUTE_UNUSED, char *argv[], int pv ATTRIBUTE_UNUSED) { md_assemblef ("sethi $ta,hi20(%s)", arg_label); md_assemblef ("ori $ta,$ta,lo12(%s)", arg_label); - md_assemble ("add $ta,$ta,$gp"); - md_assemble ("jral $ta"); + md_assemble ((char *) "add $ta,$ta,$gp"); + md_assemble ((char *) "jral $ta"); } else { @@ -2483,7 +2483,7 @@ do_pseudo_ls_bhw (int argc ATTRIBUTE_UNUSED, char *argv[], int pv) /* lw */ md_assemblef ("sethi $ta,hi20(%s)", argv[1]); md_assemblef ("ori $ta,$ta,lo12(%s)", argv[1]); - md_assemble ("lw $ta,[$gp+$ta]"); /* Load address word. */ + md_assemble ((char *) "lw $ta,[$gp+$ta]"); /* Load address word. */ if (addend < 0x10000 && addend >= -0x10000) { md_assemblef ("%c%c%si %s,[$ta+(%d)]", ls, size, sign, argv[0], addend); -- 2.1.4