From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Behan Webster <behanw@converseincode•com>,
llvmlinux@lists•linuxfoundation.org,
Michal Marek <mmarek@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andi Kleen <ak@linux•intel.com>
Subject: linux-next: manual merge of the llvmlinux tree with the kbuild tree
Date: Tue, 16 Sep 2014 16:46:07 +1000 [thread overview]
Message-ID: <20140916164607.3627ee85@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]
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@canb•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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-16 6:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140916164607.3627ee85@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ak@linux$(echo .)intel.com \
--cc=behanw@converseincode$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=llvmlinux@lists$(echo .)linuxfoundation.org \
--cc=mmarek@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox