[PATCH] sync with latest version of klibc (0.107)

[elogind.git] / klibc / klibc / Makefile

diff --git a/klibc/klibc/Makefile b/klibc/klibc/Makefile
index e1d63381c18924e0ac5832ebcbc3fa980ae1c8a7..0d5b197f0d8684b6cbe0f0faab0c2017f97ac0a9 100644 (file)
--- a/klibc/klibc/Makefile
+++ b/klibc/klibc/Makefile
@@ -22,9 +22,9 @@ LIBOBJS = vsnprintf.o snprintf.o vsprintf.o sprintf.o \
          fopen.o fread.o fread2.o fgetc.o fgets.o \
          fwrite.o fwrite2.o fputc.o fputs.o puts.o \
          sleep.o usleep.o raise.o abort.o assert.o alarm.o pause.o \
-         __signal.o signal.o bsd_signal.o siglist.o siglongjmp.o \
+         __signal.o sysv_signal.o bsd_signal.o siglist.o siglongjmp.o \
          sigaction.o sigpending.o sigprocmask.o sigsuspend.o \
-         brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o \
+         brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o getpagesize.o \
          memcpy.o memcmp.o memset.o memccpy.o memmem.o memswap.o \
          memmove.o \
          strcasecmp.o strncasecmp.o strndup.o strerror.o \
@@ -33,7 +33,8 @@ LIBOBJS = vsnprintf.o snprintf.o vsprintf.o sprintf.o \
          strsep.o strtok.o \
          gethostname.o getdomainname.o getcwd.o \
          seteuid.o setegid.o setresuid.o setresgid.o \
-         getenv.o setenv.o unsetenv.o getopt.o readdir.o \
+         getenv.o setenv.o putenv.o __put_env.o unsetenv.o \
+         getopt.o readdir.o \
          syslog.o closelog.o pty.o isatty.o reboot.o \
          time.o utime.o fdatasync.o llseek.o select.o nice.o getpriority.o \
          qsort.o lrand48.o srand48.o seed48.o \
@@ -57,6 +58,12 @@ tests: $(TESTS)
 tests/%.o : tests/%.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
+# This particular file uses a bunch of formats gcc don't know of, in order
+# to test the full range of our vsnprintf() function.  This outputs a bunch
+# of useless warnings unless we tell it not to.
+tests/testvsnp.o : tests/testvsnp.c
+       $(CC) $(CFLAGS) -Wno-format -c -o $@ $<
+
 tests/% : tests/%.o $(LIB) $(CRT0)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) $< $(LIB) $(LIBGCC)
        cp $@ $@.stripped
@@ -112,12 +119,12 @@ socketcalls.dir: SOCKETCALLS socketcalls.pl socketcommon.h
        touch $@
 
 %/static.obj: %.dir
-       $(MAKE) objects-$(basename $(notdir $@)) DIR=$*
+       $(MAKE) objects-$(basename $(notdir $@)) DIR=$*/
 
-STATIC = $(addsuffix .o,$(basename $(wildcard $(DIR)/*.[cS])))
+STATIC = $(addsuffix .o,$(basename $(wildcard $(DIR)*.[cS])))
 
 objects-static: $(STATIC)
-       touch $(DIR)/static.obj
+       touch $(DIR)static.obj
 
 clean: archclean
        find . -type f -a \( -name \*.[isoa] -o -name \*.l[iso] \) -print0 | xargs -0rt rm -f
@@ -131,6 +138,9 @@ spotless: clean
        find . \( -name \*~ -o -name '.*.d' \) -not -type d -print0 | \
                xargs -0rt rm -f
 
-ifneq ($(wildcard $(DIR)/.*.d),)
-include $(wildcard $(DIR)/.*.d)
+bitsize:
+       @echo $(BITSIZE)
+
+ifneq ($(wildcard $(DIR).*.d),)
+include $(wildcard $(DIR).*.d)
 endif