Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423241AbWANAhe (ORCPT ); Fri, 13 Jan 2006 19:37:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1423242AbWANAhe (ORCPT ); Fri, 13 Jan 2006 19:37:34 -0500 Received: from adsl-510.mirage.euroweb.hu ([193.226.239.254]:56972 "EHLO dorka.pomaz.szeredi.hu") by vger.kernel.org with ESMTP id S1423241AbWANAhe (ORCPT ); Fri, 13 Jan 2006 19:37:34 -0500 To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] uml: fix symbol for mktime Message-Id: From: Miklos Szeredi Date: Sat, 14 Jan 2006 01:37:13 +0100 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1327 Lines: 28 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 Index: linux/arch/um/Makefile =================================================================== --- linux.orig/arch/um/Makefile 2006-01-13 22:47:23.000000000 +0100 +++ linux/arch/um/Makefile 2006-01-13 22:49:01.000000000 +0100 @@ -67,7 +67,8 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,, # 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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/