From patchwork Wed Jun 1 18:05:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 577807 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp845797mab; Wed, 1 Jun 2022 11:14:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLLD/VDhVJlDaYLlPN4JQmlOb8xDQkZZwSP81Nj9nnPkP+wK5gZo6/z3s4ALThB/LsjcH3 X-Received: by 2002:a05:622a:454:b0:2f3:d8fe:c650 with SMTP id o20-20020a05622a045400b002f3d8fec650mr859648qtx.440.1654107273643; Wed, 01 Jun 2022 11:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654107273; cv=none; d=google.com; s=arc-20160816; b=lSD8GfiDwadQoUjWVMfiPzVCKNZHGdkqY9SZESjZdcz7cJyQ/+ZIl16vmw54ieYzvG hfzZFDhvezf9oR8QecR6VUf1FFOp4o5iOJrxh1UDyW2/UDN195VjAkF3HjEAiWc4XUly OxZpduj3iVzFlA5V6onirLM24Edj/fMg2CBQEpSWj2q6TaIXkTbzCM9H8/tyIEQfuvHx Rqfg+zuJkn1Azn8bGOE12CgW5PwznuaPs/QhR/h4miufn7scUg0FnVkmjZaaDdkplCtd lcfJxc3auyzK4KRoEUasU+LP9NMwdGeBOjTJaK6aBtpP681/PBqTcIl+ziFileWHFXgW h1fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=Kg5t9lHmZZUYQTFBdxyD8W9BkANxXmogqKjuiKKto37CyEQE+Wek8KQcjkhuHNoKiP 0d4kclS0+A7oW0xF2xiS0boqwMwE/KX7sellE0NRnRYb5Z+1u7NBj17eCDucRPrpsdUs fwzsp/udS2kREOkvIt9geR0tntdnP0fzCp5oFJ5vPzBCt6wpAR5eR7Ygx9Aoka+CLeR3 gtM2oatXlldJRTzLe7ELysqeX1J2Tuwcl1fyUtW4bbtvJHsd5U7IDxHMxv+sZ9SBiXEO RLPE6SQ0rwmb2qBfhf6OOP/aFP2+IQUbSaKNlGtk5aPQkCBVLkIYbFn3vGeNvPmycSXk sIFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CrBQ0Trl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j20-20020a05622a039400b00304c1f10ea7si1310332qtx.753.2022.06.01.11.14.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:14:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CrBQ0Trl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSrZ-0000yb-5l for patch@linaro.org; Wed, 01 Jun 2022 14:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjH-000150-7u for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:59 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:40881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjF-0004wj-Iq for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:58 -0400 Received: by mail-ej1-x62d.google.com with SMTP id fu3so3885470ejc.7 for ; Wed, 01 Jun 2022 11:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=CrBQ0TrlEEV9NsWJg2YhbEt04hD0irzVXkhXQVhGvGQeWKEKKCqIGAzeU4zYDbNGe1 ZcpP/JEHCJjwuxAag226puq+kAZQiOVNQfDmszckMIVFv/UsR/du0b6DJ44EsWz76y8T kjNfj4pX9B0o7NFZbqJcy8s2aLBNRjeixG89t8MZquW/Bq+QlhOqxqqs87V0IPq47War MmB4Awok2sXCDVAInBYCH+dOsT201dT7FHIEkFsWY5+gfPAm2sOOYFOgHpWXfnP5K6fM Uak9+vLLvjDFeytckczFwgZ49l0jwEuugy+lIJSDhTdU59a1FORhD7AcqjzDlCANyZfo IwwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nq8yzeDa35nazBz+vDIGk+SXL2jvpKA5lHmDy5gS1Bw=; b=W7YC1fCt3d4UOVWO23xgqk0aBBy/d9RzrUtZA2PiKHOZJSp9Dw+dUCFu0l9n7ZZ+5c xdmXG1MfewTmEnFEsvSaitJ0vxv9xmTySZE4xa8ynSXx2Oi/hoTqYpfv1XqeQlVumKMF 1cYV+gjBwZgdDlKdkksgyaw1EGBI38pmun44L3rNhiYZp10aTQeAG2ySbLP/vVsJjhvc 5Yiu4FdNPRiVIksz9+qSUEF46q/K+ZZLv15yRKhXX8eTb1XEIKlc3B8+UHtYrGlX33Ok 933OmjOI0Fl9ptYY6DN7TGib4QSAsk6DZ8z48vgPktJbpw3rhPGvh2JlOlq/NtdJUQ86 LS2g== X-Gm-Message-State: AOAM530qdlU2lNsI1epIBfuzUhGtJPaGIwi7X93q0YBUzyqKopBOTBWc l6NCany2EZJchQiWDQ/Oi33aWg== X-Received: by 2002:a17:907:1b1a:b0:703:a290:98f1 with SMTP id mp26-20020a1709071b1a00b00703a29098f1mr701896ejc.418.1654106756917; Wed, 01 Jun 2022 11:05:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e11-20020a056402104b00b0042dea3390cdsm1314880edu.49.2022.06.01.11.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B9B1FFC4; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Subject: [PULL 12/33] configure: do not define or use the CPP variable Date: Wed, 1 Jun 2022 19:05:16 +0100 Message-Id: <20220601180537.2329566-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Just hardcode $(CC) -E, it should be enough. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220527153603.887929-13-alex.bennee@linaro.org> diff --git a/configure b/configure index f2baf2f526..c88ef94fec 100755 --- a/configure +++ b/configure @@ -376,7 +376,6 @@ fi ar="${AR-${cross_prefix}ar}" as="${AS-${cross_prefix}as}" ccas="${CCAS-$cc}" -cpp="${CPP-$cc -E}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" ranlib="${RANLIB-${cross_prefix}ranlib}" @@ -2014,7 +2013,6 @@ echo "CC=$cc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak echo "AS=$as" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak -echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak @@ -2257,7 +2255,6 @@ preserve_env() { preserve_env AR preserve_env AS preserve_env CC -preserve_env CPP preserve_env CFLAGS preserve_env CXX preserve_env CXXFLAGS diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 2494ad9c25..17ccc76241 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -50,7 +50,7 @@ override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")