diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /Rules.mak | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -481,10 +481,6 @@ ifeq ($(TARGET_ARCH),i960) SYMBOL_PREFIX=_ endif -ifeq ($(TARGET_ARCH),microblaze) - SYMBOL_PREFIX=_ -endif - ifeq ($(TARGET_ARCH),v850) SYMBOL_PREFIX=_ endif @@ -671,6 +667,7 @@ PTINC:= -I$(top_builddir)$(PTDIR) \ -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(top_srcdir)$(PTDIR)/sysdeps/pthread \ -I$(top_srcdir)$(PTDIR)/sysdeps/pthread/bits \ + -I$(top_srcdir)$(PTDIR)/sysdeps/generic \ -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ -I$(top_srcdir)ldso/include # |