From e567964a54b854354492a90d4d2c1e9541e4901d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 12 Sep 2012 17:55:27 +0100 Subject: tools: drop ia64 support Removed support from libxc and mini-os. This also took me under xen/include/public via various symlinks. Dropped tools/debugger/xenitp entirely, it was described upon commit as: "Xenitp is a low-level debugger for ia64" and doesn't appear to be linked into the build anywhere. 99 files changed, 14 insertions(+), 32361 deletions(-) Signed-off-by: Ian Campbell Acked-by: Keir Fraser Committed-by: Ian Campbell --- tools/include/Makefile | 6 +----- tools/include/xen-foreign/Makefile | 5 +---- tools/include/xen-foreign/mkheader.py | 14 -------------- tools/include/xen-foreign/reference.size | 30 +++++++++++++++--------------- 4 files changed, 17 insertions(+), 38 deletions(-) (limited to 'tools/include') diff --git a/tools/include/Makefile b/tools/include/Makefile index cbff41b93e..9ed41f1670 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -13,7 +13,7 @@ xen/.dir: mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen - ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign @@ -21,8 +21,6 @@ xen/.dir: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-ia64 - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-ia64/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign @@ -32,8 +30,6 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen - $(INSTALL_DATA) xen/arch-ia64/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-ia64 - $(INSTALL_DATA) xen/arch-ia64/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-ia64/hvm $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 0de9018310..8b22b10960 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk ROOT = $(XEN_ROOT)/xen/include/public -architectures := x86_32 x86_64 ia64 +architectures := x86_32 x86_64 headers := $(patsubst %, %.h, $(architectures)) .PHONY: all clean check-headers @@ -28,8 +28,5 @@ x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/ x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h $(PYTHON) $< $* $@ $(filter %.h,$^) -ia64.h: mkheader.py structs.py $(ROOT)/arch-ia64.h $(ROOT)/xen.h - $(PYTHON) $< $* $@ $(filter %.h,$^) - checker.c: mkchecker.py structs.py $(PYTHON) $< $@ $(architectures) diff --git a/tools/include/xen-foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py index 8b249e3dfc..797a8805b9 100644 --- a/tools/include/xen-foreign/mkheader.py +++ b/tools/include/xen-foreign/mkheader.py @@ -47,20 +47,6 @@ header["x86_64"] = """ #define __x86_64___X86_64 1 """; -# ia64 -inttypes["ia64"] = { - "unsigned long" : "__align8__ uint64_t", - "long" : "__align8__ uint64_t", - "xen_pfn_t" : "__align8__ uint64_t", - "long double" : "__align16__ ldouble_t", -}; -header["ia64"] = """ -#define __align8__ __attribute__((aligned (8))) -#define __align16__ __attribute__((aligned (16))) -typedef unsigned char ldouble_t[16]; -"""; - - ########################################################################### # main diff --git a/tools/include/xen-foreign/reference.size b/tools/include/xen-foreign/reference.size index 5f2908502b..c58df4d9b6 100644 --- a/tools/include/xen-foreign/reference.size +++ b/tools/include/xen-foreign/reference.size @@ -1,18 +1,18 @@ -structs | x86_32 x86_64 ia64 +structs | x86_32 x86_64 -start_info | 1112 1168 1168 -trap_info | 8 16 - -pt_fpreg | - - 16 -cpu_user_regs | 68 200 - -xen_ia64_boot_param | - - 96 -ia64_tr_entry | - - 32 -vcpu_tr_regs | - - 768 -vcpu_guest_context_regs | - - 22176 -vcpu_guest_context | 2800 5168 22208 -arch_vcpu_info | 24 16 0 -vcpu_time_info | 32 32 32 -vcpu_info | 64 64 48 -arch_shared_info | 268 280 272 -shared_info | 2584 3368 4384 +start_info | 1112 1168 +trap_info | 8 16 +pt_fpreg | - - +cpu_user_regs | 68 200 +xen_ia64_boot_param | - - +ia64_tr_entry | - - +vcpu_tr_regs | - - +vcpu_guest_context_regs | - - +vcpu_guest_context | 2800 5168 +arch_vcpu_info | 24 16 +vcpu_time_info | 32 32 +vcpu_info | 64 64 +arch_shared_info | 268 280 +shared_info | 2584 3368 -- cgit v1.2.3