lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 2 Nov 2017 18:13:18 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Andrew Morton <akpm@...ux-foundation.org>, Masahiro Yamada <yamada.masahiro@...ionext.com> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Victor Chibotaru <tchibo@...gle.com>, Alexander Potapenko <glider@...gle.com> Subject: linux-next: manual merge of the akpm-current tree with the kbuild tree Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 2e026cb9ffbb ("kbuild: do not call cc-option before KBUILD_CFLAGS initialization") from the kbuild tree and commit: 56db01c150f1 ("Makefile: support flag -fsanitizer-coverage=trace-cmp") from the akpm-current tree. I fixed it up (mostly - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Makefile index 94e70d8693f3,4ee187f133bb..000000000000 --- a/Makefile +++ b/Makefile @@@ -603,12 -619,6 +603,11 @@@ endi # Defaults to vmlinux, but the arch makefile usually adds further targets all: vmlinux +KBUILD_CFLAGS += $(call cc-option,-fno-PIE) +KBUILD_AFLAGS += $(call cc-option,-fno-PIE) +CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,) - CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,) +export CFLAGS_GCOV CFLAGS_KCOV + # The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default # values of the respective KBUILD_* variables ARCH_CPPFLAGS :=
Powered by blists - more mailing lists