All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Mimi Zohar <zohar@linux.ibm.com>, linux-integrity@vger.kernel.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
	Dave Howells <dhowells@redhat.com>,
	James Morris <jmorris@namei.org>,
	Josh Boyer <jwboyer@fedoraproject.org>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Nayna Jain <nayna@linux.ibm.com>,
	"Serge E. Hallyn" <serge@hallyn.com>,
	linux-kernel@vger.kernel.org,
	linux-security-module@vger.kernel.org
Subject: [PATCH 1/5] integrity: remove unneeded, broken attempt to add -fshort-wchar
Date: Fri, 26 Jul 2019 11:10:54 +0900	[thread overview]
Message-ID: <20190726021058.4212-2-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com>

I guess commit 15ea0e1e3e18 ("efi: Import certificates from UEFI Secure
Boot") attempted to add -fshort-wchar for building load_uefi.o, but it
has never worked as intended.

load_uefi.o is created in the platform_certs/ sub-directory. If you
really want to add -fshort-wchar, the correct code is:

  $(obj)/platform_certs/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar

or, in a more Kbuild-ish way:

  CFLAGS_load_uefi.o := -fshort-wchar

But, you do not need to fix it.

Commit 8c97023cf051 ("Kbuild: use -fshort-wchar globally") had already
added -fshort-wchar globally. This code was unneeded in the first place.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 security/integrity/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/security/integrity/Makefile b/security/integrity/Makefile
index 19faace69644..b6d6273a4176 100644
--- a/security/integrity/Makefile
+++ b/security/integrity/Makefile
@@ -13,7 +13,6 @@ integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyrin
 integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \
 					platform_certs/load_uefi.o
 integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o
-$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar
 
 subdir-$(CONFIG_IMA)			+= ima
 obj-$(CONFIG_IMA)			+= ima/
-- 
2.17.1


  reply	other threads:[~2019-07-26  2:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-26  2:10 [PATCH 0/5] security: integrity: Makefile cleanups Masahiro Yamada
2019-07-26  2:10 ` Masahiro Yamada [this message]
2019-09-09 11:43   ` [PATCH 1/5] integrity: remove unneeded, broken attempt to add -fshort-wchar Masahiro Yamada
2019-07-26  2:10 ` [PATCH 2/5] integrity: remove pointless subdir-$(CONFIG_...) Masahiro Yamada
2019-09-09 11:44   ` Masahiro Yamada
2019-07-26  2:10 ` [PATCH 3/5] integrity: use obj-y for non-modular objects Masahiro Yamada
2019-07-26  2:10 ` [PATCH 4/5] IMA: " Masahiro Yamada
2019-07-26  4:37   ` Eric Biggers
2019-07-26  7:04     ` Masahiro Yamada
2019-07-26  2:10 ` [PATCH 5/5] EVM: " Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190726021058.4212-2-yamada.masahiro@socionext.com \
    --to=yamada.masahiro@socionext.com \
    --cc=dhowells@redhat.com \
    --cc=jmorris@namei.org \
    --cc=jwboyer@fedoraproject.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=nayna@linux.ibm.com \
    --cc=schwidefsky@de.ibm.com \
    --cc=serge@hallyn.com \
    --cc=zohar@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.