diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:14:03 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:16:42 +0100 |
| commit | ac5e9d08f4f7aa004e48b9484c3005f0ecc0a105 (patch) | |
| tree | 32d30bd157f862792fdc4193eb2372e4d8cd0df4 /Makefile.in | |
| parent | fd3120fb9ec9fe01d458962dca510eb81d06fcc8 (diff) | |
| parent | 269f901e62106e2d36acf4c2b79a9a5ec6d684ff (diff) | |
Merge remote branch 'origin/master' into prelink
* origin/master:
arm: fix the static link problem for ARM due to undefined __tls_get_addr
nios2: Name architecture correctly in endian.h header
nptl/mips64: Fix build when using mips64 and ABIs other than o32
mips: avoid segmentation fault when RLD_MAP is 0
libc: fix linker script generation for libubacktrace.so
stdio: fix diagnostic message
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index ab5ab7286..2cd226d96 100644 --- a/Makefile.in +++ b/Makefile.in @@ -333,8 +333,8 @@ else endif ifeq ($(UCLIBC_HAS_BACKTRACE),y) # Add the AS_NEEDED entry for libubacktrace.so - if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ - echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ + echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ fi endif ifeq ($(UCLIBC_HAS_THREADS),y) |