From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 21 Sep 2005 16:39:32 +0000 (+0200) Subject: [PATCH] uml: Fix conflict between libc and ipv6 X-Git-Tag: v3.12-rc1~41410 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd7481047882eaa0a692a545d5f8419612ece1b0;p=kernel%2Fkernel-generic.git [PATCH] uml: Fix conflict between libc and ipv6 gcc is now complaining during link on some hosts - fix it as for other things. Reported by Antoine Martin . Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Linus Torvalds --- diff --git a/arch/um/Makefile b/arch/um/Makefile index ce98726..5b5af95 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -53,9 +53,13 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) # -Dvmap=kernel_vmap affects everything, and prevents anything from # referencing the libpcap.o symbol so named. +# +# Same things for in6addr_loopback - found in libc. CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ - $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap + $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ + -Din6addr_loopback=kernel_in6addr_loopback + AFLAGS += $(ARCH_INCLUDE) USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))