aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-sh.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index fe934ea..87ff616 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-14 Kaz Kojima <kkojima@rr.iij4u.or.jp>
+
+ * config/tc-sh.c (md_apply_fix3): Add parentheses around &
+ within |.
+
2005-02-13 Jan Beulich <jbeulich@novell.com>
* config/tc-ia64.c (md_parse_option): Handle -xnone and -xdebugn.
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index da02541..d5e9267 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -3904,7 +3904,7 @@ md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
abort();
max = 0x7ffff;
min = -0x80000;
- buf[1] = (buf[1] & 0x0f) | (val >> 12) & 0xf0;
+ buf[1] = (buf[1] & 0x0f) | ((val >> 12) & 0xf0);
buf[2] = (val >> 8) & 0xff;
buf[3] = val & 0xff;
break;
@@ -3914,7 +3914,7 @@ md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
max = 0x7ffff;
min = -0x80000;
shift = 8;
- buf[1] = (buf[1] & 0x0f) | (val >> 20) & 0xf0;
+ buf[1] = (buf[1] & 0x0f) | ((val >> 20) & 0xf0);
buf[2] = (val >> 16) & 0xff;
buf[3] = (val >> 8) & 0xff;
break;