summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-17 12:44:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-17 12:44:17 +0000
commitbe3acfa865364f16dc46c1cf5a74641a8531b252 (patch)
tree73432f2f33d9d066131ad9d5ed9ce5fedd0f26d1
parent6cb9f1c3d3ba95dd1a0d3e3d6f3a0a3658215152 (diff)
this diff is now valid
-rw-r--r--gnu/usr.bin/gas/expr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/usr.bin/gas/expr.c b/gnu/usr.bin/gas/expr.c
index ce68fbd4c5d..fa62c23274a 100644
--- a/gnu/usr.bin/gas/expr.c
+++ b/gnu/usr.bin/gas/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.4 1998/02/16 06:51:12 deraadt Exp $ */
+/* $OpenBSD: expr.c,v 1.5 1998/02/17 12:44:16 deraadt Exp $ */
/* expr.c -operands, expressions-
Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: expr.c,v 1.4 1998/02/16 06:51:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.5 1998/02/17 12:44:16 deraadt Exp $";
#endif
#include <ctype.h>
@@ -523,6 +523,7 @@ register expressionS *expressionP;
|| (expressionP->X_subtract_symbol
&& expressionP->X_add_symbol
&& expressionP->X_subtract_symbol->sy_frag == expressionP->X_add_symbol->sy_frag
+ && SEG_NORMAL (S_GET_SEGMENT (expressionP->X_add_symbol))
&& S_GET_VALUE(expressionP->X_subtract_symbol) == S_GET_VALUE(expressionP->X_add_symbol))) {
expressionP->X_subtract_symbol = NULL;
expressionP->X_add_symbol = NULL;
@@ -742,7 +743,9 @@ segT expr(rank, resultP)
register operatorT op_right;
register char c_right;
+#ifndef __CHAR_UNSIGNED__
know(rank >= 0);
+#endif
(void) operand(resultP);
know(*input_line_pointer != ' '); /* Operand() gobbles spaces. */
c_left = *input_line_pointer; /* Potential operator character. */