From 2b67fabed9018c20d60a7d580e707779bfbebe9e Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Thu, 23 Jun 2005 00:46:11 +0000 Subject: [PATCH] Update the powerpc-ppc64-biarch-override.patch from Sven, include as it now applies cleanly. svn path=/branches/linux-kernel-2.6.12/; revision=3394 --- debian/TODO.patches | 4 +- .../powerpc-ppc64-biarch-override.patch | 44 +++++++++++++++++++ debian/patches-debian/series/2.6.12-1 | 1 + 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 debian/patches-debian/powerpc-ppc64-biarch-override.patch diff --git a/debian/TODO.patches b/debian/TODO.patches index 0ff80ce9e..b2cf68b0b 100644 --- a/debian/TODO.patches +++ b/debian/TODO.patches @@ -10,14 +10,14 @@ powerpc-g4-l2-flush-errata.patch NOT ACCEPTED. Needs to be reviewed. Last hunk fails to apply to include/asm-ppc/cputable.h, as patch introduces a #define conflicting with the existing one. -powerpc-ppc64-biarch-override.patch - NOT ACCEPTED. Needs to be reviewed, as fails to apply completely. sparc32-hypersparc-srmmu.patch Presumably not required, but as sparc32 is currently broken, there is no way to tell for sure. These are already processed: ---------------------------- +powerpc-ppc64-biarch-override.patch + ACCEPTED in akpm tree, INCLUDED as a backport. ia64-generic-nosmp.patch NOT ACCEPTED | REDIFFED | INCLUDED. qla2xxx-removed.patch diff --git a/debian/patches-debian/powerpc-ppc64-biarch-override.patch b/debian/patches-debian/powerpc-ppc64-biarch-override.patch new file mode 100644 index 000000000..c132bf3c9 --- /dev/null +++ b/debian/patches-debian/powerpc-ppc64-biarch-override.patch @@ -0,0 +1,44 @@ +# Subject: [patch 059/167] ppc64: override command line AS/LD/CC variables when adding -m64 and co for biarch compilers +# To: torvalds@osdl.org +# Cc: akpm@osdl.org, sven.luther@wanadoo.fr, anton@samba.org, +# benh@kernel.crashing.org, paulus@samba.org +# From: akpm@osdl.org +# +# The following kind of calls currently fails : +# +# make ARCH=ppc64 CC="gcc-3.4" +# +# Since the code for detecting a biarch compiler and adding the needed 64bit +# magic argument fails if the AS/LD/CC commands are overriden in the command +# line. +# +# The attached patch fixes this by using the make override and += directive, +# but i am not 100% sure this will work without gmake, as i am no Makefile +# expert. +# +# Cc: Paul Mackerras +# Cc: Anton Blanchard +# Cc: Benjamin Herrenschmidt +# Signed-off-by: Andrew Morton +# --- +# +# arch/ppc64/Makefile | 6 +++--- +# 1 files changed, 3 insertions(+), 3 deletions(-) +# +diff -puN arch/ppc64/Makefile~ppc64-override-command-line-as-ld-cc-variables-when-adding-m64-and-co-for-biarch-compilers arch/ppc64/Makefile +--- 25/arch/ppc64/Makefile~ppc64-override-command-line-as-ld-cc-variables-when-adding-m64-and-co-for-biarch-compilers 2005-06-21 16:29:10.000000000 -0700 ++++ 25-akpm/arch/ppc64/Makefile 2005-06-21 16:29:10.000000000 -0700 +@@ -35,9 +35,9 @@ CROSS32AS := $(AS) -a32 + CROSS32LD := $(LD) -m elf32ppc + CROSS32OBJCOPY := $(OBJCOPY) + endif +-AS := $(AS) -a64 +-LD := $(LD) -m elf64ppc +-CC := $(CC) -m64 ++override AS += -a64 ++override LD += -m elf64ppc ++override CC += -m64 + endif + + export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY +_ diff --git a/debian/patches-debian/series/2.6.12-1 b/debian/patches-debian/series/2.6.12-1 index 19fb33e64..e5fa25f16 100644 --- a/debian/patches-debian/series/2.6.12-1 +++ b/debian/patches-debian/series/2.6.12-1 @@ -21,3 +21,4 @@ + tty-locking-fixes9.patch + ia64-generic-nosmp.patch + patch-2.6.12.1 ++ powerpc-ppc64-biarch-override.patch