patches/uClibc/0.9.32/130-nptl-pthread-Correct-path-for-machine-specific-pt-initfini.c.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2518
     1
commit ebe6c38d7e60e8a43d8b926c17a561a5a3e06a22
yann@2518
     2
Author: Khem Raj <raj.khem@gmail.com>
yann@2518
     3
Date:   Mon Jun 13 17:13:52 2011 -0700
yann@2518
     4
yann@2518
     5
    nptl/pthread: Correct path for machine specific pt-initfini.c
yann@2518
     6
    
yann@2518
     7
    Signed-off-by: Khem Raj <raj.khem@gmail.com>
yann@2518
     8
    Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
yann@2518
     9
yann@2518
    10
diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
yann@2518
    11
index 398eaea..ca84642 100644
yann@2518
    12
--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
yann@2518
    13
+++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
yann@2518
    14
@@ -75,8 +75,8 @@ CFLAGS-pt-initfini.c = -S -g0 $(PICFLAG) -fno-inline-functions	\
yann@2518
    15
 			$(patsubst -f%,-fno-%,$(call check_gcc,-fexceptions,))
yann@2518
    16
 
yann@2518
    17
 #ASFLAGS += $(PICFLAG) -I$(top_srcdir)include -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
yann@2518
    18
-ifneq ($(wildcard $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c),)
yann@2518
    19
-PTHREAD_INITFINI := $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c
yann@2518
    20
+ifneq ($(wildcard $(libpthread_pthread_DIR)/../unix/sysv/linux/$(TARGET_ARCH)/pt-initfini.c),)
yann@2518
    21
+PTHREAD_INITFINI := $(libpthread_pthread_DIR)/../unix/sysv/linux/$(TARGET_ARCH)/pt-initfini.c
yann@2518
    22
 else
yann@2518
    23
 PTHREAD_INITFINI := $(libpthread_pthread_DIR)/pt-initfini.c
yann@2518
    24
 endif