From patchwork Mon Jul 21 13:00:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33954 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D10DE20492 for ; Mon, 21 Jul 2014 13:02:05 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id t60sf5022387wes.11 for ; Mon, 21 Jul 2014 06:02:04 -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:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=R5b/jsTG6yXZxID5kFP35ys9nJeZ4XNGLeHN6Ybd9Hk=; b=To2FTqbEnMFMIJA4BLT77ti92vLE8tpYiBj7pi67PXFwGi2XQ26xMkBbFGVIyKyQTl pjW24A/DTxbVgokpwsb4XZ5v/lmCRtdK+NHRMtWuAtF9UGjw/pcpoIxDYVErH7xRwlM7 KcJ0979iLRWWJoOeg4aHbHM6tmbdX/QFVXKCoy/oBVaFmdsi9MR7zOFTQ0ZYJtTJBzQH pzsAgNB19H5TH4G0CNKU4dimzCTnU0L+0vepLxTZ/+k1d8Igi5quVNkU6aYVJPcLX3xp iiHHl4/DGJgz5V2g/s0oGOfPT9M9jcKpOpMRERgDnBVyuZgx68LPvt0HjKGy6pgJKDK+ MXzg== X-Gm-Message-State: ALoCoQlkbM+MMnD6dYKhvwROEaMDdTxRJzTsyb/lDUyT16hSieLsCkT/+b8vghEi1v2FzafdXy3j X-Received: by 10.112.145.233 with SMTP id sx9mr1953242lbb.2.1405947724692; Mon, 21 Jul 2014 06:02:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.54 with SMTP id b51ls2018540qgf.48.gmail; Mon, 21 Jul 2014 06:02:04 -0700 (PDT) X-Received: by 10.220.195.67 with SMTP id eb3mr29204600vcb.30.1405947724498; Mon, 21 Jul 2014 06:02:04 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id fu11si11217757vdb.105.2014.07.21.06.02.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jul 2014 06:02:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so11937422vcb.11 for ; Mon, 21 Jul 2014 06:02:04 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr29226800vcb.16.1405947724153; Mon, 21 Jul 2014 06:02:04 -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.221.37.5 with SMTP id tc5csp110253vcb; Mon, 21 Jul 2014 06:02:03 -0700 (PDT) X-Received: by 10.42.76.205 with SMTP id f13mr13096017ick.63.1405947723591; Mon, 21 Jul 2014 06:02:03 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e5si29116504igy.19.2014.07.21.06.02.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 21 Jul 2014 06:02:03 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9DCO-0001Mz-KV; Mon, 21 Jul 2014 13:00:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X9DCM-0001KP-41 for xen-devel@lists.xen.org; Mon, 21 Jul 2014 13:00:10 +0000 Received: from [85.158.137.68:18677] by server-3.bemta-3.messagelabs.com id FC/5F-08876-9DE0DC35; Mon, 21 Jul 2014 13:00:09 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1405947605!17110420!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29747 invoked from network); 21 Jul 2014 13:00:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 21 Jul 2014 13:00:08 -0000 X-IronPort-AV: E=Sophos;i="5.01,701,1400025600"; d="scan'208";a="154196114" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 21 Jul 2014 13:00:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 21 Jul 2014 09:00:06 -0400 Received: from drall.uk.xensource.com ([10.80.16.71]) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X9DCH-0004On-F0; Mon, 21 Jul 2014 14:00:06 +0100 Received: by drall.uk.xensource.com (sSMTP sendmail emulation); Mon, 21 Jul 2014 14:00:05 +0100 From: Ian Campbell To: Date: Mon, 21 Jul 2014 14:00:00 +0100 Message-ID: <1405947600-26047-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405947600-26047-1-git-send-email-ian.campbell@citrix.com> References: <1405947513.25022.59.camel@kazak.uk.xensource.com> <1405947600-26047-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v3 6/6] xen: arm: Correctly use GLOBAL/ENTRY in head.S, avoid .global X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 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 List-Archive: Use ENTRY() for function entry points since it ensures correct alignment where GLOBAL() doesn't. The exception is the initial start label which must be at offset 0, so just use GLOBAL() to avoid the possibility of realignment. Since everything happens to already be aligned there should be no difference to the actual binary. objdump agrees. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- v3: New patch --- xen/arch/arm/arm32/head.S | 8 +++----- xen/arch/arm/arm64/head.S | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 14b172f..6573a42 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -76,8 +76,7 @@ * It should be linked at XEN_VIRT_START, and loaded at any * 4K-aligned address. All of text+data+bss must fit in 2MB, * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* zImage magic header, see: * http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html#d0e309 */ @@ -583,16 +582,15 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: mov pc, lr #endif /* !CONFIG_EARLY_PRINTK */ /* This provides a C-API version of __lookup_processor_type */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) stmfd sp!, {r4, r10, lr} mov r10, #0 /* r10 := offset between virt&phys */ bl __lookup_processor_type diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 9497ca1..99cc6e0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -100,8 +100,7 @@ * or the initial pagetable code below will need adjustment. */ - .global start -start: +GLOBAL(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -604,9 +603,8 @@ hex: .ascii "0123456789abcdef" #else /* CONFIG_EARLY_PRINTK */ +ENTRY(early_puts) init_uart: -.global early_puts -early_puts: puts: putn: ret @@ -615,7 +613,7 @@ putn: ret /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -GLOBAL(lookup_processor_type) +ENTRY(lookup_processor_type) mov x0, #0 ret