From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 747BFD80D5A for ; Tue, 26 Dec 2023 14:14:26 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=zFTpPHOWSEg5oghaPoW3uvVKd4hZ8TqYcclU4RPtXzk=; c=relaxed/simple; d=groups.io; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1703600065; v=1; b=b5rkfN2qorsQvDH2jlEOVscyi40aoXik5xSDZ3TV0xKbbgkbEMY0kUEl/WwK+e08CcpI2F9c dGDBGgKFwZukHyU3G+1HiYLKPfIWzQhQ+BbL0Cq9FnPv7+NFeK3WmqDyW0fRct+ImcRvrzNz0XN k5AjQJk9yTK5pwKTVqwgYpIw= X-Received: by 127.0.0.2 with SMTP id f4KAYY7687511xtP9gZQ2aoO; Tue, 26 Dec 2023 06:14:25 -0800 X-Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by mx.groups.io with SMTP id smtpd.web10.27345.1703092779629469665 for ; Wed, 20 Dec 2023 09:19:39 -0800 X-Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbd9abdfaf6so1408843276.2 for ; Wed, 20 Dec 2023 09:19:39 -0800 (PST) X-Gm-Message-State: HotFmNhP7loAuDl6imPD5Hbjx7686176AA= X-Google-Smtp-Source: AGHT+IEa34tGGnNYlp3pU+OA9/yGGWKvdshF/h+wPKIXcGnfn3sRmA88QCcqrYEHx0MlfGyyvVPWxhvA X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:bfcd:0:b0:dbc:c697:63bd with SMTP id q13-20020a25bfcd000000b00dbcc69763bdmr18140ybm.0.1703092778758; Wed, 20 Dec 2023 09:19:38 -0800 (PST) Date: Wed, 20 Dec 2023 18:19:34 +0100 Mime-Version: 1.0 Message-ID: <20231220171934.2283730-1-ardb+git@google.com> Subject: [edk2-devel] [PATCH edk2-platforms 1/1] Silicon/SynQuacer: Fix CLANGDWARF build From: "Ard Biesheuvel via groups.io" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, Ard Biesheuvel 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 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=20140610 header.b=b5rkfN2q; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=none 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..e60fdd7d10f6 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.43.0.195.gebba966016-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112915): https://edk2.groups.io/g/devel/message/112915 Mute This Topic: https://groups.io/mt/103369614/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-