Hardcode arch script output

Bug-Debian: https://bugs.debian.org/392592
Forwarded: not-needed

Here's a patch that simply uses hardcoded definitions instead of
doing the dynamic tests that require architecture-specific scripts.

I don't particularly like this approach because it restricts
portability and diverts from upstream. But, it is simpler, and this
really needs to be fixed somehow before etch (along with a rebuild of
linux-modules-extra-2.6), so I'm willing to live with it if my other
patch is deemed unacceptable.

My primary concern is that, in the future, the output of these scripts
will change and we (or our successors) will either not notice or
forget to update the hardcoded values.

Including the scripts in linux-kbuild will avoid this manual step
altogether, and allow for the possibility of other archs to provide
their own scripts in the future.

Gbp-Pq: Topic debian
Gbp-Pq: Name ia64-hardcode-arch-script-output.patch

diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 703b1c4f6d12355f1115f33f45c2433c6db16ab0..cd0cb29f5e619f0d7bdc944db3e1a6e5a43a9512 100644 (file)
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -27,16 +27,7 @@ cflags-y     := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
                   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
 KBUILD_CFLAGS_KERNEL := -mconstant-gp
 
-GAS_STATUS     = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
-KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
-
-ifeq ($(GAS_STATUS),buggy)
-$(error Sorry, you need a newer version of the assember, one that is built from        \
-       a source-tree that post-dates 18-Dec-2002.  You can find a pre-compiled \
-       static binary of such an assembler at:                                  \
-                                                                               \
-               ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
-endif
+KBUILD_CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE
 
 quiet_cmd_gzip = GZIP    $@
 cmd_gzip = cat $(real-prereqs) | $(KGZIP) -n -f -9 > $@
@@ -56,7 +47,7 @@ drivers-$(CONFIG_OPROFILE)    += arch/ia64/oprofile/
 
 PHONY += compressed check
 
-all: compressed unwcheck
+all: compressed
 
 compressed: vmlinux.gz
 
@@ -68,9 +59,6 @@ vmlinux.gz: vmlinux.bin FORCE
 vmlinux.bin: vmlinux FORCE
        $(call if_changed,objcopy)
 
-unwcheck: vmlinux
-       -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<
-
 archclean:
 
 archheaders:
@@ -84,7 +72,6 @@ install: vmlinux.gz
 define archhelp
   echo '* compressed   - Build compressed kernel image'
   echo '  install      - Install compressed kernel image'
-  echo '* unwcheck     - Check vmlinux for invalid unwind info'
 endef
 
 archprepare: make_nr_irqs_h