From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935708AbcIERtZ (ORCPT ); Mon, 5 Sep 2016 13:49:25 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50001 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934367AbcIERtU (ORCPT ); Mon, 5 Sep 2016 13:49:20 -0400 X-IBM-Helo: d24dlp02.br.ibm.com X-IBM-MailFrom: bauerman@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org From: Thiago Jung Bauermann To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the akpm-current tree Date: Mon, 05 Sep 2016 14:49:12 -0300 User-Agent: KMail/4.14.3 (Linux/3.13.0-95-generic; KDE/4.14.13; x86_64; ; ) In-Reply-To: <20160905191917.4ca6dd56@canb.auug.org.au> References: <20160905191917.4ca6dd56@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16090517-0028-0000-0000-0000013D01BB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16090517-0029-0000-0000-000014040231 Message-Id: <8826558.sWXQPuNUpI@hactar> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-09-05_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1609050261 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Montag, 05 September 2016, 19:19:17 schrieb Stephen Rothwell: > Hi Andrew, > > After merging the akpm tree, today's linux-next build (powerpc > pseries_le_defconfig) failed like this: > > powerpc-linux-ld: arch/powerpc/purgatory/purgatory.o: compiled for a big > endian system and target is little endian powerpc-linux-ld: failed to > merge target specific data of file arch/powerpc/purgatory/purgatory.o > powerpc-linux-ld: arch/powerpc/purgatory/printf.o: compiled for a big > endian system and target is little endian powerpc-linux-ld: failed to > merge target specific data of file arch/powerpc/purgatory/printf.o > > and so on ... > > Presumably caused by commit > > b26db279958b ("powerpc: add purgatory for kexec_file_load > implementation") > > I added this patch for today: > > From: Stephen Rothwell > Date: Mon, 5 Sep 2016 19:12:42 +1000 > Subject: [PATCH] disable KEXEC_FILE on powerpc for now > > Signed-off-by: Stephen Rothwell > --- > arch/powerpc/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 41300c3a1bfe..86ea07d7ead2 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -467,6 +467,7 @@ config KEXEC_FILE > depends on PPC64 > depends on CRYPTO=y > depends on CRYPTO_SHA256=y > + depends on BROKEN > help > This is a new version of the kexec system call. This call is > file based and takes in file descriptors as system call arguments Sorry about that. The change below to arch/powerpc/purgatory/Makefile fixes the cross build from ppc64 BE to ppc64 LE. I also noticed that building the purgatory during archprepare is not necessary, so I also made the change below to arch/powerpc/Makefile. I'm preparing a v8 of the kexec_file_load implementation for powerpc series with those changes and will send it shortly. -- []'s Thiago Jung Bauermann IBM Linux Technology Center diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index c91c496cfc64..0fb28cc8eb38 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -378,9 +378,6 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) archprepare: checkbin -ifeq ($(CONFIG_KEXEC_FILE),y) - $(Q)$(MAKE) $(build)=arch/powerpc/purgatory arch/powerpc/purgatory/kexec-purgatory.c -endif # Use the file '.tmp_gas_check' for binutils tests, as gas won't output # to stdout and these checks are run even on install targets. diff --git a/arch/powerpc/purgatory/Makefile b/arch/powerpc/purgatory/Makefile index 4bda7f5a346a..fea0308c7f01 100644 --- a/arch/powerpc/purgatory/Makefile +++ b/arch/powerpc/purgatory/Makefile @@ -23,10 +23,12 @@ KBUILD_AFLAGS := -fno-exceptions -msoft-float -m$(CONFIG_WORD_SIZE) \ -D__ASSEMBLY__ ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) -KBUILD_CFLAGS += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) -KBUILD_AFLAGS += $(call cc-option,-mabi=elfv2) +KBUILD_CFLAGS += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) \ + -mlittle-endian +KBUILD_AFLAGS += $(call cc-option,-mabi=elfv2) -mlittle-endian else -KBUILD_CFLAGS += $(call cc-option,-mcall-aixdesc) +KBUILD_CFLAGS += $(call cc-option,-mcall-aixdesc) -mbig-endian +KBUILD_AFLAGS += -mbig-endian endif $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE