diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-02-01 12:06:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 17:53:22 +0100 |
| commit | 98105d47d3d62eb68d06d85dd448699678d725fc (patch) | |
| tree | 14bfef15ce1f4cb12dd5c90df3ee5846fbb4eb5b /arch/um/Makefile | |
| parent | [PATCH] uml: typo fixup (diff) | |
| download | linux-98105d47d3d62eb68d06d85dd448699678d725fc.tar.xz linux-98105d47d3d62eb68d06d85dd448699678d725fc.zip | |
[PATCH] uml: comments about libc-conflict guards
While fixing myself the mktime conflict (which someone already merged), I also
improved a few comments. Merge them up.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 4ab6270cd387..c58b657f0097 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -47,13 +47,16 @@ ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include endif SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) -# -Dvmap=kernel_vmap affects everything, and prevents anything from -# referencing the libpcap.o symbol so named. +# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so +# named - it's a common symbol in libpcap, so we get a binary which crashes. # -# Same things for in6addr_loopback - found in libc. +# Same things for in6addr_loopback and mktime - found in libc. For these two we +# only get link-time error, luckily. +# +# These apply to USER_CFLAGS to. -CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ - $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ +CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ + $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ -Din6addr_loopback=kernel_in6addr_loopback AFLAGS += $(ARCH_INCLUDE) @@ -66,6 +69,7 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \ # kernel_errno to separate them from the libc errno. This allows -fno-common # in CFLAGS. Otherwise, it would cause ld to complain about the two different # errnos. +# These apply to kernelspace only. CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ -Dmktime=kernel_mktime |