From patchwork Wed Nov 13 17:01:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11242341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2552A6C1 for ; Wed, 13 Nov 2019 17:02:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6F8220637 for ; Wed, 13 Nov 2019 17:02:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6F8220637 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iUw1H-0007DC-T1; Wed, 13 Nov 2019 17:01:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iUw1G-0007D6-1x for xen-devel@lists.xenproject.org; Wed, 13 Nov 2019 17:01:26 +0000 X-Inumbo-ID: 39bb5b68-0637-11ea-9631-bc764e2007e4 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 39bb5b68-0637-11ea-9631-bc764e2007e4; Wed, 13 Nov 2019 17:01:25 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id AB317ADDD; Wed, 13 Nov 2019 17:01:24 +0000 (UTC) To: "xen-devel@lists.xenproject.org" From: Jan Beulich Message-ID: Date: Wed, 13 Nov 2019 18:01:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 Content-Language: en-US Subject: [Xen-devel] [PATCH] x86: fix clang .macro retention check X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Julien Grall , Wei Liu , Konrad Wilk , George Dunlap , Andrew Cooper , Ian Jackson , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There were two problems here: The first closing parentheses got parsed by make to end the $(call invocation, and the escaping of the quotes wasn't right either, as there's nowhere they would get un-escaped. Signed-off-by: Jan Beulich --- This needs to be tested in an environment where this was actually found to matter; I can't see how it can have worked in its former shape. I also don't understand why the same commit introducing the check that gets fixed here put the .skip check in xen/Rules.mk - the only use of .skip that I can spot is in x86 code. --- a/Config.mk +++ b/Config.mk @@ -6,6 +6,8 @@ endif # Convenient variables comma := , +open := ( +close := ) squote := ' #' Balancing squote, to help syntax highlighting empty := --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -82,6 +64,6 @@ $(call as-option-add,CFLAGS,CC,".include # Check whether clang keeps .macro-s between asm()-s: # https://bugs.llvm.org/show_bug.cgi?id=36110 $(call as-option-add,CFLAGS,CC,\ - ".macro FOO\n.endm\"); asm volatile (\".macro FOO\n.endm",\ + ".macro FOO\n.endm"$$(close); asm volatile $$(open)".macro FOO\n.endm",\ -no-integrated-as) endif