From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1EDA278003C for ; Tue, 30 Jul 2024 15:08:06 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=bfHBOCLiPXiq+rtRjApafeDoaWTue4vsbAYflArYDXk=; c=relaxed/simple; d=groups.io; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20240206; t=1722352086; v=1; b=EyhLxDOhY+3j+biirCJ3wnA2M2cXwFPuzb2pLebnkbAbWEy+ESRaUMSxdjPxuRERAhJ7dW65 HIbnNO8uKJubRK9tmn1DyIAhZOR0V0Du96gF7WhJjIl3OdJZm03btPb8Ku1ClA3xCrSpW4gM+An kaIbKqvSmDZlT7AR+23LI6du3z/p0+aNNx5Yt1VO0rRAGeI0JEZQALOJIsjkKJXGSfs+xIO9wg5 Qvq4a2/JYoGVZp2vTRYe89SReIHE/GaLYg0dGCyOv/eKDsNoM3xI7s/vDcanvnz8j1tv3VbxnUD RH9/nAvUFUlZYipwGOlm/g1gEgn6/UYvIBlwj8D6nyZwQ== X-Received: by 127.0.0.2 with SMTP id APC0YY7687511xulZsZpUIrM; Tue, 30 Jul 2024 08:08:05 -0700 X-Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by mx.groups.io with SMTP id smtpd.web11.31677.1721895915634478176 for ; Thu, 25 Jul 2024 01:25:15 -0700 X-Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4279837c024so4903075e9.2 for ; Thu, 25 Jul 2024 01:25:15 -0700 (PDT) X-Gm-Message-State: TA0yjyqIu95o0LUVVPi7BhHZx7686176AA= X-Google-Smtp-Source: AGHT+IHNrLDKAjvm6FGERb+3Z2PwZfJhbgysuoOWsPOVxXukqt0CLHvSRQ/Qgj/JgzJP+e4tqvGt6lne X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:3d87:b0:426:6fc7:d586 with SMTP id 5b1f17b1804b1-42806bfdc3dmr24875e9.5.1721895913656; Thu, 25 Jul 2024 01:25:13 -0700 (PDT) Date: Thu, 25 Jul 2024 10:24:53 +0200 In-Reply-To: <20240725082502.1566409-1-ardb+git@google.com> Mime-Version: 1.0 References: <20240725082502.1566409-1-ardb+git@google.com> Message-ID: <20240725082502.1566409-3-ardb+git@google.com> Subject: [edk2-devel] [PATCH edk2-platforms 02/11] Silicon/SynQuacer: Fix CLANGDWARF build From: "Ard Biesheuvel via groups.io" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Tue, 30 Jul 2024 08:07:57 -0700 Resent-From: ardb+git@google.com Reply-To: devel@edk2.groups.io,ardb+git@google.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=EyhLxDOh; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ard Biesheuvel Drop the CLANG3x build options, and add ones for CLANGDWARF so that SynQuacer based platforms can be built with it. Instead of copying the -no-integrated-as option that CLANG3x used, let's fix the assembler code so it can be built with Clang's integrated assembler. Also switch to LLD for linking the code, which is what CLANGDWARF uses natively (and build hosts may lack a cross linker for AArch64 when using CLANGDWARF) Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf | 3 +-- Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf index 7b396db826a5..8c331738c81a 100644 --- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf +++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf @@ -23,5 +23,4 @@ [BuildOptions] *_*_AARCH64_OBJCOPY_FLAGS = -I elf64-little *_*_ARM_OBJCOPY_FLAGS = -I elf32-little *_*_*_ASM_FLAGS == -nostdlib -Wl,-e,0x81f8000,--section-start=.rodata=0x81f8000 - *_CLANG35_*_ASM_FLAGS = -no-integrated-as - *_CLANG38_*_ASM_FLAGS = -no-integrated-as + *_CLANGDWARF_*_ASM_FLAGS = -target aarch64-linux-gnu -fuse-ld=lld -Wl,-no-pie diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S index a7f0eb2b7742..4f7c2aae20a1 100644 --- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S +++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S @@ -54,13 +54,13 @@ TT_S2_VALID | (\cont << TT_S2_CONT_SHIFT) .endm - .macro s2_l3_entry, base, offset=0, cont=0 + .macro s2_l3_entry, base, offset=0, cont=0, ignore=0 .quad ((\base << 12) + \offset) | TT_S2_AF | TT_S2_AP_RW | \ TT_S2_SH_NON_SHAREABLE | TT_S2_MEMATTR_MEMORY_WB | \ TT_S2_L3_PAGE | TT_S2_VALID | (\cont << TT_S2_CONT_SHIFT) .endm - .macro smmu_l3_entry, base, offset=0, ignore=0 + .macro smmu_l3_entry, base, offset=0, ignore=0, ignore2=0 .quad ((\base << 12) + \offset) | TT_S2_AF | TT_S2_AP_RO | \ TT_S2_SH_NON_SHAREABLE | TT_S2_MEMATTR_DEVICE_nGnRE | \ TT_S2_L3_PAGE | TT_S2_VALID -- 2.46.0.rc1.232.g9752f9e123-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120084): https://edk2.groups.io/g/devel/message/120084 Mute This Topic: https://groups.io/mt/107628948/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-