Skip to content

Commit 0df8e97

Browse files
committed
scripts: clean up IA-64 code
A little more janitorial work after commit cf8e865 ("arch: Remove Itanium (IA-64) architecture"). Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent 92ef432 commit 0df8e97

File tree

10 files changed

+6
-34
lines changed

10 files changed

+6
-34
lines changed

scripts/checkstack.pl

-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@
6868
# 2f60: 48 81 ec e8 05 00 00 sub $0x5e8,%rsp
6969
$re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%(e|r)sp$/o;
7070
$dre = qr/^.*[as][du][db] (%.*),\%(e|r)sp$/o;
71-
} elsif ($arch eq 'ia64') {
72-
#e0000000044011fc: 01 0f fc 8c adds r12=-384,r12
73-
$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
7471
} elsif ($arch eq 'm68k') {
7572
# 2b6c: 4e56 fb70 linkw %fp,#-1168
7673
# 1df770: defc ffe4 addaw #-28,%sp

scripts/gdb/linux/tasks.py

+3-12
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,12 @@ def invoke(self, arg, from_tty):
8686

8787
thread_info_type = utils.CachedType("struct thread_info")
8888

89-
ia64_task_size = None
90-
9189

9290
def get_thread_info(task):
9391
thread_info_ptr_type = thread_info_type.get_type().pointer()
94-
if utils.is_target_arch("ia64"):
95-
global ia64_task_size
96-
if ia64_task_size is None:
97-
ia64_task_size = gdb.parse_and_eval("sizeof(struct task_struct)")
98-
thread_info_addr = task.address + ia64_task_size
99-
thread_info = thread_info_addr.cast(thread_info_ptr_type)
100-
else:
101-
if task.type.fields()[0].type == thread_info_type.get_type():
102-
return task['thread_info']
103-
thread_info = task['stack'].cast(thread_info_ptr_type)
92+
if task.type.fields()[0].type == thread_info_type.get_type():
93+
return task['thread_info']
94+
thread_info = task['stack'].cast(thread_info_ptr_type)
10495
return thread_info.dereference()
10596

10697

scripts/head-object-list.txt

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ arch/arm/kernel/head-nommu.o
1717
arch/arm/kernel/head.o
1818
arch/csky/kernel/head.o
1919
arch/hexagon/kernel/head.o
20-
arch/ia64/kernel/head.o
2120
arch/loongarch/kernel/head.o
2221
arch/m68k/68000/head.o
2322
arch/m68k/coldfire/head.o

scripts/kconfig/mconf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ search_help[] =
247247
" -> PCI support (PCI [=y])\n"
248248
"(1) -> PCI access mode (<choice> [=y])\n"
249249
" Defined at drivers/pci/Kconfig:47\n"
250-
" Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
250+
" Depends on: X86_LOCAL_APIC && X86_IO_APIC\n"
251251
" Selects: LIBCRC32\n"
252252
" Selected by: BAR [=n]\n"
253253
"-----------------------------------------------------------------\n"

scripts/kconfig/nconf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ search_help[] =
216216
"Symbol: FOO [ = m]\n"
217217
"Prompt: Foo bus is used to drive the bar HW\n"
218218
"Defined at drivers/pci/Kconfig:47\n"
219-
"Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
219+
"Depends on: X86_LOCAL_APIC && X86_IO_APIC\n"
220220
"Location:\n"
221221
" -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
222222
" -> PCI support (PCI [ = y])\n"

scripts/package/kernel.spec

-6
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@ patch -p1 < %{SOURCE2}
5656

5757
%install
5858
mkdir -p %{buildroot}/boot
59-
%ifarch ia64
60-
mkdir -p %{buildroot}/boot/efi
61-
cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/efi/vmlinuz-%{KERNELRELEASE}
62-
ln -s efi/vmlinuz-%{KERNELRELEASE} %{buildroot}/boot/
63-
%else
6459
cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE}
65-
%endif
6660
%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install
6761
%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
6862
cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE}

scripts/package/mkdebian

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ set_debarch() {
2626

2727
# Attempt to find the correct Debian architecture
2828
case "$UTS_MACHINE" in
29-
i386|ia64|alpha|m68k|riscv*)
29+
i386|alpha|m68k|riscv*)
3030
debarch="$UTS_MACHINE" ;;
3131
x86_64)
3232
debarch=amd64 ;;

scripts/recordmcount.c

-1
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ static int do_file(char const *const fname)
590590
ideal_nop = ideal_nop4_arm64;
591591
is_fake_mcount64 = arm64_is_fake_mcount;
592592
break;
593-
case EM_IA_64: reltype = R_IA64_IMM64; break;
594593
case EM_MIPS: /* reltype: e_class */ break;
595594
case EM_LOONGARCH: /* reltype: e_class */ break;
596595
case EM_PPC: reltype = R_PPC_ADDR32; break;

scripts/recordmcount.pl

-7
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,6 @@
275275
$section_type = '%progbits';
276276
$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_AARCH64_CALL26\\s+_mcount\$";
277277
$type = ".quad";
278-
} elsif ($arch eq "ia64") {
279-
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
280-
$type = "data8";
281-
282-
if ($is_module eq "0") {
283-
$cc .= " -mconstant-gp";
284-
}
285278
} elsif ($arch eq "sparc64") {
286279
# In the objdump output there are giblets like:
287280
# 0000000000000000 <igmp_net_exit-0x18>:

scripts/xz_wrap.sh

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ LZMA2OPTS=
1515
case $SRCARCH in
1616
x86) BCJ=--x86 ;;
1717
powerpc) BCJ=--powerpc ;;
18-
ia64) BCJ=--ia64; LZMA2OPTS=pb=4 ;;
1918
arm) BCJ=--arm ;;
2019
sparc) BCJ=--sparc ;;
2120
esac

0 commit comments

Comments
 (0)