3 files changed, 33 insertions, 39 deletions
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 191d0a7aa..c3f2009cc 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -1,58 +1,52 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-COMMON_DIR:=$(top_srcdir)libc/sysdeps/linux/common
-COMMON_OUT:=$(top_builddir)libc/sysdeps/linux/common
+COMMON_DIR := $(top_srcdir)libc/sysdeps/linux/common
+COMMON_OUT := $(top_builddir)libc/sysdeps/linux/common
 
-CSRC:=$(patsubst $(COMMON_DIR)/%.c,%.c,$(wildcard $(COMMON_DIR)/*.c))
+CSRC := $(notdir $(wildcard $(COMMON_DIR)/*.c))
 
 ifeq ($(EXCLUDE_BRK),y)
-CSRC:=$(filter-out sbrk.c,$(CSRC))
+CSRC := $(filter-out sbrk.c,$(CSRC))
 endif
 
-COMMON_SSP:=ssp.c ssp-local.c
-
-# full list
-#COMMON_NO_MULTI:=getcwd.c getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c getpriority64.c setpriority.c getrusage.c wait4.c getitimer.c setitimer.c open.c open64.c uname.c __syscall_fcntl.c __syscall_fcntl64.c
-COMMON_NO_MULTI:=getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c setpriority.c getrusage.c getitimer.c setitimer.c uname.c __syscall_rt_sigaction.c
-
-ifneq ($(UCLIBC_HAS_SSP),y)
-CSRC:=$(filter-out $(COMMON_SSP),$(CSRC))
+ifneq ($(UCLIBC_HAS_LFS),y)
+CSRC_LFS := $(notdir $(wildcard $(COMMON_DIR)/*64.c))
+CSRC := $(filter-out llseek.c $(CSRC_LFS),$(CSRC))
 endif
 
-ifneq ($(DOMULTI),n)
-CSRC:=$(filter-out $(COMMON_NO_MULTI),$(CSRC))
-CSRC:=$(filter-out $(COMMON_SSP),$(CSRC))
+CSRC := $(filter-out ssp-local.c,$(CSRC))
+ifneq ($(UCLIBC_HAS_SSP),y)
+CSRC := $(filter-out ssp.c,$(CSRC))
 endif
 
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-CSRC:=$(filter-out fork.c getpid.c raise.c,$(CSRC))
+CSRC := $(filter-out fork.c getpid.c raise.c pause.c open.c close.c read.c write.c nanosleep.c __syscall_rt_sigaction.c,$(CSRC))
 endif
 
 # fails for some reason
 ifneq ($(strip $(ARCH_OBJS)),)
-CSRC:=$(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
+CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
 endif
 
-CFLAGS-ssp.c=$(SSP_DISABLE_FLAGS)
-CFLAGS-ssp-local.c=$(SSP_DISABLE_FLAGS)
+CFLAGS-ssp.c := $(SSP_DISABLE_FLAGS)
+CFLAGS-ssp-local.c := $(SSP_DISABLE_FLAGS)
 
-COMMON_SRC:=$(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC))
-COMMON_OBJ:=$(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC))
+COMMON_SRC := $(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC))
+COMMON_OBJ := $(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC))
 
-libc-a-y+=$(COMMON_OBJ)
-libc-so-y+=$(COMMON_OBJ:.o=.os)
-libc-nonshared-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp-local.os
+libc-y += $(COMMON_OBJ)
+libc-static-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.o
+libc-nonshared-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.os
 
-libc-multi-y+=$(COMMON_SRC)
-libc-nomulti-y+=$(patsubst %.c,$(COMMON_OUT)/%.o,$(COMMON_NO_MULTI))
-libc-nomulti-$(UCLIBC_HAS_SSP)+=$(patsubst %.c,$(COMMON_OUT)/%.o,$(COMMON_SSP))
+libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o $(COMMON_OUT)/__syscall_sigaction.o
+libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o
 
-objclean-y+=common_objclean
+objclean-y += common_objclean
 
 common_objclean:
-	$(RM) $(COMMON_OUT)/*.{o,os}
+	$(RM) $(COMMON_OUT)/*.{o,os,oS}
diff --git a/libc/sysdeps/linux/common/adjtimex.c b/libc/sysdeps/linux/common/adjtimex.c
index ef33051e8..f6cfda9cb 100644
--- a/libc/sysdeps/linux/common/adjtimex.c
+++ b/libc/sysdeps/linux/common/adjtimex.c
@@ -2,16 +2,16 @@
 /*
  * adjtimex() for uClibc
  *
- * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 #include "syscalls.h"
 #include <sys/timex.h>
 
-#define __NR___adjtimex __NR_adjtimex
-attribute_hidden _syscall1(int, __adjtimex, struct timex *, buf);
+libc_hidden_proto(adjtimex)
 
-strong_alias(__adjtimex, adjtimex)
-weak_alias(__adjtimex, ntp_adjtime)
+_syscall1(int, adjtimex, struct timex *, buf);
+libc_hidden_def(adjtimex)
+strong_alias(adjtimex,ntp_adjtime)
diff --git a/libc/sysdeps/linux/common/ntp_gettime.c b/libc/sysdeps/linux/common/ntp_gettime.c
index 0c4d1549f..f32e05444 100644
--- a/libc/sysdeps/linux/common/ntp_gettime.c
+++ b/libc/sysdeps/linux/common/ntp_gettime.c
@@ -16,17 +16,17 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define adjtimex __adjtimex
-
 #include <sys/timex.h>
 
+libc_hidden_proto(adjtimex)
+
 int ntp_gettime(struct ntptimeval *ntv)
 {
     struct timex tntx;
     int result;
 
     tntx.modes = 0;
-    result = __adjtimex(&tntx);
+    result = adjtimex(&tntx);
     ntv->time = tntx.time;
     ntv->maxerror = tntx.maxerror;
     ntv->esterror = tntx.esterror;