From patchwork Mon Feb 20 16:45:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6835 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 9E4AF23E24 for ; Mon, 20 Feb 2012 16:45:17 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5BAEDA18358 for ; Mon, 20 Feb 2012 16:45:17 +0000 (UTC) Received: by iabz7 with SMTP id z7so10812507iab.11 for ; Mon, 20 Feb 2012 08:45:16 -0800 (PST) Received: from mr.google.com ([10.42.131.129]) by 10.42.131.129 with SMTP id z1mr22288030ics.53.1329756316890 (num_hops = 1); Mon, 20 Feb 2012 08:45:16 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.131.129 with SMTP id z1mr17814367ics.53.1329756316820; Mon, 20 Feb 2012 08:45:16 -0800 (PST) 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.231.11.10 with SMTP id r10csp51373ibr; Mon, 20 Feb 2012 08:45:16 -0800 (PST) Received: by 10.216.132.94 with SMTP id n72mr4004577wei.4.1329756315499; Mon, 20 Feb 2012 08:45:15 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id ft1si5866539wib.41.2012.02.20.08.45.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Feb 2012 08:45:15 -0800 (PST) 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 1RzWMR-0005I9-Nh; Mon, 20 Feb 2012 16:45:11 +0000 From: Peter Maydell To: android-virt@lists.cs.columbia.edu Cc: patches@linaro.org Subject: [PATCH v2] Fix linux-system-semi.axf build failure from clean Date: Mon, 20 Feb 2012 16:45:11 +0000 Message-Id: <1329756311-20318-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnwjuYKdnqXO/+WLamue8vSNvFnn3BpreQAAkcNxNmD+ZmRfX5o5TMJW9q8M6Ap0za8FGeC We were failing to build linux-system-semi.axf in a clean tree because even if SEMIHOSTING was defined we still had a spurious INPUT(boot.o), which is harmless if boot.o exists but fails if it does not. In fact the INPUT() commands for the .o files are unnecessary because ld will pull in the correct .o files because the SECTIONS command has a non-wildcard reference to them. So just drop the unneeded INPUT() commands rather than adding more ifdefs. (The INPUT() commands for the binary blobs are still required.) Signed-off-by: Peter Maydell --- v1->v2 : just drop the offending INPUT() commands rather than using ifdefs model.lds.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/model.lds.S b/model.lds.S index 3af4e07..fca017b 100644 --- a/model.lds.S +++ b/model.lds.S @@ -11,8 +11,6 @@ OUTPUT_FORMAT("elf32-littlearm") OUTPUT_ARCH(arm) TARGET(binary) -INPUT(./monitor.o) -INPUT(./boot.o) #ifndef SEMIHOSTING INPUT(./uImage) #ifdef USE_INITRD