svn commit: branches/uClibc-nptl: ldso/ldso ldso/libdl libc/misc/elf libc etc...
carmelo at uclibc.org
carmelo at uclibc.org
Thu Nov 27 14:32:51 UTC 2008
Author: carmelo
Date: 2008-11-27 06:32:51 -0800 (Thu, 27 Nov 2008)
New Revision: 24161
Log:
Synch with trunk @ 24160
Step 13: build system updates.
Modified:
branches/uClibc-nptl/Makefile.in
branches/uClibc-nptl/ldso/ldso/Makefile.in
branches/uClibc-nptl/ldso/libdl/Makefile.in
branches/uClibc-nptl/libc/misc/elf/Makefile.in
branches/uClibc-nptl/libc/misc/internals/Makefile.in
branches/uClibc-nptl/libc/sysdeps/linux/Makefile.commonarch
branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in
branches/uClibc-nptl/libc/sysdeps/linux/i386/Makefile.arch
branches/uClibc-nptl/libc/termios/Makefile.in
branches/uClibc-nptl/libc/unistd/Makefile.in
branches/uClibc-nptl/libcrypt/Makefile.in
branches/uClibc-nptl/libintl/Makefile.in
branches/uClibc-nptl/libnsl/Makefile.in
branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
branches/uClibc-nptl/libresolv/Makefile.in
branches/uClibc-nptl/librt/Makefile.in
branches/uClibc-nptl/libutil/Makefile.in
branches/uClibc-nptl/test/Makefile
branches/uClibc-nptl/test/locale/Makefile
branches/uClibc-nptl/test/math/Makefile
branches/uClibc-nptl/utils/Makefile.in
Changeset:
Modified: branches/uClibc-nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -171,6 +171,15 @@
else \
mv -f $$tmp include/bits/sysnum.h; \
fi
+ @# Ugly linux specific hack..
+ $(Q)if grep -q __NR_ $@; then true; else \
+ rm -f $@; \
+ echo "ERROR: Could not generate syscalls."; \
+ echo "Make sure that you have proper kernel headers."; \
+ echo "Your .config in KERNEL_HEADERS=\"\" was set to:"; \
+ echo "${KERNEL_HEADERS}"; \
+ exit 1; \
+ fi
$(LOCAL_INSTALL_PATH):
$(Q)$(MAKE) PREFIX=$(shell pwd)/ RUNTIME_PREFIX=./ \
@@ -324,8 +333,11 @@
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sendfile.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/fsuid.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/statfs.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/statfs.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/swap.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sysctl.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/vfs.h
endif
ifneq ($(UCLIBC_SV4_DEPRECATED),y)
# Remove ustat.h since deprecated SV4 support was disabled upon request
@@ -421,7 +433,7 @@
$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
$(INSTALL) -m 644 lib/lib*-$(VERSION).so \
$(PREFIX)$(RUNTIME_PREFIX)lib
- cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
+ (cd lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
@if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
set -e; \
$(SHELL_SET_X); \
Modified: branches/uClibc-nptl/ldso/ldso/Makefile.in
===================================================================
--- branches/uClibc-nptl/ldso/ldso/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/ldso/ldso/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -65,4 +65,4 @@
$(do_ar)
$(UCLIBC_LDSO_NAME)_clean:
- $(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS}
+ $(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e))))
Modified: branches/uClibc-nptl/ldso/libdl/Makefile.in
===================================================================
--- branches/uClibc-nptl/ldso/libdl/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/ldso/libdl/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile.in for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -54,4 +54,4 @@
$(do_ar)
libdl_clean:
- $(RM) $(libdl_OUT)/*.{o,os,a,oS}
+ $(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a)
Modified: branches/uClibc-nptl/libc/misc/elf/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/misc/elf/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/misc/elf/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -10,10 +10,10 @@
MISC_ELF_OUT:=$(top_builddir)libc/misc/elf
MISC_ELF_OBJ:=$(patsubst %.c,$(MISC_ELF_OUT)/%.o,$(libc_a_CSRC))
-libc-static-y += $(MISC_ELF_OBJ)
+libc-static-y += $(MISC_ELF_OBJ)
libc-shared-y += $(MISC_ELF_OUT)/dl-iterate-phdr.oS
-objclean-y+= misc_elf_objclean
+objclean-y+= misc_elf_clean
-misc_elf_objclean:
- $(RM) $(MISC_ELF_OUT)/*.{o,os,oS}
+misc_elf_clean:
+ $(do_rm) $(addprefix $(MISC_ELF_OUT)/*., o os oS)
Modified: branches/uClibc-nptl/libc/misc/internals/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/misc/internals/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -25,7 +25,8 @@
$(MISC_INTERNALS_OUT)/shared_flat_add_library.o
libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o \
$(MISC_INTERNALS_OUT)/errno.o
-objclean-y += misc_internals_objclean
-misc_internals_objclean:
- $(RM) $(MISC_INTERNALS_OUT)/*.{o,os,oS}
+objclean-y += misc_internals_clean
+
+misc_internals_clean:
+ $(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/Makefile.commonarch
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/Makefile.commonarch 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/sysdeps/linux/Makefile.commonarch 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile template to be included by sysdeps/linux/<ARCH>/Makefile.arch
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -18,13 +18,13 @@
crt-y := FORCE
libc-y += $(ARCH_OBJS)
libc-nomulti-y += $(ARCH_SOBJ)
-objclean-y += arch_objclean
+objclean-y += arch_clean
CFLAGS-crti.S+=$(PICFLAG)
CFLAGS-crtn.S+=$(PICFLAG)
-arch_objclean:
- $(RM) $(ARCH_OUT)/*.{o,os} $(CTOR_TARGETS) $(CRTS)
+arch_clean:
+ $(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS)
ifneq ($(ARCH_HEADERS),)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -25,8 +25,7 @@
endif
ifneq ($(UCLIBC_LINUX_MODULE_24),y)
-CSRC := $(filter-out create_module.c delete_module.c init_module.c \
- query_module.c get_kernel_syms.c,$(CSRC))
+CSRC := $(filter-out create_module.c query_module.c get_kernel_syms.c,$(CSRC))
endif
ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
@@ -35,8 +34,8 @@
modify_ldt.c personality.c prctl.c readahead.c reboot.c \
remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
- splice.c vmsplice.c tee.c swapoff.c swapon.c sysctl.c sysinfo.c \
- uselib.c vhangup.c,$(CSRC))
+ splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
+ sync_file_range.c sysctl.c sysinfo.c uselib.c vhangup.c,$(CSRC))
endif
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
@@ -110,7 +109,7 @@
$(COMMON_OUT)/stat.o
libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o
-objclean-y += common_objclean
+objclean-y += common_clean
-common_objclean:
- $(RM) $(COMMON_OUT)/*.{o,os,oS}
+common_clean:
+ $(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS)
Modified: branches/uClibc-nptl/libc/sysdeps/linux/i386/Makefile.arch
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/i386/Makefile.arch 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/sysdeps/linux/i386/Makefile.arch 2008-11-27 14:32:51 UTC (rev 24161)
@@ -8,7 +8,7 @@
CSRC := brk.c sigaction.c __syscall_error.c
SSRC := \
- __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \
- bsd-_setjmp.S syscall.S mmap.S mmap64.S
+ __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
+ sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S
include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch
Modified: branches/uClibc-nptl/libc/termios/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/termios/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/termios/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -13,7 +13,7 @@
libc-y += $(TERMIOS_OBJ)
-objclean-y += termios_objclean
+objclean-y += termios_clean
-termios_objclean:
- $(RM) $(TERMIOS_OUT)/*.{o,os}
+termios_clean:
+ $(do_rm) $(addprefix $(TERMIOS_OUT)/*., o os)
Modified: branches/uClibc-nptl/libc/unistd/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/unistd/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libc/unistd/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -42,7 +42,7 @@
libc-y += $(UNISTD_OBJ)
-objclean-y += unistd_objclean
+objclean-y += unistd_clean
-unistd_objclean:
- $(RM) $(UNISTD_OUT)/*.{o,os}
+unistd_clean:
+ $(do_rm) $(addprefix $(UNISTD_OUT)/*., o os)
Modified: branches/uClibc-nptl/libcrypt/Makefile.in
===================================================================
--- branches/uClibc-nptl/libcrypt/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libcrypt/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -65,4 +65,4 @@
$(do_ar)
libcrypt_clean:
- $(RM) $(libcrypt_OUT)/*.{o,os,oS,a}
+ $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a)
Modified: branches/uClibc-nptl/libintl/Makefile.in
===================================================================
--- branches/uClibc-nptl/libintl/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libintl/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -71,4 +71,4 @@
$(compile.m)
libintl_clean:
- $(RM) $(libintl_OUT)/*.{o,os,a}
+ $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a)
Modified: branches/uClibc-nptl/libnsl/Makefile.in
===================================================================
--- branches/uClibc-nptl/libnsl/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libnsl/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -8,6 +8,11 @@
CFLAGS-libnsl := -DNOT_IN_libc -DIS_IN_libnsl $(SSP_ALL_CFLAGS)
LDFLAGS-libnsl.so := $(LDFLAGS)
+ifdef ASNEEDED
+ifeq ($(UCLIBC_HAS_SSP),y)
+LDFLAGS-libnsl.so += -Wl,--no-as-needed -lc -Wl,--as-needed
+endif
+endif
LIBS-libnsl.so := $(LIBS)
@@ -47,4 +52,4 @@
$(do_ar)
libnsl_clean:
- $(RM) $(libnsl_OUT)/*.{o,os,a}
+ $(do_rm) $(addprefix $(libnsl_OUT)/*., o os a)
Modified: branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch 2008-11-27 14:32:51 UTC (rev 24161)
@@ -17,7 +17,7 @@
libpthread-multi-y+=$(libpthread_ARCH_SRC)
-objclean-y+=libpthread_arch_objclean
+objclean-y+=libpthread_arch_clean
# We need to build as SHcompact for tas..
$(libpthread_ARCH_OBJ): %.o : %.c
@@ -26,5 +26,5 @@
$(libpthread_ARCH_OBJ:.o=.os): %.os : %.c
$(compile.c:32media=compact)
-libpthread_arch_objclean:
+libpthread_arch_clean:
$(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os)
Modified: branches/uClibc-nptl/libresolv/Makefile.in
===================================================================
--- branches/uClibc-nptl/libresolv/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libresolv/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -8,6 +8,11 @@
CFLAGS-libresolv := -DNOT_IN_libc -DIS_IN_libresolv $(SSP_ALL_CFLAGS)
LDFLAGS-libresolv.so := $(LDFLAGS)
+ifdef ASNEEDED
+ifeq ($(UCLIBC_HAS_SSP),y)
+LDFLAGS-libresolv.so += -Wl,--no-as-needed -lc -Wl,--as-needed
+endif
+endif
LIBS-libresolv.so := $(LIBS)
@@ -47,4 +52,4 @@
$(do_ar)
libresolv_clean:
- $(RM) $(libresolv_OUT)/*.{o,os,a}
+ $(do_rm) $(addprefix $(libresolv_OUT)/*., o os a)
Modified: branches/uClibc-nptl/librt/Makefile.in
===================================================================
--- branches/uClibc-nptl/librt/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/librt/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -21,6 +21,7 @@
librt_DIR := $(top_srcdir)librt
librt_OUT := $(top_builddir)librt
+ifeq ($(UCLIBC_HAS_REALTIME),y)
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
librt_CSRC := $(filter-out mq_notify.c timer_create.c timer_delete.c \
timer_getoverr.c timer_gettime.c timer_settime.c, \
@@ -46,6 +47,7 @@
lib-a-y += $(top_builddir)lib/librt.a
lib-so-y += $(top_builddir)lib/librt.so
+endif
ifeq ($(DOPIC)$(UCLIBC_HAS_THREADS_NATIVE),yn)
@@ -67,4 +69,4 @@
objclean-y += librt_clean
librt_clean:
- $(RM) $(librt_OUT)/*.{o,os,oS,a}
+ $(do_rm) $(addprefix $(librt_OUT)/*., o os a)
Modified: branches/uClibc-nptl/libutil/Makefile.in
===================================================================
--- branches/uClibc-nptl/libutil/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/libutil/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -63,4 +63,4 @@
$(do_ar)
libutil_clean:
- $(RM) $(libutil_OUT)/*.{o,os,oS,a}
+ $(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a)
Modified: branches/uClibc-nptl/test/Makefile
===================================================================
--- branches/uClibc-nptl/test/Makefile 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/test/Makefile 2008-11-27 14:32:51 UTC (rev 24161)
@@ -43,7 +43,6 @@
endif
DIRS := $(filter-out math,$(DIRS))
-
test check all: run
run: compile subdirs_run
Modified: branches/uClibc-nptl/test/locale/Makefile
===================================================================
--- branches/uClibc-nptl/test/locale/Makefile 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/test/locale/Makefile 2008-11-27 14:32:51 UTC (rev 24161)
@@ -28,4 +28,4 @@
OPTS_tst-ctype = < tst-ctype-de_DE.ISO-8859-1.in
OPTS_tst-langinfo = < tst-langinfo.input
-EXTRA_CLEAN := C
+EXTRA_DIRS := C
Modified: branches/uClibc-nptl/test/math/Makefile
===================================================================
--- branches/uClibc-nptl/test/math/Makefile 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/test/math/Makefile 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,10 +1,10 @@
# uClibc math tests
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-TESTS := basic-test rint tst-definitions test-fpucw
-# test-double test-idouble
-# test-float test-ifloat
-# test-ldouble test-ildouble
+TESTS := basic-test rint tst-definitions test-fpucw test-float test-ifloat test-double test-idouble
+ifeq ($(strip $(UCLIBC_HAS_LONG_DOUBLE_MATH)),y)
+TESTS += test-ldouble test-ildouble
+endif
include ../Test.mak
@@ -15,7 +15,7 @@
ifeq ($(TARGET_ARCH),sh)
CFLAGS_basic-test := -mieee
endif
-EXTRA_CFLAGS := -DNO_LONG_DOUBLE -fno-builtin
+EXTRA_CFLAGS := -fno-builtin
EXTRA_LDFLAGS := -lm
PERL := /usr/bin/perl
Modified: branches/uClibc-nptl/utils/Makefile.in
===================================================================
--- branches/uClibc-nptl/utils/Makefile.in 2008-11-27 14:17:13 UTC (rev 24160)
+++ branches/uClibc-nptl/utils/Makefile.in 2008-11-27 14:32:51 UTC (rev 24161)
@@ -1,6 +1,6 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -92,19 +92,20 @@
install-y += utils_install
utils_install: utils
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
- #$(INSTALL) -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
+ #$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
ifeq ($(HAVE_SHARED),y)
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin
- $(INSTALL) -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
- $(INSTALL) -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
endif
ifeq ($(UCLIBC_HAS_LOCALE),y)
- $(INSTALL) -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv
- $(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale
+ $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale
endif
objclean-y += utils_clean
utils_clean:
- $(RM) $(utils_OUT)/{ldconfig,ldd,readelf,iconv,locale,*.host}
+ $(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd readelf iconv locale *.host)
+ # This is a hack..
+ $(Q)$(RM) $(utils_OUT)/.*.dep
+
More information about the uClibc-cvs
mailing list