From patchwork Wed Aug 14 13:13:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 19113 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0BF52390D for ; Wed, 14 Aug 2013 13:13:10 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e13sf563512vbg.8 for ; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:message-id:subject:from:reply-to:to :cc:date:organization:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=SpJfQ2Rt3VQ+cSeX0L7rZgqimZW+ukGtUjQ6LLwBHzI=; b=i/q64bxSGXjkNeAdCYMHvkzDbHO6SAmXyzcMUkN6A9ueshhFZFYZ23dU5/CPsfN1Du 2SBw2Z+M0l0Zg7ckvv9gI4Gdv4YOKOlEn3Tf2V8TlcyQkFpwjLW1CQvwKldtrzvUdLm4 LM5tqsnF4ys5IPcZPofKesF0xET1W08VRamE3wxhCPiO4cB33lqr3tkkadM/bq6TDa2v Hft4+FKla0VFDOwGGIHP90X7QzXA0bC6nPy8PGLyMYNyeIaza46eDWLWzSQjas3M2Scw RyYRuIg110AGAHpFqloZVNQj59lvd6YbLmJ6Zxoud69hRs5ljRqSzWRwJA063wbG7G8K MWJg== X-Received: by 10.58.188.15 with SMTP id fw15mr2517688vec.9.1376485990488; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.75.228 with SMTP id f4ls1273048qew.12.gmail; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) X-Received: by 10.221.64.17 with SMTP id xg17mr9615567vcb.5.1376485990413; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id n6si10999556ven.79.2013.08.14.06.13.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 06:13:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id h11so7647970vbh.16 for ; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) X-Gm-Message-State: ALoCoQmv2IfNQo7tqp2NUnw0a//BRRaxvuhuYb34rpGSWxQ4FBXm5JeIOZeOxZbZnUZ+47Htb9FO X-Received: by 10.52.165.239 with SMTP id zb15mr46315vdb.44.1376485990322; Wed, 14 Aug 2013 06:13:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp212059vcz; Wed, 14 Aug 2013 06:13:09 -0700 (PDT) X-Received: by 10.194.87.36 with SMTP id u4mr20693wjz.64.1376485988994; Wed, 14 Aug 2013 06:13:08 -0700 (PDT) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id vv5si13980793wjc.49.2013.08.14.06.13.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 06:13:08 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=74.125.82.171; Received: by mail-we0-f171.google.com with SMTP id q55so7724967wes.16 for ; Wed, 14 Aug 2013 06:13:08 -0700 (PDT) X-Received: by 10.194.76.68 with SMTP id i4mr267205wjw.50.1376485988554; Wed, 14 Aug 2013 06:13:08 -0700 (PDT) Received: from [192.168.1.80] ([213.122.173.130]) by mx.google.com with ESMTPSA id iz19sm2969642wic.9.2013.08.14.06.13.07 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Wed, 14 Aug 2013 06:13:07 -0700 (PDT) Message-ID: <1376485986.29998.3.camel@fleetfoot.lan> Subject: Make server build work for release From: Edward Nevill Reply-To: edward.nevill@linaro.org To: aarch64-port-dev@openjdk.java.net Cc: patches@linaro.org Date: Wed, 14 Aug 2013 14:13:06 +0100 Organization: Linaro X-Mailer: Evolution 3.6.4 (3.6.4-3.fc18) Mime-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: edward.nevill@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Hi, The server build only works for fastdebug or slowdebug at the moment due to a misplaced endif. The following patch fixes this. Ed. --- cut here --- # HG changeset patch # User Edward Nevill ed@camswl.com # Date 1376485698 -3600 # Node ID 80e741fc14e2cda15b58ba9190b5910ad52d5ad4 # Parent 2fee62abab5d36bf37a16b43620f7834879b89f3 Make release server build work diff -r 2fee62abab5d -r 80e741fc14e2 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Wed Aug 14 12:18:44 2013 +0100 +++ b/src/cpu/aarch64/vm/aarch64.ad Wed Aug 14 14:08:18 2013 +0100 @@ -974,6 +974,7 @@ st->print("ldr zr, [rscratch1]\n\t"); } } +#endif void MachEpilogNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const { Compile* C = ra_->C; @@ -1025,7 +1026,6 @@ assert(do_polling(), "no return for this epilog node"); return 0; } -#endif --- cut here ---