From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAFAFC282DD for ; Tue, 23 Apr 2019 19:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC2E821773 for ; Tue, 23 Apr 2019 19:04:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A+4iqhuR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726043AbfDWTEp (ORCPT ); Tue, 23 Apr 2019 15:04:45 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:39535 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbfDWTEp (ORCPT ); Tue, 23 Apr 2019 15:04:45 -0400 Received: by mail-ed1-f65.google.com with SMTP id k45so13651588edb.6 for ; Tue, 23 Apr 2019 12:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IPyvBFuTT2YIP4wtB47JABDilcIrKYp6uctHXlaMAv0=; b=A+4iqhuRf/tORlTXyOO15JposK/hr517MuFUC7OSm275zEOY6nTyJRcrmmzm9zfkVL YWTrGx7gfXeLFAL03naWFE24FxxvOTQqEk7bkCed+gNIl5WTRyIXe6NzS/6gjhP7MUlu 6RYVSFQ6EoNBdyc/I513mrRG3DIIup6uNF0AvnEI4ZqKRn6k17ix50TAly/+Q3X/IrpZ uq8xv/VJCSnD3zSBz1SuZ9FgiMV47+GA25cjNG0PznM7ilLq/psrURLscdvXvnbksyE/ A6n3e9xmz+5uOzCEQW3NI2JgG/LN6vjB+I372z0XmdEIwrP1jYp4Fu4eMDJqqh2K4/Wx pQzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPyvBFuTT2YIP4wtB47JABDilcIrKYp6uctHXlaMAv0=; b=KjFJNAmeq1ufUIeGC3PNE6bAFP8qmP4L1i9ky/E2R5F3Tz3uuMeBI9nb5C1vw46k04 UJ9mxNbr17qARi044vvgiHjkCDWZrfkdOqmg9sJlUscFlu+NnFk3F/gPQpYLo9EvP3WQ 3YgRDQBBDWujg+c1ivo5NBa0h7hlzwAtc4e3iEVd3M7vC19TXmFzMpp6FoPXYZz3eahX +uTWMWRHKqdQybMPlarQPz0wsaRtED+cOO6M41whFcFVbIecGPQxjUBpb+jaYbIUg0Kr L2LC3MFW9rGI1HOM8yeGIriRYbTELaVX6h4OFiXhvm8EK3J3+QnjirTN1JD591LVDAod ATjQ== X-Gm-Message-State: APjAAAX3XWUfqh3okiVfBU95MZuLc8kwojVm/bFfiikbu1cez7YOL9F/ Ho2gO4+AQHD1Icr473lOuWo= X-Google-Smtp-Source: APXvYqxxiShWwjhyewjNcDsirdPjjmpJkMSnu/XSAW/bEBA42iI3vsfHZ5Q8QtrOBeLedmRmj2Fzug== X-Received: by 2002:a17:906:6a12:: with SMTP id o18mr13027190ejr.204.1556046283278; Tue, 23 Apr 2019 12:04:43 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f9:2b:2b84::2]) by smtp.gmail.com with ESMTPSA id w40sm1202991edb.50.2019.04.23.12.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 12:04:42 -0700 (PDT) From: Nathan Chancellor To: Greg Kroah-Hartman , Sasha Levin , stable@vger.kernel.org Cc: Nick Desaulniers , clang-built-linux@googlegroups.com, Matthias Kaehlcke , Peter Zijlstra , Masahiro Yamada , Nathan Chancellor Subject: [PATCH 4.19] Revert "kbuild: use -Oz instead of -Os when using clang" Date: Tue, 23 Apr 2019 12:04:23 -0700 Message-Id: <20190423190426.18720-3-natechancellor@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423190426.18720-1-natechancellor@gmail.com> References: <20190423190426.18720-1-natechancellor@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Matthias Kaehlcke commit a75bb4eb9e565b9f5115e2e8c07377ce32cbe69a upstream. The clang option -Oz enables *aggressive* optimization for size, which doesn't necessarily result in smaller images, but can have negative impact on performance. Switch back to the less aggressive -Os. This reverts commit 6748cb3c299de1ffbe56733647b01dbcc398c419. Suggested-by: Peter Zijlstra Signed-off-by: Matthias Kaehlcke Reviewed-by: Nick Desaulniers Signed-off-by: Masahiro Yamada Signed-off-by: Nathan Chancellor --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3fac08f6a11e..91e265ca0ca5 100644 --- a/Makefile +++ b/Makefile @@ -661,8 +661,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE -KBUILD_CFLAGS += $(call cc-option,-Oz,-Os) -KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,) +KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) else ifdef CONFIG_PROFILE_ALL_BRANCHES KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) -- 2.21.0