[kernel] r17008 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series

Ben Hutchings benh at alioth.debian.org
Sun Mar 6 22:06:01 UTC 2011 

Author: benh
Date: Sun Mar  6 22:05:41 2011
New Revision: 17008

Log:
Fix linux-tools build for i386 on an x86_64 kernel

Added:
   dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base
   dists/trunk/linux-2.6/debian/rules.real

Added: dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch	Sun Mar  6 22:05:41 2011	(r17008)
@@ -0,0 +1,147 @@
+From 2586084c10194e943bba6e6995412289b009571d Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 6 Mar 2011 21:56:24 +0000
+Subject: [PATCH] perf: Define make variables ARCH and SRCARCH consistently with Kbuild
+
+It is confusing to use RAW_ARCH/ARCH instead of ARCH/SRCARCH.  The
+current definitions also make it difficult to build for i386 on an
+x86_64 host.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ tools/perf/Makefile              |   20 ++++++++------------
+ tools/perf/arch/arm/Makefile     |    2 +-
+ tools/perf/arch/powerpc/Makefile |    2 +-
+ tools/perf/arch/s390/Makefile    |    2 +-
+ tools/perf/arch/sh/Makefile      |    2 +-
+ tools/perf/arch/sparc/Makefile   |    2 +-
+ tools/perf/arch/x86/Makefile     |    2 +-
+ 7 files changed, 14 insertions(+), 18 deletions(-)
+
+diff --git a/tools/perf/Makefile b/tools/perf/Makefile
+index 7141c42..c5d09b0 100644
+--- a/tools/perf/Makefile
++++ b/tools/perf/Makefile
+@@ -174,19 +174,15 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
+ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
+ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+ 
+-ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
++ARCH ?= $(uname_M)
++SRCARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
+ 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
+ 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
+ 				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+-				  -e s/sh[234].*/sh/ )
++				  -e s/sh[234].*/sh/ -e s/x86_64/x86/ )
+ 
+-# Additional ARCH settings for x86
+-ifeq ($(ARCH),i386)
+-        ARCH := x86
+-endif
++# Additional ARCH settings for x86_64
+ ifeq ($(ARCH),x86_64)
+-	RAW_ARCH := x86_64
+-        ARCH := x86
+ 	ARCH_CFLAGS := -DARCH_X86_64
+ 	ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S
+ endif
+@@ -305,7 +301,7 @@ endif
+ # Those must not be GNU-specific; they are shared with perl/ which may
+ # be built by a different compiler. (Note that this is an artifact now
+ # but it still might be nice to keep that distinction.)
+-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include
++BASIC_CFLAGS = -Iutil/include -Iarch/$(SRCARCH)/include
+ BASIC_LDFLAGS =
+ 
+ # Guard against environment variables
+@@ -488,7 +484,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
+ # Benchmark modules
+ BUILTIN_OBJS += $(OUTPUT)bench/sched-messaging.o
+ BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o
+-ifeq ($(RAW_ARCH),x86_64)
++ifeq ($(ARCH),x86_64)
+ BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy-x86-64-asm.o
+ endif
+ BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy.o
+@@ -533,7 +529,7 @@ ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)
+ endif # Dwarf support
+ endif # NO_DWARF
+ 
+--include arch/$(ARCH)/Makefile
++-include arch/$(SRCARCH)/Makefile
+ 
+ ifeq ($(uname_S),Darwin)
+ 	ifndef NO_FINK
+@@ -571,7 +567,7 @@ endif
+ 
+ ifndef NO_DWARF
+ ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
+-	msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);
++	msg := $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled);
+ else
+ 	BASIC_CFLAGS += -DDWARF_SUPPORT
+ 	EXTLIBS += -lelf -ldw
+diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/arm/Makefile
++++ b/tools/perf/arch/arm/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+diff --git a/tools/perf/arch/powerpc/Makefile b/tools/perf/arch/powerpc/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/powerpc/Makefile
++++ b/tools/perf/arch/powerpc/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+diff --git a/tools/perf/arch/s390/Makefile b/tools/perf/arch/s390/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/s390/Makefile
++++ b/tools/perf/arch/s390/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+diff --git a/tools/perf/arch/sh/Makefile b/tools/perf/arch/sh/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/sh/Makefile
++++ b/tools/perf/arch/sh/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+diff --git a/tools/perf/arch/sparc/Makefile b/tools/perf/arch/sparc/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/sparc/Makefile
++++ b/tools/perf/arch/sparc/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile
+index 15130b5..571affa 100644
+--- a/tools/perf/arch/x86/Makefile
++++ b/tools/perf/arch/x86/Makefile
+@@ -1,4 +1,4 @@
+ ifndef NO_DWARF
+ PERF_HAVE_DWARF_REGS := 1
+-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
++LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
+ endif
+-- 
+1.7.4.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Mar  6 19:55:55 2011	(r17007)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Mar  6 22:05:41 2011	(r17008)
@@ -47,3 +47,4 @@
 + bugfix/x86/Correct-a-typo-in-xen_do_hypervisor_callback-label.patch
 + bugfix/x86/Correct-a-typo-in-async_page_fault-label.patch
 + features/all/vt6656-Use-request_firmware-to-load-firmware.patch
++ features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Sun Mar  6 19:55:55 2011	(r17007)
+++ dists/trunk/linux-2.6/debian/rules.real	Sun Mar  6 22:05:41 2011	(r17008)
@@ -32,7 +32,7 @@
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
 MAKEOVERRIDES =
-MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1
+MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(DEB_BUILD_ARCH)
 
 #
 # Targets

More information about the Kernel-svn-changes mailing list