diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-09-21 12:39:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 19:16:30 -0400 |
| commit | fd7481047882eaa0a692a545d5f8419612ece1b0 (patch) | |
| tree | af6c5283673881234f9f7615472b0d417ee6ca8f /arch | |
| parent | 8e5cb35a60c8792ffc3ba89ea66ebdd3c2f01cb1 (diff) | |
[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 <antoine@nagafix.co.uk>.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index ce987266dac6..5b5af95721ab 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -53,9 +53,13 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) | |||
| 53 | 53 | ||
| 54 | # -Dvmap=kernel_vmap affects everything, and prevents anything from | 54 | # -Dvmap=kernel_vmap affects everything, and prevents anything from |
| 55 | # referencing the libpcap.o symbol so named. | 55 | # referencing the libpcap.o symbol so named. |
| 56 | # | ||
| 57 | # Same things for in6addr_loopback - found in libc. | ||
| 56 | 58 | ||
| 57 | CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ | 59 | CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ |
| 58 | $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap | 60 | $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ |
| 61 | -Din6addr_loopback=kernel_in6addr_loopback | ||
| 62 | |||
| 59 | AFLAGS += $(ARCH_INCLUDE) | 63 | AFLAGS += $(ARCH_INCLUDE) |
| 60 | 64 | ||
| 61 | USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) | 65 | USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) |