summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-16 06:51:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-16 06:51:13 +0000
commit68d6999afdf0e9d9d8314f8275eff12cd58edda8 (patch)
treece4f1fee680eed69822d80c504cd07f1ec81a6af /gnu
parent8de0723904eed0ddf7937732c69c38d4627431e1 (diff)
undo expr.c diff; it breaks things. niklas must recheck
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/gas/expr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/usr.bin/gas/expr.c b/gnu/usr.bin/gas/expr.c
index b7131483586..ce68fbd4c5d 100644
--- a/gnu/usr.bin/gas/expr.c
+++ b/gnu/usr.bin/gas/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.3 1998/02/15 18:48:45 niklas Exp $ */
+/* $OpenBSD: expr.c,v 1.4 1998/02/16 06:51:12 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.3 1998/02/15 18:48:45 niklas Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.4 1998/02/16 06:51:12 deraadt Exp $";
#endif
#include <ctype.h>
@@ -523,7 +523,6 @@ 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;
@@ -743,9 +742,7 @@ 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. */