/* cond.c - conditional assembly pseudo-ops, and .include
- Copyright 1990, 1991, 1992, 1993, 1995, 1997, 1998, 2000, 2001, 2002,
- 2003 Free Software Foundation, Inc.
+ Copyright (C) 1990-2014 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
GAS is distributed in the hope that it will be useful,
02110-1301, USA. */
#include "as.h"
+#include "sb.h"
#include "macro.h"
#include "obstack.h"
*input_line_pointer = c;
initialize_cframe (&cframe);
-
+
if (cframe.dead_tree)
cframe.ignoring = 1;
else
considered to be undefined. */
is_defined =
symbolP != NULL
- && S_IS_DEFINED (symbolP)
+ && (S_IS_DEFINED (symbolP) || symbol_equated_p (symbolP))
&& S_GET_SEGMENT (symbolP) != reg_section;
cframe.ignoring = ! (test_defined ^ is_defined);
}
else
{
- expression (&operand);
+ expression_and_evaluate (&operand);
if (operand.X_op != O_constant)
as_bad (_("non-constant expression in \".if\" statement"));
}
struct conditional_frame cframe;
initialize_cframe (&cframe);
-
+
if (cframe.dead_tree)
cframe.ignoring = 1;
else
as_bad (_("\".elseif\" after \".else\""));
as_bad_where (current_cframe->else_file_line.file,
current_cframe->else_file_line.line,
- _("here is the previous \"else\""));
+ _("here is the previous \".else\""));
as_bad_where (current_cframe->if_file_line.file,
current_cframe->if_file_line.line,
- _("here is the previous \"if\""));
+ _("here is the previous \".if\""));
}
else
{
/* Leading whitespace is part of operand. */
SKIP_WHITESPACE ();
- expression (&operand);
+ expression_and_evaluate (&operand);
if (operand.X_op != O_constant)
as_bad (_("non-constant expression in \".elseif\" statement"));
}
else if (current_cframe->else_seen)
{
- as_bad (_("duplicate \"else\""));
+ as_bad (_("duplicate \".else\""));
as_bad_where (current_cframe->else_file_line.file,
current_cframe->else_file_line.line,
- _("here is the previous \"else\""));
+ _("here is the previous \".else\""));
as_bad_where (current_cframe->if_file_line.file,
current_cframe->if_file_line.line,
- _("here is the previous \"if\""));
+ _("here is the previous \".if\""));
}
else
{