| 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 linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 16 Sep 2014 16:46:07 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Behan Webster <behanw@...verseincode.com>,
<llvmlinux@...ts.linuxfoundation.org>,
Michal Marek <mmarek@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Andi Kleen <ak@...ux.intel.com>
Subject: linux-next: manual merge of the llvmlinux tree with the kbuild tree
Hi all,
Today's linux-next merge of the llvmlinux tree got a conflict in
Makefile between commit 19a3cc83353e ("Kbuild, lto: Add Link Time
Optimization support v3") from the kbuild tree and commit 6d9203642de6
("kbuild, LLVMLinux: Add better clang cross build support") from the
llvmlinux tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc Makefile
index 6b5e010d91e2,aa642d244f19..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -360,14 -360,18 +360,23 @@@ include $(srctree)/scripts/Kbuild.inclu
# Make variables (CC, etc...)
AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld
+LDFINAL = $(LD)
+ ifeq ($(COMPILER),clang)
+ ifneq ($(CROSS_COMPILE),)
+ CC += -target $(CROSS_COMPILE:%-=%)
+ endif
+ ifneq ($(GCC_TOOLCHAIN),)
+ CC += -gcc-toolchain $(GCC_TOOLCHAIN)
+ endif
+ else
CC = $(CROSS_COMPILE)gcc
+ endif
CPP = $(CC) -E
+ifdef CONFIG_LTO
+AR = $(CROSS_COMPILE)gcc-ar
+else
AR = $(CROSS_COMPILE)ar
+endif
NM = $(CROSS_COMPILE)nm
STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists