devel

devel@uclibc-ng.org

2 participants
1078 discussions

Start a nNew thread

uClibc-ng - small C library for embedded systems branch 1.0 updated. e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a

by wbx＠helium.waldemar-brodkorb.de

9 years, 2 months

uClibc-ng - small C library for embedded systems branch master updated. f972c2262fd4efc2bbf9789dce145bb705acec24

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via f972c2262fd4efc2bbf9789dce145bb705acec24 (commit) from 322fdd37d307a12c913be78cebcc348a77731dd3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f972c2262fd4efc2bbf9789dce145bb705acec24 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Fri Feb 13 13:04:01 2015 -0600 uncomment nios2 ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 31944be..c1a2d5a 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -104,8 +104,8 @@ config TARGET_mips #config TARGET_nios # bool "nios" -#config TARGET_nios2 -# bool "nios2" +config TARGET_nios2 + bool "nios2" config TARGET_powerpc bool "powerpc" hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch master updated. 322fdd37d307a12c913be78cebcc348a77731dd3

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via 322fdd37d307a12c913be78cebcc348a77731dd3 (commit) from c725f1deaef5bbfb22c83fbfc221a86255a3072b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.arm | 8 +++ extra/Configs/Config.in | 1 - libc/sysdeps/linux/arm/clone.S | 14 ++--- .../linuxthreads.old/sysdeps/arm/pt-machine.h | 56 +++++++++++++++++--- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index a16c919..00cf982 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -28,6 +28,7 @@ config CONFIG_ARM_EABI config COMPILE_IN_THUMB_MODE bool "Build using Thumb mode" select USE_BX + select USE_LDREXSTREX help Say 'y' here to force building uClibc in thumb mode. Say 'n' to use your compiler's default mode. @@ -38,3 +39,10 @@ config USE_BX Say 'y' to use BX to return from functions on your thumb-aware processor. Say 'y' if you need to use interworking. Say 'n' if not. It is safe to say 'y' even if you're not doing interworking. + +config USE_LDREXSTREX + bool "Use load-store exclusive ASM ops (not supported in SmartFusion)" + depends on COMPILE_IN_THUMB_MODE + default n + help + Say 'y' to use LDREX/STREX ASM ops. diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index c7a3b2d..31944be 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -524,7 +524,6 @@ config LINUXTHREADS_OLD # linuxthreads and linuxthreads.old need nanosleep() select UCLIBC_HAS_REALTIME depends on !TARGET_arc && \ - !TARGET_arm && \ !TARGET_i386 && \ !TARGET_metag && \ !TARGET_mips && \ diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S index 29045ef..d1c9239 100644 --- a/libc/sysdeps/linux/arm/clone.S +++ b/libc/sysdeps/linux/arm/clone.S @@ -26,7 +26,10 @@ #include <sys/syscall.h> #include <bits/arm_asm.h> #include <bits/arm_bx.h> + +#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__ #include <sysdep-cancel.h> +#endif #define CLONE_VM 0x00000100 #define CLONE_THREAD 0x00010000 @@ -57,23 +60,22 @@ __clone: @ get flags mov r0, r2 @ new sp is already in r1 - @ load remaining arguments off the stack - stmfd sp!, {r4} - ldr r2, [sp, #4] - ldr r3, [sp, #8] - ldr r4, [sp, #12] DO_CALL (clone) movs a1, a1 blt __error - ldmnefd sp!, {r4} beq 1f bx lr 1: @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] +#if defined(__USE_BX__) ldr r1, [sp] bl 2f @ blx r1 +#else + mov lr, pc + ldr pc, [sp] +#endif @ and we are done, passing the return value through r0 bl HIDDEN_JUMPTARGET(_exit) diff --git a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h index 438c12a..2b877f9 100644 --- a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h @@ -21,12 +21,50 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 -#include <features.h> +#include <sys/syscall.h> +#include <unistd.h> #ifndef PT_EI # define PT_EI __extern_always_inline #endif +#if defined(__thumb__) +#if defined(__USE_LDREXSTREX__) +PT_EI long int ldrex(int *spinlock) +{ + long int ret; + __asm__ __volatile__( + "ldrex %0, [%1]\n" + : "=r"(ret) + : "r"(spinlock) : "memory"); + return ret; +} + +PT_EI long int strex(int val, int *spinlock) +{ + long int ret; + __asm__ __volatile__( + "strex %0, %1, [%2]\n" + : "=r"(ret) + : "r" (val), "r"(spinlock) : "memory"); + return ret; +} + +/* Spinlock implementation; required. */ +PT_EI long int +testandset (int *spinlock) +{ + register unsigned int ret; + + do { + ret = ldrex(spinlock); + } while (strex(1, spinlock)); + + return ret; +} + +#else /* __USE_LDREXSTREX__ */ + /* This will not work on ARM1 or ARM2 because SWP is lacking on those machines. Unfortunately we have no way to detect this at compile time; let's hope nobody tries to use one. */ @@ -36,8 +74,6 @@ PT_EI long int testandset (int *spinlock); PT_EI long int testandset (int *spinlock) { register unsigned int ret; - -#if defined(__thumb__) void *pc; __asm__ __volatile__( ".align 0\n" @@ -50,15 +86,21 @@ PT_EI long int testandset (int *spinlock) "\t.force_thumb" : "=r"(ret), "=r"(pc) : "0"(1), "r"(spinlock)); -#else + return ret; +} +#endif +#else /* __thumb__ */ + +PT_EI long int testandset (int *spinlock); +PT_EI long int testandset (int *spinlock) +{ + register unsigned int ret; __asm__ __volatile__("swp %0, %1, [%2]" : "=r"(ret) : "0"(1), "r"(spinlock)); -#endif - return ret; } - +#endif /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. 322fdd37d307a12c913be78cebcc348a77731dd3

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 322fdd37d307a12c913be78cebcc348a77731dd3 (commit) via c725f1deaef5bbfb22c83fbfc221a86255a3072b (commit) via ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (commit) from cfdddb3c53213ab6af35364b683de2bf8e8ab05a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.arm | 8 +++ extra/Configs/Config.in | 1 - libc/sysdeps/linux/arm/clone.S | 14 ++--- .../linuxthreads.old/sysdeps/arm/pt-machine.h | 56 +++++++++++++++++--- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index a16c919..00cf982 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -28,6 +28,7 @@ config CONFIG_ARM_EABI config COMPILE_IN_THUMB_MODE bool "Build using Thumb mode" select USE_BX + select USE_LDREXSTREX help Say 'y' here to force building uClibc in thumb mode. Say 'n' to use your compiler's default mode. @@ -38,3 +39,10 @@ config USE_BX Say 'y' to use BX to return from functions on your thumb-aware processor. Say 'y' if you need to use interworking. Say 'n' if not. It is safe to say 'y' even if you're not doing interworking. + +config USE_LDREXSTREX + bool "Use load-store exclusive ASM ops (not supported in SmartFusion)" + depends on COMPILE_IN_THUMB_MODE + default n + help + Say 'y' to use LDREX/STREX ASM ops. diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index c7a3b2d..31944be 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -524,7 +524,6 @@ config LINUXTHREADS_OLD # linuxthreads and linuxthreads.old need nanosleep() select UCLIBC_HAS_REALTIME depends on !TARGET_arc && \ - !TARGET_arm && \ !TARGET_i386 && \ !TARGET_metag && \ !TARGET_mips && \ diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S index 29045ef..d1c9239 100644 --- a/libc/sysdeps/linux/arm/clone.S +++ b/libc/sysdeps/linux/arm/clone.S @@ -26,7 +26,10 @@ #include <sys/syscall.h> #include <bits/arm_asm.h> #include <bits/arm_bx.h> + +#if defined __UCLIBC_HAS_THREADS__ && !defined __LINUXTHREADS_OLD__ #include <sysdep-cancel.h> +#endif #define CLONE_VM 0x00000100 #define CLONE_THREAD 0x00010000 @@ -57,23 +60,22 @@ __clone: @ get flags mov r0, r2 @ new sp is already in r1 - @ load remaining arguments off the stack - stmfd sp!, {r4} - ldr r2, [sp, #4] - ldr r3, [sp, #8] - ldr r4, [sp, #12] DO_CALL (clone) movs a1, a1 blt __error - ldmnefd sp!, {r4} beq 1f bx lr 1: @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] +#if defined(__USE_BX__) ldr r1, [sp] bl 2f @ blx r1 +#else + mov lr, pc + ldr pc, [sp] +#endif @ and we are done, passing the return value through r0 bl HIDDEN_JUMPTARGET(_exit) diff --git a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h index 438c12a..2b877f9 100644 --- a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h @@ -21,12 +21,50 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 -#include <features.h> +#include <sys/syscall.h> +#include <unistd.h> #ifndef PT_EI # define PT_EI __extern_always_inline #endif +#if defined(__thumb__) +#if defined(__USE_LDREXSTREX__) +PT_EI long int ldrex(int *spinlock) +{ + long int ret; + __asm__ __volatile__( + "ldrex %0, [%1]\n" + : "=r"(ret) + : "r"(spinlock) : "memory"); + return ret; +} + +PT_EI long int strex(int val, int *spinlock) +{ + long int ret; + __asm__ __volatile__( + "strex %0, %1, [%2]\n" + : "=r"(ret) + : "r" (val), "r"(spinlock) : "memory"); + return ret; +} + +/* Spinlock implementation; required. */ +PT_EI long int +testandset (int *spinlock) +{ + register unsigned int ret; + + do { + ret = ldrex(spinlock); + } while (strex(1, spinlock)); + + return ret; +} + +#else /* __USE_LDREXSTREX__ */ + /* This will not work on ARM1 or ARM2 because SWP is lacking on those machines. Unfortunately we have no way to detect this at compile time; let's hope nobody tries to use one. */ @@ -36,8 +74,6 @@ PT_EI long int testandset (int *spinlock); PT_EI long int testandset (int *spinlock) { register unsigned int ret; - -#if defined(__thumb__) void *pc; __asm__ __volatile__( ".align 0\n" @@ -50,15 +86,21 @@ PT_EI long int testandset (int *spinlock) "\t.force_thumb" : "=r"(ret), "=r"(pc) : "0"(1), "r"(spinlock)); -#else + return ret; +} +#endif +#else /* __thumb__ */ + +PT_EI long int testandset (int *spinlock); +PT_EI long int testandset (int *spinlock) +{ + register unsigned int ret; __asm__ __volatile__("swp %0, %1, [%2]" : "=r"(ret) : "0"(1), "r"(spinlock)); -#endif - return ret; } - +#endif /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch master updated. c725f1deaef5bbfb22c83fbfc221a86255a3072b

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via c725f1deaef5bbfb22c83fbfc221a86255a3072b (commit) via cfdddb3c53213ab6af35364b683de2bf8e8ab05a (commit) from ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c725f1deaef5bbfb22c83fbfc221a86255a3072b Merge: ee1800c cfdddb3 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Thu Feb 12 14:03:55 2015 -0600 resolve merge conflict ----------------------------------------------------------------------- Summary of changes: Rules.mak | 2 +- test/nptl/tst-cancel7.c | 10 +++------- test/nptl/tst-mqueue7.c | 5 +++-- test/test-skeleton.c | 22 ++++++---------------- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Rules.mak b/Rules.mak index 8889d19..2a73d7f 100644 --- a/Rules.mak +++ b/Rules.mak @@ -127,7 +127,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR MAJOR_VERSION := 1 MINOR_VERSION := 0 SUBLEVEL := 0 -EXTRAVERSION := -git +EXTRAVERSION :=-git VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ABI_VERSION := $(MAJOR_VERSION) ifneq ($(EXTRAVERSION),) diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c index 616c0a8..9e7d22e 100644 --- a/test/nptl/tst-cancel7.c +++ b/test/nptl/tst-cancel7.c @@ -193,19 +193,15 @@ do_cleanup (void) } #endif -#define OPT_COMMAND 10000 -#define OPT_PIDFILE 10001 #define CMDLINE_OPTIONS \ - { "command", required_argument, NULL, OPT_COMMAND }, \ - { "pidfile", required_argument, NULL, OPT_PIDFILE }, + "c:p:" #define CMDLINE_PROCESS \ - case OPT_COMMAND: \ + case 'c': \ command = optarg; \ break; \ - case OPT_PIDFILE: \ + case 'p': \ pidfile = optarg; \ break; -// #define CLEANUP_HANDLER do_cleanup () #define PREPARE(argc, argv) do_prepare (argc, argv) #define TEST_FUNCTION do_test () #define TIMEOUT 5 diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c index d3ea2b7..1892f95 100644 --- a/test/nptl/tst-mqueue7.c +++ b/test/nptl/tst-mqueue7.c @@ -32,9 +32,10 @@ static mqd_t after_exec = (mqd_t) -1; #define CMDLINE_OPTIONS \ - { "after-exec", required_argument, NULL, OPT_AFTEREXEC }, + "a:" + #define CMDLINE_PROCESS \ - case OPT_AFTEREXEC: \ + case 'a': \ after_exec = (mqd_t) strtoul (optarg, NULL, 0); \ break; diff --git a/test/test-skeleton.c b/test/test-skeleton.c index cf7afea..03c2ff8 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -43,19 +43,6 @@ # define TEST_DATA_LIMIT (64 << 20) /* Data limit (bytes) to run with. */ #endif -#define OPT_DIRECT 1000 -#define OPT_TESTDIR 1001 - -static struct option options[] = -{ -#ifdef CMDLINE_OPTIONS - CMDLINE_OPTIONS -#endif - { "direct", no_argument, NULL, OPT_DIRECT }, - { "test-dir", required_argument, NULL, OPT_TESTDIR }, - { NULL, 0, NULL, 0 } -}; - /* PID of the test itself. */ static pid_t pid; @@ -241,15 +228,18 @@ main (int argc, char *argv[]) setbuf (stdout, NULL); #endif - while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1) +# ifndef CMDLINE_OPTIONS +# define CMDLINE_OPTIONS "" +# endif + while ((opt = getopt (argc, argv, "+dt:" CMDLINE_OPTIONS)) >= 0) switch (opt) { case '?': exit (1); - case OPT_DIRECT: + case 'd': direct = 1; break; - case OPT_TESTDIR: + case 't': test_dir = optarg; break; #ifdef CMDLINE_PROCESS hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. cfdddb3c53213ab6af35364b683de2bf8e8ab05a

by wbx＠helium.waldemar-brodkorb.de

9 years, 2 months

uClibc-ng - small C library for embedded systems branch master updated. ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (commit) from 9728de1929812df84749c9fb044f6f584e044199 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Feb 8 22:01:23 2015 -0600 mark for development ----------------------------------------------------------------------- Summary of changes: Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rules.mak b/Rules.mak index 9ea92aa..8889d19 100644 --- a/Rules.mak +++ b/Rules.mak @@ -127,7 +127,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR MAJOR_VERSION := 1 MINOR_VERSION := 0 SUBLEVEL := 0 -EXTRAVERSION := +EXTRAVERSION := -git VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ABI_VERSION := $(MAJOR_VERSION) ifneq ($(EXTRAVERSION),) hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 updated. 9728de1929812df84749c9fb044f6f584e044199

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 9728de1929812df84749c9fb044f6f584e044199 (commit) from ff6ce3999db93a52d1cd22510f8508b660ddf54e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.in | 9 +++++++++ ldso/ldso/dl-elf.c | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index cec06e4..c7a3b2d 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -420,6 +420,15 @@ config LDSO_RUNPATH Usage of RUNPATH tags is not too common, so disabling this feature should be safe for most people. +config LDSO_RUNPATH_OF_EXECUTABLE + bool "Use executables RPATH/RUNPATH when searching for libraries." + depends on LDSO_RUNPATH + default n + help + Use the executables RPATH/RUNPATH to find to find libraries even + though this behavour is not standard. Setting this option causes + the uclibc dynamic linker behavour to match the glibc dynamic linker. + config LDSO_SAFE_RUNPATH bool "Allow only RUNPATH beginning with /" depends on LDSO_RUNPATH diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 6fc95b3..d42b912 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -266,6 +266,18 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) return tpnt1; } +#ifdef __LDSO_RUNPATH_OF_EXECUTABLE__ + /* + * Try the DT_RPATH of the executable itself. + */ + pnt = (char *) _dl_loaded_modules->dynamic_info[DT_RPATH]; + if (pnt) { + pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB]; + _dl_if_debug_dprint("\tsearching exe's RPATH='%s'\n", pnt); + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) + return tpnt1; + } +#endif #endif /* hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch master updated. 9728de1929812df84749c9fb044f6f584e044199

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via 9728de1929812df84749c9fb044f6f584e044199 (commit) via ff6ce3999db93a52d1cd22510f8508b660ddf54e (commit) from 5d775f82cb4269a6967196e4c5fa63c2af71b769 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9728de1929812df84749c9fb044f6f584e044199 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Feb 8 15:06:11 2015 +0100 Use executables RPATH/RUNPATH when searching for libraries. Patch by Steve Ellcey <sellcey(a)imgtec.com> on uClibc mailinglist. ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.in | 9 +++++++++ include/gnu-versions.h | 2 ++ ldso/ldso/dl-elf.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index cec06e4..c7a3b2d 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -420,6 +420,15 @@ config LDSO_RUNPATH Usage of RUNPATH tags is not too common, so disabling this feature should be safe for most people. +config LDSO_RUNPATH_OF_EXECUTABLE + bool "Use executables RPATH/RUNPATH when searching for libraries." + depends on LDSO_RUNPATH + default n + help + Use the executables RPATH/RUNPATH to find to find libraries even + though this behavour is not standard. Setting this option causes + the uclibc dynamic linker behavour to match the glibc dynamic linker. + config LDSO_SAFE_RUNPATH bool "Allow only RUNPATH beginning with /" depends on LDSO_RUNPATH diff --git a/include/gnu-versions.h b/include/gnu-versions.h index f67764c..9f53778 100644 --- a/include/gnu-versions.h +++ b/include/gnu-versions.h @@ -45,7 +45,9 @@ #define _GNU_OBSTACK_INTERFACE_VERSION 1 /* vs malloc/obstack.c */ #define _GNU_REGEX_INTERFACE_VERSION 1 /* vs posix/regex.c */ +#ifdef __UCLIBC_HAS_GNU_GLOB__ #define _GNU_GLOB_INTERFACE_VERSION 1 /* vs posix/glob.c */ +#endif #define _GNU_GETOPT_INTERFACE_VERSION 2 /* vs posix/getopt.c and posix/getopt1.c */ diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 6fc95b3..d42b912 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -266,6 +266,18 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) return tpnt1; } +#ifdef __LDSO_RUNPATH_OF_EXECUTABLE__ + /* + * Try the DT_RPATH of the executable itself. + */ + pnt = (char *) _dl_loaded_modules->dynamic_info[DT_RPATH]; + if (pnt) { + pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB]; + _dl_if_debug_dprint("\tsearching exe's RPATH='%s'\n", pnt); + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) + return tpnt1; + } +#endif #endif /* hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

uClibc-ng - small C library for embedded systems branch 1.0 created. ff6ce3999db93a52d1cd22510f8508b660ddf54e

by wbx＠helium.waldemar-brodkorb.de

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been created at ff6ce3999db93a52d1cd22510f8508b660ddf54e (commit) - Log ----------------------------------------------------------------- commit ff6ce3999db93a52d1cd22510f8508b660ddf54e Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sat Feb 7 09:54:24 2015 +0100 only advertise when choosen As discussed on the uClibc mailinglist, do not advertise when not activated. See this thread: http://lists.uclibc.org/pipermail/uclibc/2015-February/048766.html ----------------------------------------------------------------------- hooks/post-receive -- uClibc-ng - small C library for embedded systems

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel