73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
From: dann frazier <dannf@debian.org>
|
|
Subject: Hardcode arch script output
|
|
Date: Mon, 26 Mar 2007 16:30:51 -0600
|
|
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.
|
|
|
|
Index: linux/arch/ia64/Makefile
|
|
===================================================================
|
|
--- linux.orig/arch/ia64/Makefile
|
|
+++ linux/arch/ia64/Makefile
|
|
@@ -30,16 +30,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -
|
|
-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
|
|
|
|
KBUILD_CFLAGS += $(cflags-y)
|
|
head-y := arch/ia64/kernel/head.o
|
|
@@ -65,7 +56,7 @@ boot := arch/ia64/hp/sim/boot
|
|
|
|
PHONY += boot compressed check
|
|
|
|
-all: compressed unwcheck
|
|
+all: compressed
|
|
|
|
compressed: vmlinux.gz
|
|
|
|
@@ -74,9 +65,6 @@ vmlinuz: vmlinux.gz
|
|
vmlinux.gz: vmlinux
|
|
$(Q)$(MAKE) $(build)=$(boot) $@
|
|
|
|
-unwcheck: vmlinux
|
|
- -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<
|
|
-
|
|
archclean:
|
|
$(Q)$(MAKE) $(clean)=$(boot)
|
|
|
|
@@ -92,7 +80,6 @@ define archhelp
|
|
echo '* compressed - Build compressed kernel image'
|
|
echo ' install - Install compressed kernel image'
|
|
echo ' boot - Build vmlinux and bootloader for Ski simulator'
|
|
- echo '* unwcheck - Check vmlinux for invalid unwind info'
|
|
endef
|
|
|
|
archprepare: make_nr_irqs_h
|