about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--sysdeps/unix/sysv/linux/i386/syscalls.list1
-rw-r--r--timezone/zic.c2
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 60cad1d762..c0328b4ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2005-12-15  Thomas Schwinge <tschwinge@gnu.org>
+2005-12-19  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #1955]
+	* timezone/zic.c (tofile;): Fix typo in symlink creation.
+	Patch by Phil Estes <pestes@us.ibm.com>.
+
+	[BZ #1952]
+	* sysdeps/unix/sysv/linux/time.c: New file.
+	* sysdeps/unix/sysv/linux/i386/syscalls.list: Remove time entry.
+
+2005-12-15  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* io/xmknodat.c: Include <stddef.h>.
 	* misc/futimesat.c: Remove weak_alias and correct stub_warning.
diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index 214397446d..3ff3a73aab 100644
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -5,5 +5,4 @@ vm86old		EXTRA	vm86old		i:p	__vm86old	vm86@GLIBC_2.0
 vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2.3.4
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
 oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
-time		-	time		Ei:p	time
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
diff --git a/timezone/zic.c b/timezone/zic.c
index 57dc5311d5..4e3f42f2cc 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -650,7 +650,7 @@ const char * const	tofile;
 						"../");
 					symlinkcontents =
 						ecatalloc(symlinkcontents,
-						fromfile);
+							  fromname);
 					result = symlink(symlinkcontents,
 						toname);
 					if (result == 0)