[PATCH] Cygwin build fix; case insensitive file names
Danjel McGougan
danjel.mcgougan at gmail.com
Sun Mar 1 20:24:47 UTC 2009
I've had problems getting uClibc to build for target arm-linux-uclibceabi
under Cygwin. I got undefined symbols when linking 'libuClibc-0.9.30.so'.
I tracked it down to be caused by case insensitive file names in
Cygwin. Object files are suffixed .os and .oS. Cygwin sees no difference
between these.
The patch below against 0.9.30 changes the suffix .oS to .o_S and that
seems to make it work for me. I can now build a complete toolchain
under Cygwin using buildroot.
Best regards,
Danjel McGougan
---
diff -u -r uClibc-0.9.30-orig/Makerules uClibc-0.9.30/Makerules
--- uClibc-0.9.30-orig/Makerules 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/Makerules 2009-03-01 18:03:55.481106900 +0100
@@ -2,7 +2,7 @@
# Licensed under LGPL v2.1, see the file COPYING.LIB in this tarball for details.
#
-.SUFFIXES: .c .S .o .os .oS .so .a .s .i
+.SUFFIXES: .c .S .o .os .o_S .so .a .s .i
PHONY := FORCE
@@ -281,17 +281,17 @@
endef
CFLAGS-.os+=$(PICFLAG)
-CFLAGS-.oS+=$(PICFLAG) -DSHARED
+CFLAGS-.o_S+=$(PICFLAG) -DSHARED
%.o: %.c FORCE ; $(compile.c)
%.os: %.c FORCE ; $(compile.c)
-%.oS: %.c FORCE ; $(compile.c)
+%.o_S: %.c FORCE ; $(compile.c)
%.o: %.S FORCE ; $(compile.S)
%.os: %.S FORCE ; $(compile.S)
-%.oS: %.S FORCE ; $(compile.S)
+%.o_S: %.S FORCE ; $(compile.S)
%.o: %.s FORCE ; $(compile.S)
%.os: %.s FORCE ; $(compile.S)
-%.oS: %.s FORCE ; $(compile.S)
+%.o_S: %.s FORCE ; $(compile.S)
%.i: %.c FORCE ; $(compile.i)
%.i: %.S FORCE ; $(compile.i)
%.s: %.c FORCE ; $(compile.s)
@@ -403,7 +403,7 @@
.depends.dep := \
$(patsubst %.o,%.o.dep,$(filter %.o,$(files.dep))) \
$(patsubst %.os,%.os.dep,$(filter %.os,$(files.dep))) \
- $(patsubst %.oS,%.oS.dep,$(filter %.oS,$(files.dep)))
+ $(patsubst %.o_S,%.o_S.dep,$(filter %.o_S,$(files.dep)))
# Oh, and prepend a dot to the basename so i don't have to change my habit of
# calling 'size thefile.o*'
.depends.dep := $(foreach f,$(.depends.dep),$(dir $(f)).$(notdir $(f)))
diff -u -r uClibc-0.9.30-orig/ldso/ldso/Makefile.in uClibc-0.9.30/ldso/ldso/Makefile.in
--- uClibc-0.9.30-orig/ldso/ldso/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/ldso/ldso/Makefile.in 2009-03-01 17:59:55.415534100 +0100
@@ -31,7 +31,7 @@
$(UCLIBC_LDSO_NAME)_CSRC := $($(UCLIBC_LDSO_NAME)_DIR)/ldso.c
# prerequesites
-$($(UCLIBC_LDSO_NAME)_OUT)/ldso.o $($(UCLIBC_LDSO_NAME)_OUT)/ldso.oS: \
+$($(UCLIBC_LDSO_NAME)_OUT)/ldso.o $($(UCLIBC_LDSO_NAME)_OUT)/ldso.o_S: \
$($(UCLIBC_LDSO_NAME)_DIR)/dl-debug.c \
$($(UCLIBC_LDSO_NAME)_DIR)/dl-startup.c \
$($(UCLIBC_LDSO_NAME)_DIR)/dl-array.c \
@@ -44,7 +44,7 @@
$(UCLIBC_LDSO_NAME)_OBJS := $($(UCLIBC_LDSO_NAME)_COBJ) $($(UCLIBC_LDSO_NAME)_SOBJ)
-ldso-y := $($(UCLIBC_LDSO_NAME)_OBJS:.o=.oS)
+ldso-y := $($(UCLIBC_LDSO_NAME)_OBJS:.o=.o_S)
lib-so-y += $(ldso)
objclean-y += $(UCLIBC_LDSO_NAME)_clean
@@ -58,4 +58,4 @@
$(do_ar)
$(UCLIBC_LDSO_NAME)_clean:
- $(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e))))
+ $(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os o_S a,$(foreach d, *. */*.,$(d)$(e))))
diff -u -r uClibc-0.9.30-orig/ldso/libdl/Makefile.in uClibc-0.9.30/ldso/libdl/Makefile.in
--- uClibc-0.9.30-orig/ldso/libdl/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/ldso/libdl/Makefile.in 2009-03-01 17:59:55.446784500 +0100
@@ -35,7 +35,7 @@
ifeq ($(DOPIC),y)
libdl-a-y := $(libdl-a-y:.o=.os)
endif
-libdl-so-y := $(libdl_OUT)/libdl.oS
+libdl-so-y := $(libdl_OUT)/libdl.o_S
lib-a-$(HAVE_SHARED) += $(top_builddir)lib/libdl.a
lib-so-y += $(top_builddir)lib/libdl.so
@@ -54,4 +54,4 @@
$(do_ar)
libdl_clean:
- $(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libdl_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libc/Makefile.in uClibc-0.9.30/libc/Makefile.in
--- uClibc-0.9.30-orig/libc/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/Makefile.in 2009-03-01 17:59:55.524910500 +0100
@@ -45,7 +45,7 @@
libc-so-y = $(libc-y:.o=.os) $(libc-shared-y)
else
all_sources = $(libc-y:.o=.c)
-all_sources += $(libc-shared-y:.oS=.c)
+all_sources += $(libc-shared-y:.o_S=.c)
libc-multi-y = $(filter-out $(libc-nomulti-y:.o=.c),$(all_sources))
endif
@@ -60,7 +60,7 @@
$(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
else
-$(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so)
+$(libc.depend): $(libc_OUT)/libc.o_S $(libc-nomulti-y:.o=.o_S) | $(LIBS-libc.so)
$(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
endif
$(Q)$(RM) $@
@@ -81,7 +81,7 @@
endif
$(do_ar)
-$(libc_OUT)/libc.oS: $(libc-multi-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME)
+$(libc_OUT)/libc.o_S: $(libc-multi-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME)
$(Q)$(RM) $@
$(compile-m)
@@ -97,4 +97,4 @@
$(call link-flat.so,$(@:.gdb=),$(UCLIBC_SHARED_FLAT_ID))
libc_clean:
- $(do_rm) $(addprefix $(libc_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libc_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libc/inet/rpc/Makefile.in uClibc-0.9.30/libc/inet/rpc/Makefile.in
--- uClibc-0.9.30-orig/libc/inet/rpc/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/inet/rpc/Makefile.in 2009-03-01 17:59:55.478034900 +0100
@@ -27,13 +27,13 @@
else
INET_RPC_SRC:=$(patsubst %.c,$(INET_RPC_DIR)/%.c,$(CSRC))
endif
-# rpc_thread.oS is better, because the header adds unneeded references to __pthread_internal_tsd*
+# rpc_thread.o_S is better, because the header adds unneeded references to __pthread_internal_tsd*
INET_RPC_SRC:=$(filter-out $(INET_RPC_DIR)/rpc_thread.c,$(INET_RPC_SRC))
INET_RPC_OBJ:=$(patsubst $(INET_RPC_DIR)/%.c,$(INET_RPC_OUT)/%.o,$(INET_RPC_SRC))
libc-static-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.o
-libc-shared-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.oS
+libc-shared-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.o_S
libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o
@@ -42,4 +42,4 @@
objclean-y+=inet_rpc_clean
inet_rpc_clean:
- $(do_rm) $(addprefix $(INET_RPC_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(INET_RPC_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/misc/file/Makefile.in uClibc-0.9.30/libc/misc/file/Makefile.in
--- uClibc-0.9.30-orig/libc/misc/file/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/misc/file/Makefile.in 2009-03-01 18:03:55.152977700 +0100
@@ -21,4 +21,4 @@
objclean-y += misc_file_clean
misc_file_clean:
- $(do_rm) $(addprefix $(MISC_FILE_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(MISC_FILE_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/misc/internals/Makefile.in uClibc-0.9.30/libc/misc/internals/Makefile.in
--- uClibc-0.9.30-orig/libc/misc/internals/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/misc/internals/Makefile.in 2009-03-01 17:59:55.556160900 +0100
@@ -17,7 +17,7 @@
libc-y += $(MISC_INTERNALS_OBJ)
ifneq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
-libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS
+libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o_S
else
libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.os
endif
@@ -36,4 +36,4 @@
objclean-y += misc_internals_clean
misc_internals_clean:
- $(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/misc/pthread/Makefile.in uClibc-0.9.30/libc/misc/pthread/Makefile.in
--- uClibc-0.9.30-orig/libc/misc/pthread/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/misc/pthread/Makefile.in 2009-03-01 18:03:55.199853300 +0100
@@ -14,4 +14,4 @@
objclean-y += misc_pthread_clean
misc_pthread_clean:
- $(do_rm) $(addprefix $(MISC_PTHREAD_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(MISC_PTHREAD_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/misc/statfs/Makefile.in uClibc-0.9.30/libc/misc/statfs/Makefile.in
--- uClibc-0.9.30-orig/libc/misc/statfs/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/misc/statfs/Makefile.in 2009-03-01 18:03:55.231103700 +0100
@@ -26,4 +26,4 @@
objclean-y += misc_statfs_clean
misc_statfs_clean:
- $(do_rm) $(addprefix $(MISC_STATFS_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(MISC_STATFS_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/stdio/Makefile.in uClibc-0.9.30/libc/stdio/Makefile.in
--- uClibc-0.9.30-orig/libc/stdio/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/stdio/Makefile.in 2009-03-01 18:03:55.262354100 +0100
@@ -104,4 +104,4 @@
objclean-y += stdio_clean
stdio_clean:
- $(do_rm) $(addprefix $(STDIO_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(STDIO_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/stdlib/Makefile.in uClibc-0.9.30/libc/stdlib/Makefile.in
--- uClibc-0.9.30-orig/libc/stdlib/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/stdlib/Makefile.in 2009-03-01 18:03:55.309229700 +0100
@@ -96,4 +96,4 @@
objclean-y += stdlib_clean
stdlib_clean:
- $(do_rm) $(addprefix $(STDLIB_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(STDLIB_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libc/string/Makefile.in uClibc-0.9.30/libc/string/Makefile.in
--- uClibc-0.9.30-orig/libc/string/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/string/Makefile.in 2009-03-01 18:03:55.340480100 +0100
@@ -136,4 +136,4 @@
objclean-y += string_clean
string_clean:
- $(do_rm) $(addprefix $(STRING_OUT)/,$(addprefix *., o os oS) $(addprefix */*., o os oS))
+ $(do_rm) $(addprefix $(STRING_OUT)/,$(addprefix *., o os o_S) $(addprefix */*., o os o_S))
diff -u -r uClibc-0.9.30-orig/libc/sysdeps/linux/Makefile.commonarch uClibc-0.9.30/libc/sysdeps/linux/Makefile.commonarch
--- uClibc-0.9.30-orig/libc/sysdeps/linux/Makefile.commonarch 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/sysdeps/linux/Makefile.commonarch 2009-03-01 18:03:55.418606100 +0100
@@ -24,7 +24,7 @@
CFLAGS-crtn.S+=$(PICFLAG)
arch_objclean:
- $(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS)
+ $(do_rm) $(addprefix $(ARCH_OUT)/*., o os o_S) $(CTOR_TARGETS) $(CRTS)
ifneq ($(ARCH_HEADERS),)
diff -u -r uClibc-0.9.30-orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.30/libc/sysdeps/linux/common/Makefile.in
--- uClibc-0.9.30-orig/libc/sysdeps/linux/common/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libc/sysdeps/linux/common/Makefile.in 2009-03-01 18:03:55.371730500 +0100
@@ -99,4 +99,4 @@
objclean-y += common_clean
common_clean:
- $(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS)
+ $(do_rm) $(addprefix $(COMMON_OUT)/*., o os o_S)
diff -u -r uClibc-0.9.30-orig/libcrypt/Makefile.in uClibc-0.9.30/libcrypt/Makefile.in
--- uClibc-0.9.30-orig/libcrypt/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libcrypt/Makefile.in 2009-03-01 17:59:55.587411300 +0100
@@ -47,7 +47,7 @@
endif
$(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
else
-$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc.depend)
+$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.o_S | $(libc.depend)
$(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
endif
@@ -55,7 +55,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libcrypt_OUT)/libcrypt.oS: $(libcrypt_SRC)
+$(libcrypt_OUT)/libcrypt.o_S: $(libcrypt_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -65,4 +65,4 @@
$(do_ar)
libcrypt_clean:
- $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libintl/Makefile.in uClibc-0.9.30/libintl/Makefile.in
--- uClibc-0.9.30-orig/libintl/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libintl/Makefile.in 2009-03-01 17:59:55.618661700 +0100
@@ -47,7 +47,7 @@
endif
$(call link.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
else
-$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.oS | $(libc)
+$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.o_S | $(libc)
$(call linkm.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
endif
@@ -55,7 +55,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libintl_OUT)/libintl.oS: $(libintl_MSRC)
+$(libintl_OUT)/libintl.o_S: $(libintl_MSRC)
$(Q)$(RM) $@
$(compile-m)
@@ -71,4 +71,4 @@
$(compile.m)
libintl_clean:
- $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libintl_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libm/Makefile.in uClibc-0.9.30/libm/Makefile.in
--- uClibc-0.9.30-orig/libm/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libm/Makefile.in 2009-03-01 17:59:55.665537300 +0100
@@ -174,7 +174,7 @@
endif
$(call link.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
else
-$(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc.depend)
+$(top_builddir)lib/libm.so: $(libm_OUT)/libm.o_S | $(libc.depend)
$(call linkm.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
endif
@@ -182,7 +182,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC) $(libm_MSRC2) $(libm_ARCH_SRC)
+$(libm_OUT)/libm.o_S: $(libm_SRC) $(libm_MSRC) $(libm_MSRC2) $(libm_ARCH_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -204,4 +204,4 @@
$(compile.m)
libm_clean:
- $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e))))
+ $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os o_S a,$(foreach d, *. */*. */*/*.,$(d)$(e))))
diff -u -r uClibc-0.9.30-orig/libpthread/linuxthreads/Makefile.in uClibc-0.9.30/libpthread/linuxthreads/Makefile.in
--- uClibc-0.9.30-orig/libpthread/linuxthreads/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libpthread/linuxthreads/Makefile.in 2009-03-01 17:59:55.696787700 +0100
@@ -66,18 +66,18 @@
forward.c libc-cancellation.c libc_pthread_init.c # alloca_cutoff.c
libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC))
libc-static-y += $(libpthread_OUT)/libc_pthread_init.o
-libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
+libc-shared-y += $(libpthread_libc_OBJ:.o=.o_S)
libpthread-static-y += $(patsubst %,$(libpthread_OUT)/%.o,$(libpthread_static_SRC))
-libpthread-nonshared-y += $(patsubst %,$(libpthread_OUT)/%.oS,$(libpthread_static_SRC))
+libpthread-nonshared-y += $(patsubst %,$(libpthread_OUT)/%.o_S,$(libpthread_static_SRC))
ifeq ($(DOPIC),y)
libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os)
else
libpthread-a-y += $(libpthread_OBJ) $(libpthread-static-y)
endif
-libpthread-so-y += $(libpthread_OBJ:.o=.oS)
+libpthread-so-y += $(libpthread_OBJ:.o=.o_S)
lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
@@ -86,7 +86,7 @@
$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#else
-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.o_S | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
# $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#endif
$(Q)$(RM) $@
@@ -101,9 +101,9 @@
$(do_ar)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+$(libpthread_OUT)/libpthread.o_S: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
endif
-$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC)
+$(libpthread_OUT)/libpthread.o_S: $(libpthread_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -133,4 +133,4 @@
$(do_rm) $(addprefix $(top_builddir),$(linuxthreads_headers))
libpthread_clean:
- $(do_rm) $(addprefix $(libpthread_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*. */*/*/*.,$(d)$(e))))
+ $(do_rm) $(addprefix $(libpthread_OUT)/,$(foreach e, o os o_S a,$(foreach d, *. */*. */*/*. */*/*/*.,$(d)$(e))))
diff -u -r uClibc-0.9.30-orig/libpthread/linuxthreads.old/Makefile.in uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in
--- uClibc-0.9.30-orig/libpthread/linuxthreads.old/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in 2009-03-01 17:59:55.728038100 +0100
@@ -57,10 +57,10 @@
libpthread_libc_CSRC := forward.c libc_pthread_init.c
libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC))
libc-static-y += $(libpthread_OUT)/libc_pthread_init.o
-libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
+libc-shared-y += $(libpthread_libc_OBJ:.o=.o_S)
libpthread-static-y += $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpthread_SPEC_SRC))
-libpthread-shared-y += $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.oS,$(libpthread_SPEC_SRC))
+libpthread-shared-y += $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o_S,$(libpthread_SPEC_SRC))
ifeq ($(DOPIC),y)
libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os)
@@ -76,7 +76,7 @@
$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#else
-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.o_S | $(libc.depend)
# $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
#endif
@@ -88,9 +88,9 @@
$(do_ar)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+$(libpthread_OUT)/libpthread.o_S: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
endif
-$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC) $(libpthread_SPEC_SRC)
+$(libpthread_OUT)/libpthread.o_S: $(libpthread_SRC) $(libpthread_SPEC_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -120,4 +120,4 @@
$(do_rm) $(addprefix $(top_builddir),$(linuxthreads_headers))
libpthread_clean:
- $(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libpthread_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libpthread/linuxthreads.old_db/Makefile.in uClibc-0.9.30/libpthread/linuxthreads.old_db/Makefile.in
--- uClibc-0.9.30-orig/libpthread/linuxthreads.old_db/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libpthread/linuxthreads.old_db/Makefile.in 2009-03-01 18:03:55.449856500 +0100
@@ -42,7 +42,7 @@
endif
$(call link.so,$(libthread_db_FULL_NAME),1)
#else
-#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc.depend)
+#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.o_S | $(libc.depend)
# $(call linkm.so,$(libthread_db_FULL_NAME),1)
#endif
@@ -50,7 +50,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
+$(libthread_db_OUT)/libthread_db.o_S: $(libthread_db_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -73,4 +73,4 @@
$(do_rm) $(top_builddir)include/thread_db.h
libthread_db_clean:
- $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libpthread/linuxthreads_db/Makefile.in uClibc-0.9.30/libpthread/linuxthreads_db/Makefile.in
--- uClibc-0.9.30-orig/libpthread/linuxthreads_db/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libpthread/linuxthreads_db/Makefile.in 2009-03-01 17:59:55.759288500 +0100
@@ -42,7 +42,7 @@
endif
$(call link.so,$(libthread_db_FULL_NAME),1)
#else
-#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc.depend)
+#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.o_S | $(libc.depend)
# $(call linkm.so,$(libthread_db_FULL_NAME),1)
#endif
@@ -50,7 +50,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
+$(libthread_db_OUT)/libthread_db.o_S: $(libthread_db_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -73,4 +73,4 @@
$(do_rm) $(top_builddir)include/thread_db.h
libthread_db_clean:
- $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os o_S a)
diff -u -r uClibc-0.9.30-orig/libutil/Makefile.in uClibc-0.9.30/libutil/Makefile.in
--- uClibc-0.9.30-orig/libutil/Makefile.in 2008-11-07 22:15:53.000000000 +0100
+++ uClibc-0.9.30/libutil/Makefile.in 2009-03-01 17:59:55.806164100 +0100
@@ -45,7 +45,7 @@
endif
$(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
else
-$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc.depend)
+$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.o_S | $(libc.depend)
$(call linkm.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
endif
@@ -53,7 +53,7 @@
$(Q)$(RM) $@
$(do_ar)
-$(libutil_OUT)/libutil.oS: $(libutil_SRC)
+$(libutil_OUT)/libutil.o_S: $(libutil_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -63,4 +63,4 @@
$(do_ar)
libutil_clean:
- $(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a)
+ $(do_rm) $(addprefix $(libutil_OUT)/*., o os o_S a)
More information about the uClibc
mailing list