diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch | 93 |
1 files changed, 64 insertions, 29 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 60f9f17b8..7cba6cc36 100644 --- a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,7 +1,7 @@ -From e76048898ae9aa49dc70d6f9b1bbc22082e61fe3 Mon Sep 17 00:00:00 2001 +From c99892f2018cd7fa0f37b53e6cebec99fa036472 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:51:38 +0000 -Subject: [PATCH 03/24] nativesdk-glibc: Raise the size of arrays containing dl +Subject: [PATCH 03/25] nativesdk-glibc: Raise the size of arrays containing dl paths This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings @@ -24,10 +24,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> sysdeps/generic/dl-cache.h | 4 ---- 6 files changed, 13 insertions(+), 9 deletions(-) -diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index dec49bc..862f1d8 100644 ---- a/elf/dl-cache.c -+++ b/elf/dl-cache.c +Index: git/elf/dl-cache.c +=================================================================== +--- git.orig/elf/dl-cache.c ++++ git/elf/dl-cache.c @@ -132,6 +132,10 @@ do \ while (0) @@ -39,11 +39,11 @@ index dec49bc..862f1d8 100644 int internal_function _dl_cache_libcmp (const char *p1, const char *p2) -diff --git a/elf/dl-load.c b/elf/dl-load.c -index c4a42e9..acf6c03 100644 ---- a/elf/dl-load.c -+++ b/elf/dl-load.c -@@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; +Index: git/elf/dl-load.c +=================================================================== +--- git.orig/elf/dl-load.c ++++ git/elf/dl-load.c +@@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_re /* Get the generated information about the trusted directories. */ #include "trusted-dirs.h" @@ -54,10 +54,10 @@ index c4a42e9..acf6c03 100644 { SYSTEM_DIRS_LEN }; -diff --git a/elf/interp.c b/elf/interp.c -index 422ea95e..6d61a36 100644 ---- a/elf/interp.c -+++ b/elf/interp.c +Index: git/elf/interp.c +=================================================================== +--- git.orig/elf/interp.c ++++ git/elf/interp.c @@ -18,5 +18,5 @@ #include <runtime-linker.h> @@ -65,11 +65,11 @@ index 422ea95e..6d61a36 100644 -const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp"))) +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; -diff --git a/elf/ldconfig.c b/elf/ldconfig.c -index f54ec22..0e78a83 100644 ---- a/elf/ldconfig.c -+++ b/elf/ldconfig.c -@@ -167,6 +167,9 @@ static struct argp argp = +Index: git/elf/ldconfig.c +=================================================================== +--- git.orig/elf/ldconfig.c ++++ git/elf/ldconfig.c +@@ -168,6 +168,9 @@ static struct argp argp = options, parse_opt, NULL, doc, NULL, more_help, NULL }; @@ -79,10 +79,10 @@ index f54ec22..0e78a83 100644 /* Check if string corresponds to an important hardware capability or a platform. */ static int -diff --git a/elf/rtld.c b/elf/rtld.c -index 52160df..80f0582 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c +Index: git/elf/rtld.c +=================================================================== +--- git.orig/elf/rtld.c ++++ git/elf/rtld.c @@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) #endif @@ -91,7 +91,7 @@ index 52160df..80f0582 100644 /* List of auditing DSOs. */ static struct audit_list -@@ -873,12 +874,12 @@ of this helper program; chances are you did not intend to run this program.\n\ +@@ -873,12 +874,12 @@ of this helper program; chances are you --list list all dependencies and how they are resolved\n\ --verify verify that given object really is a dynamically linked\n\ object we can handle\n\ @@ -106,10 +106,10 @@ index 52160df..80f0582 100644 ++_dl_skip_args; --_dl_argc; -diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h -index 70d4aeb..5c726d0 100644 ---- a/sysdeps/generic/dl-cache.h -+++ b/sysdeps/generic/dl-cache.h +Index: git/sysdeps/generic/dl-cache.h +=================================================================== +--- git.orig/sysdeps/generic/dl-cache.h ++++ git/sysdeps/generic/dl-cache.h @@ -27,10 +27,6 @@ ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID) #endif @@ -134,3 +134,38 @@ Index: git/iconv/gconv_conf.c /* The path elements, as determined by the __gconv_get_path function. All path elements end in a slash. */ +Index: git/locale/findlocale.c +=================================================================== +--- git.orig/locale/findlocale.c ++++ git/locale/findlocale.c +@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr + which are somehow addressed. */ + struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; + +-const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR; ++char _nl_default_locale_path[4096] __attribute__ ((section (".gccrelocprefix"))) attribute_hidden = COMPLOCALEDIR; + + /* Checks if the name is actually present, that is, not NULL and not + empty. */ +@@ -168,7 +168,7 @@ _nl_find_locale (const char *locale_path + + /* Nothing in the archive. Set the default path to search below. */ + locale_path = _nl_default_locale_path; +- locale_path_len = sizeof _nl_default_locale_path; ++ locale_path_len = strlen(_nl_default_locale_path) + 1; + } + else + /* We really have to load some data. First see whether the name is +Index: git/locale/localeinfo.h +=================================================================== +--- git.orig/locale/localeinfo.h ++++ git/locale/localeinfo.h +@@ -322,7 +322,7 @@ _nl_lookup_word (locale_t l, int categor + } + + /* Default search path if no LOCPATH environment variable. */ +-extern const char _nl_default_locale_path[] attribute_hidden; ++extern char _nl_default_locale_path[] attribute_hidden; + + /* Load the locale data for CATEGORY from the file specified by *NAME. + If *NAME is "", use environment variables as specified by POSIX, and |