From patchwork Tue Oct 14 12:06:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 38715 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C32C320549 for ; Tue, 14 Oct 2014 12:06:44 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id d17sf5298045eek.10 for ; Tue, 14 Oct 2014 05:06:43 -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:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=pYxReOuWPYjS1o0gM3MUV0oZwaF1HIfH/ObuhL9DFZE=; b=JwxdyJfY4H/0ML9kNhliRWJ7oK+R+HrcMvZ9oNyn+SeN24JFoff17TWWdiPyPgiLux Ql70LmoFaICdUEVmWLfiyRfhcMlZnTpAg8RBerIfx0Nt6qXf7vJ4bOfZRxsu782cJ8RA vMzVN6xCW1X2c/KEiMif5+r19Qk9NpEeQPWI4UKcujWKlOg//sPGaToIJmVMKFHfkMLX O9flVXsWnfLLj6/Wh/IfOgQTgjUQCmmSt8STdGqYW7LUOENOBiEVjj9XMOgqIZ7NE82+ Kky4Pz8cchL2QJrH0Twh6JYCGSkc51igWtJtb6U2B4rvQHsFe3qeGxgmAz/i3EClEAoy ghFw== X-Gm-Message-State: ALoCoQlgoRkeYcxB5mSUNmC5cyaxAF6m5Lz2+s1Dr7VwzDc+XN0li9yXY6a9dzORQBtKDsAnpbOi X-Received: by 10.112.97.35 with SMTP id dx3mr38813lbb.20.1413288403863; Tue, 14 Oct 2014 05:06:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.233 with SMTP id uh9ls572517lac.70.gmail; Tue, 14 Oct 2014 05:06:43 -0700 (PDT) X-Received: by 10.112.234.201 with SMTP id ug9mr5082441lbc.14.1413288403476; Tue, 14 Oct 2014 05:06:43 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id cq12si24930504lad.130.2014.10.14.05.06.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 05:06:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so7864153lbi.41 for ; Tue, 14 Oct 2014 05:06:43 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr4985773lbb.46.1413288403026; Tue, 14 Oct 2014 05:06:43 -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.84.229 with SMTP id c5csp380853lbz; Tue, 14 Oct 2014 05:06:42 -0700 (PDT) X-Received: by 10.42.31.201 with SMTP id a9mr4697273icd.16.1413288401376; Tue, 14 Oct 2014 05:06:41 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id k10si1882187ige.17.2014.10.14.05.06.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 14 Oct 2014 05:06:41 -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 1Xe0s3-000212-3A; Tue, 14 Oct 2014 12:06:31 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Xe0s1-00020s-BT for edk2-devel@lists.sourceforge.net; Tue, 14 Oct 2014 12:06:29 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.171 as permitted sender) client-ip=209.85.212.171; envelope-from=leif.lindholm@linaro.org; helo=mail-wi0-f171.google.com; Received: from mail-wi0-f171.google.com ([209.85.212.171]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Xe0rz-0003lF-Ki for edk2-devel@lists.sourceforge.net; Tue, 14 Oct 2014 12:06:29 +0000 Received: by mail-wi0-f171.google.com with SMTP id em10so9903017wid.4 for ; Tue, 14 Oct 2014 05:06:21 -0700 (PDT) X-Received: by 10.194.62.238 with SMTP id b14mr4652716wjs.46.1413288381390; Tue, 14 Oct 2014 05:06:21 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id l5sm15523837wif.3.2014.10.14.05.06.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Oct 2014 05:06:20 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net Date: Tue, 14 Oct 2014 13:06:33 +0100 Message-Id: <1413288393-28773-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 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: 1Xe0rz-0003lF-Ki Subject: [edk2] [PATCH] GenFw: don't bail out on (certain) relative relocations 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: leif.lindholm@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.217.182 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 R_AARCH64_JUMP26/R_AARCH64_JUMP26 do not need fixups by GenFw, but these are sometimes generated by GCC 4.9. Delete the check aborting due to unhandled relocations. Signed-off-by: Leif Lindholm --- BaseTools/Source/C/GenFw/Elf64Convert.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c index 526ab5d..a9f6fef 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -709,16 +709,9 @@ WriteSections64 ( } break; + // These relative relocations do not require fixups case R_AARCH64_CALL26: - if (Rel->r_addend != 0 ) { /* TODO */ - Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_CALL26 Need to fixup with addend!."); - } - break; - case R_AARCH64_JUMP26: - if (Rel->r_addend != 0 ) { /* TODO : AArch64 '-O2' optimisation. */ - Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_JUMP26 Need to fixup with addend!."); - } break; case R_AARCH64_ADR_PREL_PG_HI21: