From patchwork Wed Jun 13 14:54:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 928909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 415VCD28nWz9s47 for ; Thu, 14 Jun 2018 00:54:32 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 415VCD0lr1zF09q for ; Thu, 14 Jun 2018 00:54:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=redhat.com (client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=thuth@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 415VC71Cv1zDrpC for ; Thu, 14 Jun 2018 00:54:27 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1035405A007; Wed, 13 Jun 2018 14:54:24 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E2C41C65F; Wed, 13 Jun 2018 14:54:24 +0000 (UTC) From: Thomas Huth To: slof@lists.ozlabs.org Date: Wed, 13 Jun 2018 16:54:23 +0200 Message-Id: <1528901663-4584-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 13 Jun 2018 14:54:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 13 Jun 2018 14:54:25 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' Subject: [SLOF] [PATCH] Fix bad assembler statements for compiling with gcc 8.1 / as 2.30 X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" When compiling with a very recent toolchain, I get these warnings: ../../llfw/boot_abort.S: Assembler messages: ../../llfw/boot_abort.S:76: Warning: invalid register expression and: stage2_head.S: Assembler messages: stage2_head.S:57: Warning: invalid register expression The first one is using the wrong opcode, we should use "and" instead of "andi" here. The second one is using a register instead of a constant for load-immediate, which is non-sense, too. Fix it to use the right constant instead. Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier --- board-qemu/llfw/stage2_head.S | 2 +- llfw/boot_abort.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board-qemu/llfw/stage2_head.S b/board-qemu/llfw/stage2_head.S index adf7554..1568f27 100644 --- a/board-qemu/llfw/stage2_head.S +++ b/board-qemu/llfw/stage2_head.S @@ -54,7 +54,7 @@ bsscdone: /* jump to c-code */ /* r31 = fdt - r5 */ /* ------------------------------------ */ - li r3, r0 + li r3, 0 mr r4, r31 bl .early_c_entry diff --git a/llfw/boot_abort.S b/llfw/boot_abort.S index 996bdd7..47a9178 100644 --- a/llfw/boot_abort.S +++ b/llfw/boot_abort.S @@ -73,7 +73,7 @@ ASM_ENTRY(boot_abort) /* check if i/o is possible, if yes then print message */ li r10, ABORT_CANIO - andi. r3, r31, r10 + and. r3, r31, r10 bne abort_noio /* use i/o ..., first print reference message */