Revert "Fix basic tools cross-build"

This reverts commit 9339dfe565d237e5a40d8dc37bffb161caec5d1c.

6 files changed, 26 insertions, 30 deletions

diff --git a/debian.linaro/control.stub.in b/debian.linaro/control.stub.in
index ab3d78fcaed..583a3819b7a 100644
--- a/debian.linaro/control.stub.in
+++ b/debian.linaro/control.stub.in
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
 Standards-Version: 3.8.4.0
-Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf]
+Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386]
 Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc
 Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-raring.git
diff --git a/debian.linaro/rules.d/arm64.mk b/debian.linaro/rules.d/arm64.mk
index 84d1847e4bf..8a587d922d5 100644
--- a/debian.linaro/rules.d/arm64.mk
+++ b/debian.linaro/rules.d/arm64.mk
@@ -1,10 +1,10 @@
 human_arch	= ARMv8
-kernel_arch	= arm64
+build_arch	= arm64
 header_arch	= arm64
 defconfig	= defconfig
 flavours	= omap
 build_image	= zImage
-kernel_file	= arch/$(kernel_arch)/boot/zImage
+kernel_file	= arch/$(build_arch)/boot/zImage
 install_file	= vmlinuz
 no_dumpfile = true
 
diff --git a/debian.linaro/rules.d/armhf.mk b/debian.linaro/rules.d/armhf.mk
index 2afbe7a15d4..6ab17fa40fc 100644
--- a/debian.linaro/rules.d/armhf.mk
+++ b/debian.linaro/rules.d/armhf.mk
@@ -1,11 +1,11 @@
 human_arch	= ARM (hard float)
-kernel_arch	= arm
+build_arch	= arm
 header_arch	= arm
 defconfig	= defconfig
 #flavours = linaro-SOCFLAVOUR
 flavours = linaro-SOCFLAVOUR
 build_image	= zImage
-kernel_file	= arch/$(kernel_arch)/boot/zImage
+kernel_file	= arch/$(build_arch)/boot/zImage
 install_file	= vmlinuz
 no_dumpfile	= true
 
@@ -13,7 +13,7 @@ loader		= grub
 do_tools	= true
 
 # Flavour specific configuration.
-dtb_file_highbank	= arch/$(kernel_arch)/boot/highbank.dtb
+dtb_file_highbank	= arch/$(build_arch)/boot/highbank.dtb
 skipmodule	= true
 skipabi	= true
 disable_d_i	= true
diff --git a/debian/rules b/debian/rules
index 32f097e521c..1c90fd5c11a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -226,15 +226,15 @@ debian/control: $(DEBIAN)/control.stub
 	    done;							\
 	fi
 
-	if [ ! -d $(builddir)/modules/$(kernel_arch) ]; then		\
-		mkdir -p $(builddir)/modules/$(kernel_arch);		\
+	if [ ! -d $(builddir)/modules/$(build_arch) ]; then		\
+		mkdir -p $(builddir)/modules/$(build_arch);		\
 		cp $(builddir)/modules/$(arch)/*			\
-			$(builddir)/modules/$(kernel_arch) || true;		\
+			$(builddir)/modules/$(build_arch) || true;		\
 	fi
-	if [ ! -d $(builddir)/firmware/$(kernel_arch) ]; then		\
-		mkdir -p $(builddir)/firmware/$(kernel_arch);		\
+	if [ ! -d $(builddir)/firmware/$(build_arch) ]; then		\
+		mkdir -p $(builddir)/firmware/$(build_arch);		\
 		cp $(builddir)/firmware/$(arch)/*			\
-			$(builddir)/firmware/$(kernel_arch) || true;		\
+			$(builddir)/firmware/$(build_arch) || true;		\
 	fi
 
 	cp $(DEBIAN)/control.stub debian/control.stub
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 84c2167b1ef..dc0fcf070be 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -109,7 +109,8 @@ endif
 
 #
 # Detect invocations of the form 'dpkg-buildpackage -B -aarmhf' within
-# an x86'en schroot. This is the correct way to build all of the packages.
+# an x86'en schroot. This is the only way to build all of the packages
+# (except for tools).
 #
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)-
@@ -216,7 +217,7 @@ endif
 conc_level		= -j$(CONCURRENCY_LEVEL)
 
 # target_flavour is filled in for each step
-kmake = make ARCH=$(kernel_arch) \
+kmake = make ARCH=$(build_arch) \
 	CROSS_COMPILE=$(CROSS_COMPILE) \
 	KERNELVERSION=$(abi_release)-$(target_flavour) \
 	CONFIG_DEBUG_SECTION_MISMATCH=y \
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index be40c712639..700236aad5a 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -10,7 +10,6 @@ build_cd =
 build_O  = O=$(builddir)/build-$*
 endif
 crossbuildscripts=$(shell grep KBUILD_SCRIPTROOT scripts/Makefile.build && echo "true")
-STRIP = $(CROSS_COMPILE)strip
 
 kbsr      = $(builddir)/build-$*
 
@@ -98,9 +97,9 @@ endif
 	install -m600 $(builddir)/build-$*/System.map \
 		$(pkgdir)/boot/System.map-$(abi_release)-$*
 	install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \
-	install -m644 $(builddir)/build-$*/arch/$(kernel_arch)/boot/*.dtb \
+	install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/*.dtb \
 		$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/ || true
-	install -m644 $(builddir)/build-$*/arch/$(kernel_arch)/boot/dts/*.dtb \
+	install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/dts/*.dtb \
 		$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/ || true
 ifeq ($(no_dumpfile),)
 	makedumpfile -g $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* \
@@ -147,7 +146,7 @@ endif
 	install -d $(pkgdir)/DEBIAN
 	for script in postinst postrm preinst prerm; do				\
 	  sed -e 's/=V/$(abi_release)-$*/g' -e 's/=K/$(instfile)/g'		\
-	      -e 's/=L/$(loader)/g'         -e 's@=B@$(kernel_arch)@g'		\
+	      -e 's/=L/$(loader)/g'         -e 's@=B@$(build_arch)@g'		\
 	       $(DROOT)/control-scripts/$$script > $(pkgdir)/DEBIAN/$$script;	\
 	  chmod 755 $(pkgdir)/DEBIAN/$$script;					\
 	done
@@ -156,7 +155,7 @@ endif
 		install -d $(pkgdir_ex)/DEBIAN;					\
 		for script in postinst postrm ; do				\
 			sed -e 's/=V/$(abi_release)-$*/g' -e 's/=K/$(instfile)/g'		\
-			    -e 's/=L/$(loader)/g'         -e 's@=B@$(kernel_arch)@g'		\
+			    -e 's/=L/$(loader)/g'         -e 's@=B@$(build_arch)@g'		\
 			    debian/control-scripts/$$script > $(pkgdir_ex)/DEBIAN/$$script; \
 			chmod 755 $(pkgdir_ex)/DEBIAN/$$script;			\
 		done;								\
@@ -182,7 +181,7 @@ ifneq ($(skipsub),true)
 			sed -e 's/=V/$(abi_release)-$*/g'			\
 			    -e 's/=K/$(instfile)/g'				\
 			    -e 's/=L/$(loader)/g'				\
-			    -e 's@=B@$(kernel_arch)@g'				\
+			    -e 's@=B@$(build_arch)@g'				\
 				$(DROOT)/control-scripts/$$script >		\
 				debian/$(bin_pkg_name)-$$sub/DEBIAN/$$script;\
 			chmod 755  debian/$(bin_pkg_name)-$$sub/DEBIAN/$$script;\
@@ -267,7 +266,7 @@ endif
 	done
 
 	# At the end of the package prep, call the tests
-	DPKG_ARCH="$(arch)" KERN_ARCH="$(kernel_arch)" FLAVOUR="$*"	\
+	DPKG_ARCH="$(arch)" KERN_ARCH="$(build_arch)" FLAVOUR="$*"	\
 	 VERSION="$(abi_release)" REVISION="$(revision)"		\
 	 PREV_REVISION="$(prev_revision)" ABI_NUM="$(abinum)"		\
 	 PREV_ABI_NUM="$(prev_abinum)" BUILD_DIR="$(builddir)/build-$*"	\
@@ -465,12 +464,8 @@ endif
 $(stampdir)/stamp-build-perarch: $(stampdir)/stamp-prepare-perarch
 	@echo Debug: $@
 ifeq ($(do_tools),true)
-        # we don't have cross-libiberty yet so avoid it by leaving out C++ demangling
-ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	features=HAVE_CPLUS_DEMANGLE=1
-endif
 	cd $(builddirpa)/tools/perf && \
-		make $(features) ARCH=$(header_arch) CROSS_COMPILE=$(CROSS_COMPILE)
+		make HAVE_CPLUS_DEMANGLE=1 CROSS_COMPILE=$(CROSS_COMPILE)
 	if [ "$(arch)" = "amd64" ] || [ "$(arch)" = "i386" ]; then \
 		cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE); \
 		cd $(builddirpa)/tools/power/x86/turbostat && make CROSS_COMPILE=$(CROSS_COMPILE); \
@@ -487,16 +482,16 @@ install-perarch: $(stampdir)/stamp-build-perarch
 	# Add the tools.
 ifeq ($(do_tools),true)
 	install -d $(toolspkgdir)/usr/bin
-	install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/perf/perf \
+	install -s -m755 $(builddirpa)/tools/perf/perf \
 		$(toolspkgdir)/usr/bin/perf_$(abi_release)
 	if [ "$(arch)" = "amd64" ] || [ "$(arch)" = "i386" ]; then \
-		install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \
+		install -s -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \
 			$(toolspkgdir)/usr/bin/x86_energy_perf_policy_$(abi_release); \
-		install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \
+		install -s -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \
 			$(toolspkgdir)/usr/bin/turbostat_$(abi_release); \
 		if [ "$(do_hyperv)" = "true" ]; then \
 			install -d $(toolspkgdir)/usr/sbin; \
-			install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \
+			install -s -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \
 				$(toolspkgdir)/usr/sbin/hv_kvp_daemon_$(abi_release); \
 		fi; \
 	fi