eglibc: rebase a nativesdk patch to the newer code

After the eglibc svn commit bumping, this nativesdk recipe's patch is
failing. This commit rebases it to the newer code.

and bump PR.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

diff --git a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
index e00f02a..f968678 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
@@ -19,25 +19,25 @@ RP 14/10/2010
 
 Index: libc/elf/dl-load.c
 ===================================================================
---- libc.orig/elf/dl-load.c    2010-10-14 11:34:54.944365484 +0100
-+++ libc/elf/dl-load.c 2010-10-14 11:35:53.000000000 +0100
-@@ -2105,6 +2105,15 @@
+--- libc.orig/elf/dl-load.c
++++ libc/elf/dl-load.c
+@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader,
                        &loader->l_runpath_dirs, &realname, &fb, loader,
                        LA_SER_RUNPATH, &found_other_class);
  
-+      /* Try the default path.  */
++      /* try the default path.  */
 +      if (fd == -1
 +        && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
 +            || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
 +        && rtld_search_dirs.dirs != (void *) -1)
-+      fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
++      fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
 +                      &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
 +
 +      /* Finally try ld.so.cache */
        if (fd == -1
-         && (__builtin_expect (! preloaded, 1)
+         && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
              || ! INTUSE(__libc_enable_secure)))
-@@ -2167,14 +2176,6 @@
+@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
            }
        }
  
@@ -46,7 +46,7 @@ Index: libc/elf/dl-load.c
 -        && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
 -            || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
 -        && rtld_search_dirs.dirs != (void *) -1)
--      fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
+-      fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
 -                      &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
 -
        /* Add another newline when we are tracing the library loading.  */

diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index fa6e6c3..3d0dc73 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
 
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
-PR = "r11"
+PR = "r12"
 
 EGLIBC_BRANCH="eglibc-2_12"
 SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \