From patchwork Mon Sep 26 15:56:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4335 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4EEEC23F6F for ; Mon, 26 Sep 2011 16:00:00 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3B7A4A180F4 for ; Mon, 26 Sep 2011 16:00:00 +0000 (UTC) Received: by fxe23 with SMTP id 23so8532907fxe.11 for ; Mon, 26 Sep 2011 09:00:00 -0700 (PDT) Received: by 10.223.30.151 with SMTP id u23mr1399332fac.122.1317052620971; Mon, 26 Sep 2011 08:57:00 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.234 with SMTP id f10cs42417laf; Mon, 26 Sep 2011 08:57:00 -0700 (PDT) Received: by 10.227.155.84 with SMTP id r20mr901766wbw.107.1317052618990; Mon, 26 Sep 2011 08:56:58 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id ek3si18069080wbb.93.2011.09.26.08.56.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Sep 2011 08:56:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1R8DY7-0005cw-S7; Mon, 26 Sep 2011 16:56:55 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, Paolo Bonzini Subject: [PATCH] softfloat: Reinstate accidentally disabled target-specific NaN handling Date: Mon, 26 Sep 2011 16:56:55 +0100 Message-Id: <1317052615-21607-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Include config.h in softfloat.c, so that the target specific ifdefs in softfloat-specialize.h are evaluated correctly. This was accidentally broken in commit 789ec7ce2 when config-target.h was removed from softfloat.h, and means that most targets will have been returning the wrong results for calculations involving NaNs. Signed-off-by: Peter Maydell --- fpu/softfloat.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 2b20085..3aafa81 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -35,6 +35,11 @@ these four paragraphs for those parts of this code that are retained. =============================================================================*/ +/* softfloat (and in particular the code in softfloat-specialize.h) is + * target-dependent and needs the TARGET_* macros. + */ +#include "config.h" + #include "softfloat.h" /*----------------------------------------------------------------------------