aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog9
-rw-r--r--gas/config/tc-i960.c10
-rw-r--r--gas/config/tc-m32r.c2
-rw-r--r--gas/config/tc-msp430.c2
-rw-r--r--gas/config/tc-z80.c2
-rw-r--r--gas/stabs.c2
6 files changed, 18 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 21450c2..9b6d066 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,14 @@
2016-03-31 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
+ * config/tc-i960.c (parse_expr): Cast to char * when assigning to
+ input_line_pointer.
+ * config/tc-m32r.c (expand_debug_syms): Likewise.
+ * config/tc-msp430.c (msp430_dstoperand): Likewise.
+ * config/tc-z80.c (md_begin): Likewise.
+ * stabs.c (stabs_generate_asm_func): Likewise.
+
+2016-03-31 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
+
* cgen.c: Modernize the way functions declare arguments.
* config/tc-bfin.c: Likewise.
* config/tc-pdp11.c: Likewise.
diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c
index 8a8f31c..45e8a44 100644
--- a/gas/config/tc-i960.c
+++ b/gas/config/tc-i960.c
@@ -450,7 +450,7 @@ static int br_cnt;
/* Name of the table of pointers to branches. A local (i.e.,
non-external) symbol. */
-static void ctrl_fmt (char *, long, int);
+static void ctrl_fmt (const char *, long, int);
void
@@ -495,7 +495,7 @@ md_begin (void)
string is not consumed in the evaluation -- tolerate no dangling junk! */
static void
-parse_expr (char *textP, /* Text of expression to be parsed. */
+parse_expr (const char *textP, /* Text of expression to be parsed. */
expressionS *expP) /* Where to put the results of parsing. */
{
char *save_in; /* Save global here. */
@@ -513,7 +513,7 @@ parse_expr (char *textP, /* Text of expression to be parsed. */
else
{
save_in = input_line_pointer; /* Save global. */
- input_line_pointer = textP; /* Make parser work for us. */
+ input_line_pointer = (char *) textP; /* Make parser work for us. */
(void) expression (expP);
if ((size_t) (input_line_pointer - textP) != strlen (textP))
@@ -558,7 +558,7 @@ emit (long instr) /* Word to be output, host byte order. */
address displacement is greater than 13 bits. */
static void
-get_cdisp (char *dispP, /* Displacement as specified in source instruction. */
+get_cdisp (const char *dispP, /* Displacement as specified in source instruction. */
const char *ifmtP, /* "COBR" or "CTRL" (for use in error message). */
long instr, /* Instruction needing the displacement. */
int numbits, /* # bits of displacement (13 for COBR, 24 for CTRL). */
@@ -1494,7 +1494,7 @@ brlab_next (void)
}
static void
-ctrl_fmt (char *targP, /* Pointer to text of lone operand (if any). */
+ctrl_fmt (const char *targP, /* Pointer to text of lone operand (if any). */
long opcode, /* Template of instruction. */
int num_ops) /* Number of operands. */
{
diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 7621832..89205f8 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -613,7 +613,7 @@ expand_debug_syms (sym_linkS *syms, int align)
{
symbolS *symbolP = syms->symbol;
next_syms = syms->next;
- input_line_pointer = ".\n";
+ input_line_pointer = (char *) ".\n";
pseudo_set (symbolP);
free ((char *) syms);
}
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index ae28984..98910aa 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -2156,7 +2156,7 @@ msp430_dstoperand (struct msp430_operand_s * op,
if (op->am == 2)
{
- char *__tl = "0";
+ char *__tl = (char *) "0";
op->mode = OP_EXP;
op->am = 1;
diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index 2f52814..2e1dca9 100644
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -249,7 +249,7 @@ md_begin (void)
}
}
p = input_line_pointer;
- input_line_pointer = "0";
+ input_line_pointer = (char *) "0";
nul.X_md=0;
expression (& nul);
input_line_pointer = p;
diff --git a/gas/stabs.c b/gas/stabs.c
index 876ffa5..08b8439 100644
--- a/gas/stabs.c
+++ b/gas/stabs.c
@@ -662,7 +662,7 @@ stabs_generate_asm_func (const char *funcname, const char *startlabname)
if (! void_emitted_p)
{
- input_line_pointer = "\"void:t1=1\",128,0,0,0";
+ input_line_pointer = (char *) "\"void:t1=1\",128,0,0,0";
s_stab ('s');
void_emitted_p = 1;
}