aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Makeconfig2
-rw-r--r--sysdeps/unix/common/syscalls.list1
-rw-r--r--sysdeps/unix/sysv/syscalls.list2
4 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 740659431f..f053d2a1af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
Mon Feb 12 03:10:41 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
+ * sysdeps/unix/sysv/syscalls.list: Add setrlimit and settimeofday,
+ so real syscalls override unix/sysv/*.c on sysv-derived systems
+ that have them.
+ * sysdeps/unix/common/syscalls.list: Add settimeofday here, to
+ override unix/sysv/settimeofday.c since that overrides
+ unix/syscalls.list.
+
+ * Makeconfig (+link): Put $(link-libc) after deps from $^,
+ regardless of where libc.a appears in the deps.
+
* sysdeps/unix/sysv/sysv4/syscalls.list: Remove redundancies.
Add __waitid.
* sysdeps/unix/sysv/linux/syscalls.list: Remove redundancies.
diff --git a/Makeconfig b/Makeconfig
index 22e0007c17..b991f9d492 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -281,7 +281,7 @@ ifndef +link
+link = $(CC) -nostdlib -nostartfiles -o $@ \
$(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) \
$(addprefix $(csu-objpfx),start.o $(+preinit)) \
- $(^:$(common-objpfx)libc%=$(link-libc)) \
+ $(filter-out $(common-objpfx)libc%,$^) $(link-libc) \
$(addprefix $(csu-objpfx),$(+postinit))
endif
ifndef config-LDFLAGS
diff --git a/sysdeps/unix/common/syscalls.list b/sysdeps/unix/common/syscalls.list
index 0f41a4351e..afec7b7e4c 100644
--- a/sysdeps/unix/common/syscalls.list
+++ b/sysdeps/unix/common/syscalls.list
@@ -7,6 +7,7 @@ ftruncate - ftruncate 2 ftruncate
getpgid - getpgrp 1 __getpgid getpgid
getrusage - getrusage 2 __getrusage getrusage
gettimeofday - gettimeofday 2 __gettimeofday gettimeofday
+settimeofday - settimeofday 2 __settimeofday settimeofday
setpgid - setpgrp 2 __setpgid setpgid setpgrp
setregid - setregid 2 __setregid setregid
setreuid - setreuid 2 __setreuid setreuid
diff --git a/sysdeps/unix/sysv/syscalls.list b/sysdeps/unix/sysv/syscalls.list
index b7fa490c95..4ed36850e6 100644
--- a/sysdeps/unix/sysv/syscalls.list
+++ b/sysdeps/unix/sysv/syscalls.list
@@ -6,6 +6,8 @@ nice - nice 1 nice
pause - pause 0 pause
poll - poll 3 poll
s_getdents getdents getdents 3 __getdents
+setrlimit - setrlimit 2 setrlimit
+settimeofday - settimeofday 2 __settimeofday settimeofday
signal - signal 2 signal
stime - stime 1 stime
time - time 1 time