Backport handling of AS_NEEDED

diff --git a/Makefile b/Makefile
index 8f7a61e5bd1a6d84c886903359dbbb5f4971ecbd..26d64ba2becd4649b995cabb223daf720382a729 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -243,33 +243,11 @@ ifeq ($(HAVE_SHARED),y)
        done
        if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
                $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-               sed -e '/^GROUP/d' $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+               sed     -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
+                       -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
+                       -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
+                       $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
        fi
-ifeq ($(UCLIBC_HAS_SSP),y)
-ifeq ($(COMPAT_ATEXIT),y)
-       if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
-               echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) AS_NEEDED ( $(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO) ) )" \
-                       >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-       fi
-else
-       if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
-               echo "GROUP ( $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) AS_NEEDED $(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO) ) )" \
-                       >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-       fi
-endif
-else
-ifeq ($(COMPAT_ATEXIT),y)
-       if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
-               echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) )" \
-                       >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-       fi
-else
-       if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
-               echo "GROUP ( $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) )" \
-                       >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-       fi
-endif
-endif
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
        $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
                $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so

diff --git a/libc/Makefile b/libc/Makefile
index a5f8954b8e76d40551f5ca9f9a288e7ef5c0b70f..d27990665f51da25875da9d963f4b738496c3e78 100644 (file)
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -96,12 +96,10 @@ $(SO_LIB_NAME): $(AR_LIB_NAME)
        echo "/* GNU ld script" > $@
        echo " * Use the shared library, but some functions are only in" >> $@
        echo " * the static library, so try that secondarily. */" >> $@
-       #OUT_FORMAT:=$(shell $(LD) --verbose | grep OUTPUT_FORMAT | awk -F '"' '{print $2}')
-       #echo "OUTPUT_FORMAT($(OUT_FORMAT))" >> $@
 ifeq ($(COMPAT_ATEXIT),y)
-       echo "GROUP ( $(TOPDIR)lib/$(NONSHARED_LIBNAME) $(TOPDIR)lib/$(SHARED_MAJORNAME) )" >> $@
+       echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@
 else
-       echo "GROUP ( $(TOPDIR)lib/$(SHARED_MAJORNAME) $(TOPDIR)lib/$(NONSHARED_LIBNAME) )" >> $@
+       echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@
 endif
 
 tags: