From owner-svn-src-all@FreeBSD.ORG  Sat Nov 17 23:44:02 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4E91EA03;
 Sat, 17 Nov 2012 23:44:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32D238FC14;
 Sat, 17 Nov 2012 23:44:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAHNi2RQ008824;
 Sat, 17 Nov 2012 23:44:02 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAHNi2Y3008823;
 Sat, 17 Nov 2012 23:44:02 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211172344.qAHNi2Y3008823@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 17 Nov 2012 23:44:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r243200 - stable/7/sys/dev/aic7xxx/aicasm
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 23:44:02 -0000

Author: dim
Date: Sat Nov 17 23:44:01 2012
New Revision: 243200
URL: http://svnweb.freebsd.org/changeset/base/243200

Log:
  MFC r243037:
  
  Fix a bug in aicasm_gram.y, noted by a newer clang 3.2 snapshot: it
  compared an enum scope_type against a yacc-generated define, so the
  condition would always be false.

Modified:
  stable/7/sys/dev/aic7xxx/aicasm/aicasm_gram.y
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/dev/aic7xxx/aicasm/aicasm_gram.y
==============================================================================
--- stable/7/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Sat Nov 17 23:39:36 2012	(r243199)
+++ stable/7/sys/dev/aic7xxx/aicasm/aicasm_gram.y	Sat Nov 17 23:44:01 2012	(r243200)
@@ -1078,7 +1078,7 @@ conditional:
 		last_scope = TAILQ_LAST(&scope_context->inner_scope,
 					scope_tailq);
 		if (last_scope == NULL
-		 || last_scope->type == T_ELSE) {
+		 || last_scope->type == SCOPE_ELSE) {
 
 			stop("'else if' without leading 'if'", EX_DATAERR);
 			/* NOTREACHED */