From 7d5cc229064b0e718046b9ecaebad3426dfff15f Mon Sep 17 00:00:00 2001 From: Yasuyuki KOZAKAI Date: Sat, 30 Jun 2007 10:47:57 +0000 Subject: Removes KERNEL_64_USERSPACE_32 The recent kernel has compat layer for iptables. It doesn't have compat layer for libipq and ip6tables, but ip6tables with KERNEL_64_USERSPACE_32 is still broken. We should fix kernel instead of fixing them if and when we want use their 32bit binary with 64bit kernel. --- Makefile | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index df04d35a..76d8e407 100644 --- a/Makefile +++ b/Makefile @@ -59,39 +59,6 @@ EXTRAS_EXP+=ip6tables-save ip6tables-restore EXTRA_INSTALLS_EXP+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8 endif -# Sparc64 hack -ifeq ($(shell uname -m),sparc64) - POINTERTEST:=1 - 32bituser := $(shell echo -e "\#include \n\#if !defined(__sparcv9) && !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit) - ifdef 32bituser - # The kernel is 64-bit, even though userspace is 32. - CFLAGS+=-DIPT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 - else - EXT_LDFLAGS+=-Wl,-m,elf64_sparc - endif -endif - -# Alpha only has 64bit userspace and fails the test below -ifeq ($(shell uname -m), alpha) - POINTERTEST:=1 -endif - -# Generic test if arch wasn't found above -ifneq ($(POINTERTEST),1) - # Try to determine if kernel is 64bit and we are compiling for 32bit - ifeq ($(shell [ -d $(KERNEL_DIR)/include/asm ] && echo YES), YES) - 64bitkernel := $(shell echo -e "\#include \n\#if BITS_PER_LONG == 64\nkernel_is_64bits\n\#endif" | $(CC) $(CFLAGS) -D__KERNEL__ -E - | grep kernel_is_64bits) - ifdef 64bitkernel - 32bituser := $(shell echo -e "\#include \n\#if !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit) - ifdef 32bituser - CFLAGS+=-DIPT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 - endif - endif - else - CFLAGS+=-D_UNKNOWN_KERNEL_POINTER_SIZE - endif -endif - ifndef IPT_LIBDIR IPT_LIBDIR:=$(LIBDIR)/iptables endif -- cgit v1.2.3