From patchwork Fri Sep 20 16:01:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 20480 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E48D25DFC for ; Fri, 20 Sep 2013 16:01:55 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id lf12sf514454vcb.2 for ; Fri, 20 Sep 2013 09:01:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; 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=Sgmj8pIVEJ0YudfSSEx3QLuKY9sa9bj3ssXay0WNltM=; b=j+BU7sAOt37Sm6xqODLbdbQ9k6JaPeUUWH2/TmCnO+FYNepcVLBmWmS+Mclnh//VjD QG2vp2hty0H6u8y4XB37xtKa/lBhOsvC22eoqaO97GN0A74lUu54zU+95j7R74DwrnCd 3Za0PT+cWn3EncE0Pn68yBKS4JXXZPmipQEbksGpghaDXS22FVdb0DWvZ2Aq2keV2RAg SvMtLS+uIG+OeOdKnariurQEVnjy4T6EVXyZbPPT0wPjAVKhXVOZDwR2rfuRw4Kuy9L0 n9tWm49A40uDUCWIsQVFJoJgy5UeiNFVsfkSQHSfaJCs/H1ZHDrCrs5aK09uklG5zuRr 2dww== X-Gm-Message-State: ALoCoQliIWFaxRHdRLWEzpnqArdnoQ5o7pZi/Vvr4DVpouddzseKwVb2Sf9LFp0M+IeWXHR9P1pX X-Received: by 10.236.75.201 with SMTP id z49mr2900419yhd.0.1379692915095; Fri, 20 Sep 2013 09:01:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.5.9 with SMTP id o9ls307137qeo.49.gmail; Fri, 20 Sep 2013 09:01:55 -0700 (PDT) X-Received: by 10.58.235.193 with SMTP id uo1mr7027966vec.6.1379692915023; Fri, 20 Sep 2013 09:01:55 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id 6si3156981vei.118.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 09:01:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 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.50; Received: by mail-vb0-f50.google.com with SMTP id x14so435518vbb.37 for ; Fri, 20 Sep 2013 09:01:55 -0700 (PDT) X-Received: by 10.220.145.75 with SMTP id c11mr701099vcv.30.1379692914921; Fri, 20 Sep 2013 09:01:54 -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 u4csp25933vcz; Fri, 20 Sep 2013 09:01:54 -0700 (PDT) X-Received: by 10.180.183.51 with SMTP id ej19mr3385257wic.60.1379692913784; Fri, 20 Sep 2013 09:01:53 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id bi9si5223483wjc.121.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 09:01:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=209.85.212.172; Received: by mail-wi0-f172.google.com with SMTP id hn9so7378864wib.17 for ; Fri, 20 Sep 2013 09:01:53 -0700 (PDT) X-Received: by 10.180.198.79 with SMTP id ja15mr3359721wic.36.1379692913322; Fri, 20 Sep 2013 09:01:53 -0700 (PDT) Received: from [192.168.1.140] ([213.122.173.130]) by mx.google.com with ESMTPSA id ey4sm5893800wic.11.1969.12.31.16.00.00 (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 20 Sep 2013 09:01:52 -0700 (PDT) Message-ID: <1379692911.17280.4.camel@localhost.localdomain> Subject: RFR: A couple of build fixes From: Edward Nevill Reply-To: edward.nevill@linaro.org To: aarch64-port-dev@openjdk.java.net Cc: patches@linaro.org Date: Fri, 20 Sep 2013 17:01:51 +0100 Organization: Linaro X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) 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.50 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, Below are fixes for a couple of build problems. 1) make zero cross build work again 2) make self hosted build work on RTSM model. OK to push? Ed. --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1379689177 -3600 # Fri Sep 20 15:59:37 2013 +0100 # Node ID 731e43d74e37ccb378cd52fd426f1c321ed1295f # Parent 7932538a0cc016e721449ede2ca511a953f20e81 Make zero cross compile build work again diff -r 7932538a0cc0 -r 731e43d74e37 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Fri Sep 20 08:39:00 2013 +0100 +++ b/make/linux/makefiles/gcc.make Fri Sep 20 15:59:37 2013 +0100 @@ -239,6 +239,7 @@ DEBUG_CFLAGS/aarch64 = -g DEBUG_CFLAGS/arm = -g DEBUG_CFLAGS/ppc = -g + DEBUG_CFLAGS/zero = -g DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) DEBUG_CFLAGS += -gstabs @@ -250,6 +251,7 @@ FASTDEBUG_CFLAGS/aarch64 = -g FASTDEBUG_CFLAGS/arm = -g FASTDEBUG_CFLAGS/ppc = -g + FASTDEBUG_CFLAGS/zero = -g FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) FASTDEBUG_CFLAGS += -gstabs @@ -260,6 +262,7 @@ OPT_CFLAGS/aarch64 = -g OPT_CFLAGS/arm = -g OPT_CFLAGS/ppc = -g + OPT_CFLAGS/zero = -g OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) OPT_CFLAGS += -gstabs diff -r 7932538a0cc0 -r 731e43d74e37 src/cpu/zero/vm/globals_zero.hpp --- a/src/cpu/zero/vm/globals_zero.hpp Fri Sep 20 08:39:00 2013 +0100 +++ b/src/cpu/zero/vm/globals_zero.hpp Fri Sep 20 15:59:37 2013 +0100 @@ -57,6 +57,12 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread +#ifdef AARCH64 +// This is declared as _pd for AARCH64 only in globals.hpp +// so must match with definition here. +define_pd_global(bool, UseBiasedLocking, false); +#endif + #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) #endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP --- CUT HERE --- --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1379692792 -3600 # Fri Sep 20 16:59:52 2013 +0100 # Node ID 1ad828f81a1b51c724a02d4e107824dddb4242ec # Parent e9b5be85ca1dfbe9b2ead47614705d341c35183b Fix self hosted build on RTSM model diff -r e9b5be85ca1d -r 1ad828f81a1b common/autoconf/build-aux/autoconf-config.guess --- a/common/autoconf/build-aux/autoconf-config.guess Fri Aug 16 12:12:19 2013 +0100 +++ b/common/autoconf/build-aux/autoconf-config.guess Fri Sep 20 16:59:52 2013 +0100 @@ -989,6 +989,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + aarch64:Linux:*:*) + echo aarch64-unknown-linux-gnu + exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; --- CUT HERE ---