OSDN Git Service

Merge remote-tracking branch 'origin/master' into prelink
authorCarmelo Amoroso <carmelo.amoroso@st.com>
Wed, 6 Apr 2011 13:13:59 +0000 (15:13 +0200)
committerCarmelo Amoroso <carmelo.amoroso@st.com>
Wed, 6 Apr 2011 13:13:59 +0000 (15:13 +0200)
commit3b3285b1b7c02d36c74a6ae265fdb02ca991c96b
tree0f3bf060794323ff690f6f4a86dc903c4570f540
parent289d19f45d7f8af9a4079938a3426aafdd2674ba
parent85f4b028d767fc390a7b866d2f58d58be489242d
Merge remote-tracking branch 'origin/master' into prelink

* origin/master: (137 commits)
  utils/ldd: Check for returned pointer from strrchr not the value it holds
  cris: add provide arch-specific vfork implementation
  lutimes.c, stubs.c: fix compiling lutimes, if __NR_utimensat is not defined
  bump version to 0.9.32-rc3-git
  release 0.9.32-rc3
  memalign: include sys/param.h for MAX
  arm/bits/atomic.h: Include common/bit/atomic.h for thumb1
  wctype.h: fix libc_hidden_proto for iswupper and add it for iswspace
  add libc_hidden_proto for wcs[n]casecmp_l
  really fix missing __libc_drand48_data
  Revert "missing prototype of __libc_drand48_data fixed"
  missing prototype of __libc_drand48_data fixed
  time.c, time.h: remove unused hidden strftime/strptime
  nanosleep.c: remove duplicated libc_hidden_proto
  ctype.c, ctype.h: remove commented parts that were banned for removal after 0.9.31
  _wctype.c, wctype.h: remove unused isw* and wctype_l hidden functions
  time.c, wchar.h: remove unused hidden wcsftime
  str[n]casecmp.c: fix hidden usage
  remove unused hidden functions
  frv/memset.S: add missing libc_hidden_def
  ...

Conflicts:
ldso/ldso/ldso.c

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
12 files changed:
Makerules
extra/Configs/Config.in
ldso/include/dl-defs.h
ldso/include/dl-elf.h
ldso/ldso/Makefile.in
ldso/ldso/dl-elf.c
ldso/ldso/i386/elfinterp.c
ldso/ldso/ldso.c
ldso/ldso/sparc/elfinterp.c
ldso/ldso/x86_64/elfinterp.c
ldso/libdl/libdl.c
libc/misc/internals/__uClibc_main.c