From patchwork Tue Jun 30 11:00:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 50471 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4CCA229DF for ; Tue, 30 Jun 2015 11:00:49 +0000 (UTC) Received: by wian6 with SMTP id n6sf4204214wia.2 for ; Tue, 30 Jun 2015 04:00:48 -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:from:to:date:message-id:subject :precedence:reply-to:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=A7PZhrNnWtczp1EtDsRfSRcc5ok6mrRtJ2yCcW1CrRs=; b=C4TBJ47xYOOMGErFQ8Y6Wh0ELgy/yda6rzDxaLyzOhUBUtzZduLyvYyIHIOkklTuQu IOKbeAFIcXl2jrKhadcKGXfywEr+NxiSSwosv5AMGDXRunN7UHzaZSjLiaYWyphdLc8U opNZQwIxV1CGts/TEr5fVrHR2/DnRHmdDp1aUPznd1usVB4D2RbkMhqMWLNJG+8l9QZN 1nU8nLrpZOjn4uXYQLEtcRIhfnycAT0A2WN94cm4YrBFg5E/EJ9kxw0ovUJrKqNSfi24 UILMAKTG2f/xXWpj7w9eh0BU5LoTNReStX1MUeO6Hr2T8UfzPnTLZFQSuEeP0ZmV2QKz JJDw== X-Gm-Message-State: ALoCoQncbX9kbUW8HHduHIAY4VvyajWTjQsv5qWOCO7RM05dNtuf0qt9XI7GVcfy7fJJvOuCBIwK X-Received: by 10.112.122.12 with SMTP id lo12mr13724945lbb.5.1435662048827; Tue, 30 Jun 2015 04:00:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.67 with SMTP id l3ls26693lae.73.gmail; Tue, 30 Jun 2015 04:00:48 -0700 (PDT) X-Received: by 10.112.167.202 with SMTP id zq10mr18560188lbb.118.1435662048676; Tue, 30 Jun 2015 04:00:48 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id cz4si37782780lac.110.2015.06.30.04.00.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jun 2015 04:00:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by laar3 with SMTP id r3so8486516laa.0 for ; Tue, 30 Jun 2015 04:00:48 -0700 (PDT) X-Received: by 10.152.179.234 with SMTP id dj10mr19044319lac.73.1435662048295; Tue, 30 Jun 2015 04:00:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2358673lbb; Tue, 30 Jun 2015 04:00:45 -0700 (PDT) X-Received: by 10.42.249.147 with SMTP id mk19mr25180715icb.26.1435662045474; Tue, 30 Jun 2015 04:00:45 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id co3si39919712icb.9.2015.06.30.04.00.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Jun 2015 04:00:45 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z9tHG-0005u3-Nj; Tue, 30 Jun 2015 11:00:34 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z9tHF-0005tp-C3 for edk2-devel@lists.sourceforge.net; Tue, 30 Jun 2015 11:00:33 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.169 as permitted sender) client-ip=209.85.212.169; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f169.google.com; Received: from mail-wi0-f169.google.com ([209.85.212.169]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Z9tH9-0005zc-Mx for edk2-devel@lists.sourceforge.net; Tue, 30 Jun 2015 11:00:33 +0000 Received: by widjy10 with SMTP id jy10so26924886wid.1 for ; Tue, 30 Jun 2015 04:00:21 -0700 (PDT) X-Received: by 10.194.178.201 with SMTP id da9mr36723919wjc.139.1435662021595; Tue, 30 Jun 2015 04:00:21 -0700 (PDT) Received: from localhost.localdomain ([185.13.106.91]) by mx.google.com with ESMTPSA id ej3sm16489127wib.24.2015.06.30.04.00.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jun 2015 04:00:20 -0700 (PDT) From: Ard Biesheuvel To: yingke.d.liu@intel.com, liming.gao@intel.com, edk2-devel@lists.sourceforge.net Date: Tue, 30 Jun 2015 13:00:14 +0200 Message-Id: <1435662014-26196-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1Z9tH9-0005zc-Mx Subject: [edk2] [PATCH] BaseTools: fix a syntax error in 4 KB aligned GNU ld linker script X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 There needs to be a space between the output section name and the colon, i.e., .text : ALIGN(0x1000) ^ Fix this for all output sections Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- BaseTools/Scripts/gcc-4K-align-ld-script | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script index 1f23079023a6..16cf623a3362 100644 --- a/BaseTools/Scripts/gcc-4K-align-ld-script +++ b/BaseTools/Scripts/gcc-4K-align-ld-script @@ -3,12 +3,12 @@ SECTIONS { /* . = 0 + SIZEOF_HEADERS; */ . = 0x280; - .text: ALIGN(0x1000) + .text : ALIGN(0x1000) { *(.text .stub .text.* .gnu.linkonce.t.*) . = ALIGN(0x20); } - .data: ALIGN(0x1000) + .data : ALIGN(0x1000) { *( .rodata .rodata.* .gnu.linkonce.r.* @@ -18,16 +18,16 @@ SECTIONS ) . = ALIGN(0x20); } - .eh_frame: ALIGN(0x1000) + .eh_frame : ALIGN(0x1000) { KEEP (*(.eh_frame)) } - .got: ALIGN(0x1000) + .got : ALIGN(0x1000) { *(.got .got.*) . = ALIGN(0x20); } - .rela: ALIGN(0x1000) + .rela : ALIGN(0x1000) { *(.rela .rela.*) }