From 3a14ea8812e8695b5205a70431d513fb905c0daf Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 31 Mar 2015 22:43:52 +0200 Subject: Revert "librt: Use -nodefaultlibs instead of -nostdlib" This reverts commit 534f44d53146457b3ca686c47efb9207543b88e1. I don't think this is wanted. Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index fbbf5b447..8555e94db 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -15,9 +15,6 @@ LIBS-librt.so := $(LIBS) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) LIBS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so endif -START_FILE-librt.so := $(SHARED_START_FILES) -END_FILE-librt.so := $(SHARED_END_FILES) - librt_FULL_NAME := librt-$(VERSION).so -- cgit v1.2.3 From 5fe8fc1ac4b5eb0f9e9bb01295c14b99d80ab41e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 31 Mar 2015 22:44:22 +0200 Subject: buildsys: Do not build crt upon pregen No need to build crt when just generating headers Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index 8555e94db..a246d00ee 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -73,7 +73,7 @@ $(librt_OUT)/librt_so.a: $(librt-so-y) $(Q)$(RM) $@ $(do_ar) -$(top_builddir)lib/librt.a: $(librt-a-y) | $(top_builddir)lib +$(top_builddir)lib/librt.a: $(librt-a-y) $(Q)$(RM) $@ $(do_ar) -- cgit v1.2.3 From 04cd09eb3a4856e9dc31112170290e3baa3bf9fb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 14 Apr 2015 23:58:41 +0200 Subject: librt: Fix librt.so depends for !NPTL Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index a246d00ee..e211bd2e7 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -61,8 +61,8 @@ lib-a-y += $(top_builddir)lib/librt.a lib-so-y += $(top_builddir)lib/librt.so endif - -ifeq ($(DOPIC)$(UCLIBC_HAS_THREADS_NATIVE),yn) +# for NPTL we need SHARED regardless of DOPIC +ifeq ($(if $(UCLIBC_HAS_THREADS_NATIVE),,$(DOPIC)),y) $(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.depend) else $(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) $(libpthread.depend) $(libdl.depend) -- cgit v1.2.3 From 19c4bf396ead620a84051102e7f0914200fcc5e0 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 14 Apr 2015 23:58:41 +0200 Subject: librt: Rephrase librt.so library dependencies Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index e211bd2e7..2fde48caa 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -61,11 +61,14 @@ lib-a-y += $(top_builddir)lib/librt.a lib-so-y += $(top_builddir)lib/librt.so endif +librt-dep-y := $(libc.depend) +librt-dep-$(UCLIBC_HAS_THREADS_NATIVE) += $(libpthread.depend) $(libdl.depend) + # for NPTL we need SHARED regardless of DOPIC ifeq ($(if $(UCLIBC_HAS_THREADS_NATIVE),,$(DOPIC)),y) -$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.depend) +$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(librt-dep-y) else -$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) $(libpthread.depend) $(libdl.depend) +$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(librt-dep-y) endif $(call link.so,$(librt_FULL_NAME),$(ABI_VERSION)) -- cgit v1.2.3 From a8cf23486eef67c359c295e8da3cb39cadf87f79 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 14 Apr 2015 23:58:41 +0200 Subject: librt: honour HAS_STUBS in buildsys Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index 2fde48caa..15ee23e00 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -42,6 +42,8 @@ librt_filter_SRC += $(if $(UCLIBC_HAS_ADVANCED_REALTIME),, \ spawn_faction_addopen.c \ spawn_faction_init.c) +librt_filter_SRC += $(if $(UCLIBC_HAS_STUBS),,rt_stubs.c) + librt_SRC := $(filter-out $(librt_filter_SRC),$(librt_SRC)) librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_SRC)) -- cgit v1.2.3 From efc26521e8c8cda6430efe9a8ed1b73896b655b5 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 14 Apr 2015 23:58:41 +0200 Subject: librt: Refine LIBS Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index 15ee23e00..4e81764b8 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -13,7 +13,8 @@ LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-librt.so := -Wl,--dsbt-index=9 LDFLAGS-librt.so := $(LDFLAGS) LIBS-librt.so := $(LIBS) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -LIBS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so +LIBS-librt.so += $(top_builddir)lib/libpthread.so \ + $(CC_FLAG_ASNEEDED) $(top_builddir)lib/libdl.so $(CC_FLAG_NO_ASNEEDED) endif librt_FULL_NAME := librt-$(VERSION).so @@ -21,8 +22,6 @@ librt_FULL_NAME := librt-$(VERSION).so librt_DIR := $(top_srcdir)librt librt_OUT := $(top_builddir)librt -ifeq ($(UCLIBC_HAS_REALTIME),y) - librt_SRC := $(notdir $(wildcard $(librt_DIR)/*.c)) librt_filter_SRC := ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) @@ -45,7 +44,6 @@ librt_filter_SRC += $(if $(UCLIBC_HAS_ADVANCED_REALTIME),, \ librt_filter_SRC += $(if $(UCLIBC_HAS_STUBS),,rt_stubs.c) librt_SRC := $(filter-out $(librt_filter_SRC),$(librt_SRC)) - librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_SRC)) librt_OBJ += $(patsubst $(librt_DIR)/%.S,$(librt_OUT)/%.o,$(librt_SSRC)) @@ -59,6 +57,7 @@ librt-a-y += $(librt_OBJ) endif librt-so-y += $(librt_OBJ:.o=.oS) +ifeq ($(UCLIBC_HAS_REALTIME),y) lib-a-y += $(top_builddir)lib/librt.a lib-so-y += $(top_builddir)lib/librt.so endif -- cgit v1.2.3 From 03cc2041fc21889ca2256d0f1de76683bed4e94e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 14 Apr 2015 23:58:41 +0200 Subject: librt: Add missing __dso_handle Signed-off-by: Bernhard Reutner-Fischer --- librt/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'librt/Makefile.in') diff --git a/librt/Makefile.in b/librt/Makefile.in index 4e81764b8..1536a5cb9 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -42,6 +42,7 @@ librt_filter_SRC += $(if $(UCLIBC_HAS_ADVANCED_REALTIME),, \ spawn_faction_init.c) librt_filter_SRC += $(if $(UCLIBC_HAS_STUBS),,rt_stubs.c) +librt_filter_SRC += $(if $(HAS_NO_THREADS),dso_handle.c) librt_SRC := $(filter-out $(librt_filter_SRC),$(librt_SRC)) librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_SRC)) -- cgit v1.2.3