cirros-testvm/src-cirros/buildroot-2015.05/package/uclibc/0.9.33.2/0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch

   1 From 0600966321c011c31edbb60945bbdca3fa34b7cb Mon Sep 17 00:00:00 2001
   2 From: Markos Chandras <markos.chandras@imgtec.com>
   3 Date: Mon, 25 Feb 2013 09:41:25 +0000
   4 Subject: [PATCH] buildsys: Add missing $(SYMBOL_PREFIX) to symbol names
   5
   6 Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
   7 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
   8 ---
   9  Makerules                   |    2 +-
  10  ldso/ldso/Makefile.in       |    2 +-
  11  ldso/ldso/bfin/dl-startup.h |    5 +----
  12  ldso/libdl/Makefile.in      |    2 +-
  13  libpthread/nptl/Makefile.in |    2 +-
  14  5 files changed, 5 insertions(+), 8 deletions(-)
  15
  16 diff --git a/Makerules b/Makerules
  17 index 60acaa8..28bbdef 100644
  18 --- a/Makerules
  19 +++ b/Makerules
  20 @@ -300,7 +300,7 @@ define create-lds
  21         -Wl,-z,relro -Wl,--hash-style=gnu -Wl,-z,defs \
  22         -Wl,--verbose 2>&1 | LC_ALL=C \
  23         sed -e '/^=========/,/^=========/!d;/^=========/d' \
  24 -       -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' > $@.lds
  25 +       -e 's/\. = .* + SIZEOF_HEADERS;/& $(SYMBOL_PREFIX)_begin = . - SIZEOF_HEADERS;/' > $@.lds
  26  endef
  27
  28  define link.so
  29 diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
  30 index eb1570a..91165c6 100644
  31 --- a/ldso/ldso/Makefile.in
  32 +++ b/ldso/ldso/Makefile.in
  33 @@ -36,7 +36,7 @@ LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS)
  34  else
  35  LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
  36  endif
  37 -LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,_start -Wl,-z,now -Wl,-Bsymbolic \
  38 +LDFLAGS-$(UCLIBC_LDSO_NAME).so += -Wl,-e,$(SYMBOL_PREFIX)_start -Wl,-z,now -Wl,-Bsymbolic \
  39         -Wl,--export-dynamic $(CFLAG_-Wl--sort-common) -Wl,--discard-locals \
  40         $(CFLAG_-Wl--discard-all) -Wl,--no-undefined
  41
  42 diff --git a/ldso/ldso/bfin/dl-startup.h b/ldso/ldso/bfin/dl-startup.h
  43 index 76ae150..860b7c6 100644
  44 --- a/ldso/ldso/bfin/dl-startup.h
  45 +++ b/ldso/ldso/bfin/dl-startup.h
  46 @@ -40,10 +40,7 @@ __asm__(
  47         "       .text\n"
  48         "       .global __start\n"
  49         "       .type   __start,@function\n"
  50 -       /* Build system expects a "_start" for the entry point;
  51 -          provide it as it's free to do so with aliases.  */
  52 -       "       .set    _start, __start\n"
  53 -       "       .global _start\n"
  54 +       "       .hidden __start\n"
  55         "__start:\n"
  56         "       call    .Lcall\n"
  57         ".Lcall:\n"
  58 diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
  59 index be236c8..edf95a6 100644
  60 --- a/ldso/libdl/Makefile.in
  61 +++ b/ldso/libdl/Makefile.in
  62 @@ -23,7 +23,7 @@ LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libdl.so := -Wl,--dsbt-index=3
  63  LDFLAGS-libdl.so := $(LDFLAGS)
  64
  65  ifeq ($(LDSO_NO_CLEANUP),)
  66 -LDFLAGS-libdl.so += -Wl,-fini,dl_cleanup
  67 +LDFLAGS-libdl.so += -Wl,-fini,$(SYMBOL_PREFIX)dl_cleanup
  68  endif
  69
  70  LIBS-libdl.so := $(LIBS) $(ldso)
  71 diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
  72 index 158bcae..0008822 100644
  73 --- a/libpthread/nptl/Makefile.in
  74 +++ b/libpthread/nptl/Makefile.in
  75 @@ -145,7 +145,7 @@ LDFLAGS-libpthread.so += $(LDFLAGS)
  76  endif
  77
  78  LDFLAGS-libpthread.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so $(top_builddir)lib/libdl-$(VERSION).so \
  79 -       -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal
  80 +       -Wl,-z,nodelete,-z,initfirst,-init=$(SYMBOL_PREFIX)__pthread_initialize_minimal_internal
  81
  82  LIBS-libpthread.so := $(LIBS)
  83
  84 --
  85 1.7.10.4
  86