Commit ee7be5de authored Jan 14, 2006 by Miklos Szeredi Committed by Linus Torvalds Jan 14, 2006

[PATCH] uml: fix symbol for mktime



  LD      .tmp_vmlinux1
/usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o): In function `timelocal':
: multiple definition of `mktime'
kernel/built-in.o:kernel/time.c:604: first defined here
/usr/bin/ld: Warning: size of symbol `mktime' changed from 134 in kernel/built-in.o to 44 in /usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o)
collect2: ld returned 1 exit status

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 858119e1

arch/um/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,8 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
		# in CFLAGS. Otherwise, it would cause ld to complain about the two different
		# errnos.

		CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask
		CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
		-Dmktime=kernel_mktime
		CFLAGS += $(call cc-option,-fno-unit-at-a-time,)

		include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)