Raise minimum binutils version and remove
Subsystems (3)
RFC PATCH 1/1 Raise minimum binutils version and remove
I believe all these bugs were fixed by 2.16, and that's old enough now that it seems reasonable to require it as a minimum version.
This is an RFC only for now since I'm not really familiar with ia64. In Debian we've been patching these checks out for a while so that they don't run when building OOT modules.
Ben.
--- Documentation/Changes | 2 +- arch/ia64/Makefile | 17 +-------- arch/ia64/include/asm/asmmacro.h | 20 ++--------- arch/ia64/include/asm/gcc_intrin.h | 9 +---- arch/ia64/include/asm/percpu.h | 4 +-- arch/ia64/kernel/paravirt.c | 4 -- arch/ia64/scripts/check-gas | 15 -------- arch/ia64/scripts/check-gas-asm.S | 2 - arch/ia64/scripts/check-model.c | 1 - arch/ia64/scripts/check-segrel.S | 4 -- arch/ia64/scripts/check-segrel.lds | 12 ------ arch/ia64/scripts/check-serialize.S | 2 - arch/ia64/scripts/check-text-align.S | 6 --- arch/ia64/scripts/toolchain-flags | 53 ---------------------------- arch/ia64/scripts/unwcheck.py | 64 ---------------------------------- 15 files changed, 8 insertions(+), 207 deletions(-) delete mode 100755 arch/ia64/scripts/check-gas delete mode 100644 arch/ia64/scripts/check-gas-asm.S delete mode 100644 arch/ia64/scripts/check-model.c delete mode 100644 arch/ia64/scripts/check-segrel.S delete mode 100644 arch/ia64/scripts/check-segrel.lds delete mode 100644 arch/ia64/scripts/check-serialize.S delete mode 100644 arch/ia64/scripts/check-text-align.S delete mode 100755 arch/ia64/scripts/toolchain-flags delete mode 100644 arch/ia64/scripts/unwcheck.py
Documentation/Changes +1 -1
@@ -30,7 +30,7 @@ isdn4k-utils. o Gnu C 3.2 # gcc --version o Gnu make 3.80 # make --version -o binutils 2.12 # ld -v +o binutils 2.12 (2.16 for ia64) # ld -v o util-linux 2.10o # fdformat --version o module-init-tools 0.9.10 # depmod -V o e2fsprogs 1.41.4 # e2fsck -V
arch/ia64/Makefile +1 -16
@@ -30,17 +30,6 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-rangeñ2-f15,f32-f127 \ -falign-functions2 -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_CFLAGS += $(cflags-y) head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
@@ -68,7 +57,7 @@ boot := arch/ia64/hp/sim/boot PHONY += boot compressed check -all: compressed unwcheck +all: compressed compressed: vmlinux.gz
@@ -77,9 +66,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)
@@ -95,7 +81,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 FORCE
arch/ia64/include/asm/asmmacro.h +3 -17
@@ -113,23 +113,9 @@ name: [1:] adds reg=IA64_NUM_PHYS_STACK_REG*8+8,r0; \ .xdata4 ".data..patch.phys_stack_reg", 1b-. -/* -* Up until early 2004, use of .align within a function caused bad unwind info. -* TEXT_ALIGN(n) expands into ".align n" if a fixed GAS is available or into nothing -* otherwise. -*/ -#ifdef HAVE_WORKING_TEXT_ALIGN -# define TEXT_ALIGN (n) .align n -#else -# define TEXT_ALIGN (n) -#endif +#define TEXT_ALIGN (n) .align n -#ifdef HAVE_SERIALIZE_DIRECTIVE -# define dv_serialize_data .serialize.data -# define dv_serialize_instruction .serialize.instruction -#else -# define dv_serialize_data -# define dv_serialize_instruction -#endif +#define dv_serialize_data .serialize.data +#define dv_serialize_instruction .serialize.instruction#endif /* _ASM_IA64_ASMMACRO_H */
arch/ia64/include/asm/gcc_intrin.h +2 -7
@@ -396,13 +396,8 @@ register unsigned long ia64_r13 asm ("r13") __used;#define ia64_srlz_i () asm volatile (";; srlz.i ;;" ::: "memory")#define ia64_srlz_d () asm volatile (";; srlz.d" ::: "memory"); -#ifdef HAVE_SERIALIZE_DIRECTIVE -# define ia64_dv_serialize_data () asm volatile (".serialize.data"); -# define ia64_dv_serialize_instruction () asm volatile (".serialize.instruction"); -#else -# define ia64_dv_serialize_data () -# define ia64_dv_serialize_instruction () -#endif +#define ia64_dv_serialize_data () asm volatile (".serialize.data"); +#define ia64_dv_serialize_instruction () asm volatile (".serialize.instruction");#define ia64_nop (x) asm volatile ("nop %0"::"i"(x));
arch/ia64/include/asm/percpu.h +1 -3
@@ -17,9 +17,7 @@#ifdef CONFIG_SMP -#ifdef HAVE_MODEL_SMALL_ATTRIBUTE -# define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__))) -#endif +#define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__)))#define __my_cpu_offset __ia64_per_cpu_var(local_per_cpu_offset)
arch/ia64/kernel/paravirt.c +0 -4
@@ -488,9 +488,7 @@ __DEFINE_FUNC(setreg,"cmp.eq p6, p0 = r2, r9\n" ";;\n" "(p6) mov psr.l = r8\n" -#ifdef HAVE_SERIALIZE_DIRECTIVE".serialize.data\n" -#endif"(p6) br.cond.sptk.many b6\n" __DEFINE_SET_REG(GP, gp)__DEFINE_SET_REG (SP , sp)
@@ -682,9 +680,7 @@ IA64_NATIVE_PATCH_DEFINE_GET_REG(tp, tp);__DEFINE_FUNC (set_psr_l,";;\n" "mov psr.l = r8\n" -#ifdef HAVE_SERIALIZE_DIRECTIVE".serialize.data\n" -#endif";;\n" );IA64_NATIVE_PATCH_DEFINE_REG (gp, gp);
arch/ia64/scripts/check-gas deleted +0 -15
@@ -1,15 +0,0 @@ -#!/bin/sh -dir=$(dirname $0) -CC=$1 -OBJDUMP=$2 -tmp=${TMPDIR:-/tmp} -out=$tmp/out$$.o -$CC -c $dir/check-gas-asm.S -o $out -res=$($OBJDUMP -r --section .data $out | fgrep 00004 | tr -s ' ' |cut -f3 -d' ') -rm -f $out -if [ $res != ".text" ]; then - echo buggy -else - echo good -fi -exit 0
arch/ia64/scripts/check-gas-asm.S deleted +0 -2
@@ -1,2 +0,0 @@ -[1:] nop 0 - .xdata4 ".data", 0, 1b-.
arch/ia64/scripts/check-model.c deleted +0 -1
@@ -1 +0,0 @@ -int __attribute__ ((__model__ (__small__))) x;
arch/ia64/scripts/check-segrel.S deleted +0 -4
@@ -1,4 +0,0 @@ - .rodata - data4 @segrel(start) - .data -start:
arch/ia64/scripts/check-segrel.lds deleted +0 -12
@@ -1,12 +0,0 @@ -SECTIONS { - . = SIZEOF_HEADERS; - .rodata : { *(.rodata) } :ro - .note : { *(.note*) } - . = 0xa0000; - .data : { *(.data) } :dat - /DISCARD/ : { *(*) } -} -PHDRS { - ro PT_LOAD FILEHDR PHDRS; - dat PT_LOAD; -}
arch/ia64/scripts/check-serialize.S deleted +0 -2
@@ -1,2 +0,0 @@ - .serialize.data - .serialize.instruction
arch/ia64/scripts/check-text-align.S deleted +0 -6
@@ -1,6 +0,0 @@ - .proc foo - .prologue -foo: .save rp, r2 - nop 0 - .align 64 - .endp foo
arch/ia64/scripts/toolchain-flags deleted +0 -53
53 lines not on this page · raw message
arch/ia64/scripts/unwcheck.py deleted +0 -64
64 lines not on this page · raw message
Signature · 1 line
1.7.1
Quoted 10 lines · Ben Hutchings
Documentation/Changes +0
-0@@ -30,7 +30,7 @@ isdn4k-utils.o Gnu C 3.2 # gcc --version
o Gnu make 3.80 # make --versionDocumentation/Changes +1
-1-o binutils 2.12 # ld -v +o binutils 2.12 (2.16 for ia64) # ld -v
Quoted 3 lines
o util-linux 2.10o # fdformat --version
o module-init-tools 0.9.10 # depmod -V
o e2fsprogs 1.41.4 # e2fsck -V
Won't this file become a complete mess if each architecture starts specifying its own version for each of the tools? Is it likely that all the others will follow ia64's bold lead in moving past 2.12 for binutils?
Overall this patch looks to be a good idea (oldest binutils on any of my systems is 2.17) ... so clearing out all the ancient tests for long-fixed bugs is nice. But I worry about being the trend setter here.
-Tony
Quoted 7 lines · Tony Luck
Quoted 6 lines · Ben Hutchings
Documentation/Changes +0
-0@@ -30,7 +30,7 @@ isdn4k-utils.
Quoted 10 lines
Documentation/Changes isdn4k-utils. · line 36
Quoted 7 lines
Documentation/Changes +1
-1o Gnu C 3.2 # gcc --version o Gnu make 3.80 # make --version -o binutils 2.12 # ld -v +o binutils 2.12 (2.16 for ia64) # ld -v o util-linux 2.10o # fdformat --version o module-init-tools 0.9.10 # depmod -V o e2fsprogs 1.41.4 # e2fsck -VWon't this file become a complete mess if each architecture starts specifying its own version for each of the tools?
[...]
Maybe, though the only things likely to need per-architecture fixes or features are gcc and binutils.
By the way, I did a little more research and found that the bug unwcheck.py is checking for was in binutils 2.16, so the minimum would actually have to be 2.17 (or a distro-fixed 2.16).
Ben.
Signature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.