Some shared flat improvements.

Fix minor errors:
  - UCLIBC_SHARED_FLAT_ID instead of SHARED_FLAT_ID
  - use -Wl,-shared-lib-id properly
Use libc_so.a as the source for the shared libc, in order to be able to
use -mleaf-id-shared-library on the Blackfin.

1 files changed, 5 insertions, 2 deletions

diff --git a/libc/Makefile.in b/libc/Makefile.in
index 3ff5ab578..6468ab7ea 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -93,8 +93,11 @@ $(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y)
 	$(do_strip)
 	$(do_ar)
 
-$(top_builddir)lib/libc.gdb: $(top_builddir)lib/libc.a $(LINK_FLAT_CRTS)
-	$(call link-flat.so,$(@:.gdb=),$(SHARED_FLAT_ID))
+# We use libc_so.a so that we can compile the shared library with special
+# flags - i.e. -mleaf-id-shared-library.  The static libc.a needs to be
+# compiled without it.
+$(top_builddir)lib/libc.gdb: $(libc_OUT)/libc_so.a $(LINK_FLAT_CRTS)
+	$(call link-flat.so,$(@:.gdb=),$(UCLIBC_SHARED_FLAT_ID))
 
 libc_clean:
 	$(RM) $(libc_OUT)/*.{o,os,oS,a}