diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
commit | 3dc4525661db2630038e019a2a31b71fdcbfb74a (patch) | |
tree | ea19d09158589c89b949b8cc80d5cd61f8d5b64e /core/glibc | |
parent | e41246bc4c78478a71fe801a745210c931c5f2c5 (diff) | |
parent | 76400556d9e8a5dedc692487c13b76a541813a23 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/wml/PKGBUILD
community/exaile/PKGBUILD
community/libquicktime/PKGBUILD
community/mime-editor/PKGBUILD
community/rutilt/PKGBUILD
community/synbak/PKGBUILD
community/thunar-thumbnailers/PKGBUILD
community/tripwire/PKGBUILD
community/wifi-radar/PKGBUILD
community/xulrunner-oss/PKGBUILD
core/bash/PKGBUILD
core/shadow/PKGBUILD
extra/audacity/PKGBUILD
extra/clucene/PKGBUILD
extra/darcs/PKGBUILD
extra/fprint_demo/PKGBUILD
extra/haskell-binary/PKGBUILD
extra/haskell-dataenc/PKGBUILD
extra/haskell-hashed-storage/PKGBUILD
extra/haskell-haskeline/PKGBUILD
extra/haskell-mmap/PKGBUILD
extra/haskell-tar/PKGBUILD
extra/haskell-terminfo/PKGBUILD
extra/haskell-utf8-string/PKGBUILD
extra/libfprint/PKGBUILD
extra/liferea/PKGBUILD
extra/llvm/PKGBUILD
extra/pam_fprint/PKGBUILD
extra/windowmaker-extra/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libao/PKGBUILD
Diffstat (limited to 'core/glibc')
-rw-r--r-- | core/glibc/glibc-2.13-prelink.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/core/glibc/glibc-2.13-prelink.patch b/core/glibc/glibc-2.13-prelink.patch deleted file mode 100644 index bef7998a8..000000000 --- a/core/glibc/glibc-2.13-prelink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. |