summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-20 08:18:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:03:04 +0100
commitbe9756ae12c7ea4629943bf59f30f0c8330a2056 (patch)
treec31909788aa147bb4f3ef41804a61b32f7a2a58b /meta/recipes-core
parentd2270701924553b720001a8cf0c1c48921efe9c4 (diff)
downloadpoky-be9756ae12c7ea4629943bf59f30f0c8330a2056.tar.gz
uclibc-git: Upgrade to latest tip of master
(From OE-Core rev: 3c516e1032c86156dc09ffa509977fe197470090) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/argp-support.patch136
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch27
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/orign_path.patch47
-rw-r--r--meta/recipes-core/uclibc/uclibc_git.bb3
4 files changed, 93 insertions, 120 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/argp-support.patch b/meta/recipes-core/uclibc/uclibc-git/argp-support.patch
index 3e9680f1fe..bcec6a593a 100644
--- a/meta/recipes-core/uclibc/uclibc-git/argp-support.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/argp-support.patch
@@ -74,9 +74,9 @@ Upstream-Status: Pending
74 74
75Index: git/Makefile.in 75Index: git/Makefile.in
76=================================================================== 76===================================================================
77--- git.orig/Makefile.in 77--- git.orig/Makefile.in 2012-06-18 13:10:12.000000000 -0700
78+++ git/Makefile.in 78+++ git/Makefile.in 2012-06-18 13:12:06.448829343 -0700
79@@ -48,6 +48,7 @@ include $(top_srcdir)libresolv/Makefile. 79@@ -48,6 +48,7 @@
80 include $(top_srcdir)libutil/Makefile.in 80 include $(top_srcdir)libutil/Makefile.in
81 include $(top_srcdir)libpthread/Makefile.in 81 include $(top_srcdir)libpthread/Makefile.in
82 include $(top_srcdir)librt/Makefile.in 82 include $(top_srcdir)librt/Makefile.in
@@ -84,7 +84,7 @@ Index: git/Makefile.in
84 include $(top_srcdir)libubacktrace/Makefile.in 84 include $(top_srcdir)libubacktrace/Makefile.in
85 include $(top_srcdir)extra/locale/Makefile.in 85 include $(top_srcdir)extra/locale/Makefile.in
86 86
87@@ -230,6 +231,7 @@ HEADERS_RM- += sgtty.h 87@@ -250,6 +251,7 @@
88 endif 88 endif
89 HEADERS_RM-$(HAVE_SHARED) += dlfcn.h bits/dlfcn.h 89 HEADERS_RM-$(HAVE_SHARED) += dlfcn.h bits/dlfcn.h
90 HEADERS_RM-$(PTHREADS_DEBUG_SUPPORT) += thread_db.h 90 HEADERS_RM-$(PTHREADS_DEBUG_SUPPORT) += thread_db.h
@@ -92,10 +92,10 @@ Index: git/Makefile.in
92 HEADERS_RM-$(UCLIBC_HAS_BSD_ERR) += err.h 92 HEADERS_RM-$(UCLIBC_HAS_BSD_ERR) += err.h
93 HEADERS_RM-$(UCLIBC_HAS_CRYPT) += crypt.h 93 HEADERS_RM-$(UCLIBC_HAS_CRYPT) += crypt.h
94 HEADERS_RM-$(UCLIBC_HAS_EPOLL) += sys/epoll.h 94 HEADERS_RM-$(UCLIBC_HAS_EPOLL) += sys/epoll.h
95@@ -340,6 +342,12 @@ ifeq ($(UCLIBC_HAS_BACKTRACE),y) 95@@ -368,6 +370,12 @@
96 echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ 96 -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
97 fi
98 endif 97 endif
98 echo "$(UBACKTRACE_ASNEEDED)" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so
99+ifeq ($(UCLIBC_HAS_ARGP),y) 99+ifeq ($(UCLIBC_HAS_ARGP),y)
100+# Add the AS_NEEDED entry for libuargp.so 100+# Add the AS_NEEDED entry for libuargp.so
101+ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ 101+ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
@@ -107,9 +107,9 @@ Index: git/Makefile.in
107 ifeq ($(HARDWIRED_ABSPATH),y) 107 ifeq ($(HARDWIRED_ABSPATH),y)
108Index: git/Makerules 108Index: git/Makerules
109=================================================================== 109===================================================================
110--- git.orig/Makerules 110--- git.orig/Makerules 2012-06-18 13:10:12.000000000 -0700
111+++ git/Makerules 111+++ git/Makerules 2012-06-18 13:10:44.052825547 -0700
112@@ -32,12 +32,12 @@ shared_objs = $(libc-y:.o=.os) $(libc-sh 112@@ -32,12 +32,12 @@
113 $(libpthread-so-y) $(libpthread-nonshared-y) $(libthread_db-so-y) \ 113 $(libpthread-so-y) $(libpthread-nonshared-y) $(libthread_db-so-y) \
114 $(libresolv-so-y) $(librt-so-y) \ 114 $(libresolv-so-y) $(librt-so-y) \
115 $(ldso-y) \ 115 $(ldso-y) \
@@ -124,7 +124,7 @@ Index: git/Makerules
124 ifeq ($(DOPIC),y) 124 ifeq ($(DOPIC),y)
125 ar_objs := $(ar_objs:.o=.os) 125 ar_objs := $(ar_objs:.o=.os)
126 endif 126 endif
127@@ -464,7 +464,7 @@ files.dep := $(libc-a-y) $(libc-so-y) $( 127@@ -472,7 +472,7 @@
128 $(librt-a-y) $(librt-so-y) $(libresolv-a-y) $(libresolv-so-y) \ 128 $(librt-a-y) $(librt-so-y) $(libresolv-a-y) $(libresolv-so-y) \
129 $(libcrypt-a-y) $(libcrypt-so-y) $(libutil-a-y) $(libutil-so-y) \ 129 $(libcrypt-a-y) $(libcrypt-so-y) $(libutil-a-y) $(libutil-so-y) \
130 $(libnsl-a-y) $(libnsl-so-y) $(ldso-y) $(libdl-a-y) $(libdl-so-y) \ 130 $(libnsl-a-y) $(libnsl-so-y) $(ldso-y) $(libdl-a-y) $(libdl-so-y) \
@@ -135,9 +135,9 @@ Index: git/Makerules
135 $(patsubst %.o,%.o.dep,$(filter %.o,$(files.dep))) \ 135 $(patsubst %.o,%.o.dep,$(filter %.o,$(files.dep))) \
136Index: git/Rules.mak 136Index: git/Rules.mak
137=================================================================== 137===================================================================
138--- git.orig/Rules.mak 138--- git.orig/Rules.mak 2012-06-18 13:10:12.000000000 -0700
139+++ git/Rules.mak 139+++ git/Rules.mak 2012-06-18 13:10:44.056825544 -0700
140@@ -525,6 +525,13 @@ export UBACKTRACE_ASNEEDED:=$(shell $(LD 140@@ -589,6 +589,13 @@
141 else 141 else
142 export UBACKTRACE_ASNEEDED:="" 142 export UBACKTRACE_ASNEEDED:=""
143 endif 143 endif
@@ -153,9 +153,9 @@ Index: git/Rules.mak
153 # Add a bunch of extra pedantic annoyingly strict checks 153 # Add a bunch of extra pedantic annoyingly strict checks
154Index: git/extra/Configs/Config.in 154Index: git/extra/Configs/Config.in
155=================================================================== 155===================================================================
156--- git.orig/extra/Configs/Config.in 156--- git.orig/extra/Configs/Config.in 2012-06-18 13:10:12.000000000 -0700
157+++ git/extra/Configs/Config.in 157+++ git/extra/Configs/Config.in 2012-06-18 13:10:44.056825544 -0700
158@@ -1814,6 +1814,23 @@ config UCLIBC_HAS_GNU_GETSUBOPT 158@@ -1853,6 +1853,23 @@
159 smaller SUSv3 compatible getsubopt(). 159 smaller SUSv3 compatible getsubopt().
160 160
161 Most people will answer Y. 161 Most people will answer Y.
@@ -181,8 +181,8 @@ Index: git/extra/Configs/Config.in
181 181
182Index: git/libc/sysdeps/linux/common/bits/getopt_int.h 182Index: git/libc/sysdeps/linux/common/bits/getopt_int.h
183=================================================================== 183===================================================================
184--- /dev/null 184--- /dev/null 1970-01-01 00:00:00.000000000 +0000
185+++ git/libc/sysdeps/linux/common/bits/getopt_int.h 185+++ git/libc/sysdeps/linux/common/bits/getopt_int.h 2012-06-18 13:10:44.056825544 -0700
186@@ -0,0 +1,136 @@ 186@@ -0,0 +1,136 @@
187+/* Internal declarations for getopt. 187+/* Internal declarations for getopt.
188+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 188+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -322,9 +322,9 @@ Index: git/libc/sysdeps/linux/common/bits/getopt_int.h
322+#endif /* getopt_int.h */ 322+#endif /* getopt_int.h */
323Index: git/libc/unistd/getopt.c 323Index: git/libc/unistd/getopt.c
324=================================================================== 324===================================================================
325--- git.orig/libc/unistd/getopt.c 325--- git.orig/libc/unistd/getopt.c 2012-06-18 13:10:12.000000000 -0700
326+++ git/libc/unistd/getopt.c 326+++ git/libc/unistd/getopt.c 2012-06-18 13:10:44.056825544 -0700
327@@ -119,7 +119,7 @@ 327@@ -106,7 +106,7 @@
328 they can distinguish the relative order of options and other arguments. */ 328 they can distinguish the relative order of options and other arguments. */
329 329
330 #include <getopt.h> 330 #include <getopt.h>
@@ -333,7 +333,7 @@ Index: git/libc/unistd/getopt.c
333 333
334 334
335 /* For communication from `getopt' to the caller. 335 /* For communication from `getopt' to the caller.
336@@ -1183,6 +1183,15 @@ getopt_long (int argc, char *const *argv 336@@ -1170,6 +1170,15 @@
337 return _getopt_internal (argc, argv, options, long_options, opt_index, 0); 337 return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
338 } 338 }
339 339
@@ -349,7 +349,7 @@ Index: git/libc/unistd/getopt.c
349 /* Like getopt_long, but '-' as well as '--' can indicate a long option. 349 /* Like getopt_long, but '-' as well as '--' can indicate a long option.
350 If an option that starts with '-' (not '--') doesn't match a long option, 350 If an option that starts with '-' (not '--') doesn't match a long option,
351 but does match a short option, it is parsed as a short option 351 but does match a short option, it is parsed as a short option
352@@ -1195,4 +1204,12 @@ getopt_long_only (int argc, char *const 352@@ -1182,4 +1191,12 @@
353 return _getopt_internal (argc, argv, options, long_options, opt_index, 1); 353 return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
354 } 354 }
355 355
@@ -364,8 +364,8 @@ Index: git/libc/unistd/getopt.c
364 #endif /* Not ELIDE_CODE. */ 364 #endif /* Not ELIDE_CODE. */
365Index: git/libuargp/Makefile 365Index: git/libuargp/Makefile
366=================================================================== 366===================================================================
367--- /dev/null 367--- /dev/null 1970-01-01 00:00:00.000000000 +0000
368+++ git/libuargp/Makefile 368+++ git/libuargp/Makefile 2012-06-18 13:10:44.056825544 -0700
369@@ -0,0 +1,14 @@ 369@@ -0,0 +1,14 @@
370+# Makefile for uClibc (libuargp) 370+# Makefile for uClibc (libuargp)
371+# 371+#
@@ -383,8 +383,8 @@ Index: git/libuargp/Makefile
383+include $(top_srcdir)Makerules 383+include $(top_srcdir)Makerules
384Index: git/libuargp/Makefile.in 384Index: git/libuargp/Makefile.in
385=================================================================== 385===================================================================
386--- /dev/null 386--- /dev/null 1970-01-01 00:00:00.000000000 +0000
387+++ git/libuargp/Makefile.in 387+++ git/libuargp/Makefile.in 2012-06-18 13:10:44.056825544 -0700
388@@ -0,0 +1,73 @@ 388@@ -0,0 +1,73 @@
389+# Makefile for uClibc (libuargp) 389+# Makefile for uClibc (libuargp)
390+# 390+#
@@ -461,8 +461,8 @@ Index: git/libuargp/Makefile.in
461+ $(do_rm) $(addprefix $(libuargp_OUT)/*., o os oS a) 461+ $(do_rm) $(addprefix $(libuargp_OUT)/*., o os oS a)
462Index: git/libuargp/argp-ba.c 462Index: git/libuargp/argp-ba.c
463=================================================================== 463===================================================================
464--- /dev/null 464--- /dev/null 1970-01-01 00:00:00.000000000 +0000
465+++ git/libuargp/argp-ba.c 465+++ git/libuargp/argp-ba.c 2012-06-18 13:10:44.056825544 -0700
466@@ -0,0 +1,26 @@ 466@@ -0,0 +1,26 @@
467+/* Default definition for ARGP_PROGRAM_BUG_ADDRESS. 467+/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
468+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. 468+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
@@ -492,8 +492,8 @@ Index: git/libuargp/argp-ba.c
492+const char *argp_program_bug_address; 492+const char *argp_program_bug_address;
493Index: git/libuargp/argp-eexst.c 493Index: git/libuargp/argp-eexst.c
494=================================================================== 494===================================================================
495--- /dev/null 495--- /dev/null 1970-01-01 00:00:00.000000000 +0000
496+++ git/libuargp/argp-eexst.c 496+++ git/libuargp/argp-eexst.c 2012-06-18 13:10:44.056825544 -0700
497@@ -0,0 +1,32 @@ 497@@ -0,0 +1,32 @@
498+/* Default definition for ARGP_ERR_EXIT_STATUS 498+/* Default definition for ARGP_ERR_EXIT_STATUS
499+ Copyright (C) 1997 Free Software Foundation, Inc. 499+ Copyright (C) 1997 Free Software Foundation, Inc.
@@ -529,8 +529,8 @@ Index: git/libuargp/argp-eexst.c
529+error_t argp_err_exit_status = EX_USAGE; 529+error_t argp_err_exit_status = EX_USAGE;
530Index: git/libuargp/argp-fmtstream.c 530Index: git/libuargp/argp-fmtstream.c
531=================================================================== 531===================================================================
532--- /dev/null 532--- /dev/null 1970-01-01 00:00:00.000000000 +0000
533+++ git/libuargp/argp-fmtstream.c 533+++ git/libuargp/argp-fmtstream.c 2012-06-18 13:10:44.056825544 -0700
534@@ -0,0 +1,439 @@ 534@@ -0,0 +1,439 @@
535+/* Word-wrapping and line-truncating streams 535+/* Word-wrapping and line-truncating streams
536+ Copyright (C) 1997-1999,2001,2002,2003,2005 Free Software Foundation, Inc. 536+ Copyright (C) 1997-1999,2001,2002,2003,2005 Free Software Foundation, Inc.
@@ -973,8 +973,8 @@ Index: git/libuargp/argp-fmtstream.c
973+#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ 973+#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
974Index: git/libuargp/argp-fmtstream.h 974Index: git/libuargp/argp-fmtstream.h
975=================================================================== 975===================================================================
976--- /dev/null 976--- /dev/null 1970-01-01 00:00:00.000000000 +0000
977+++ git/libuargp/argp-fmtstream.h 977+++ git/libuargp/argp-fmtstream.h 2012-06-18 13:10:44.056825544 -0700
978@@ -0,0 +1,314 @@ 978@@ -0,0 +1,314 @@
979+/* Word-wrapping and line-truncating streams. 979+/* Word-wrapping and line-truncating streams.
980+ Copyright (C) 1997 Free Software Foundation, Inc. 980+ Copyright (C) 1997 Free Software Foundation, Inc.
@@ -1292,8 +1292,8 @@ Index: git/libuargp/argp-fmtstream.h
1292+#endif /* argp-fmtstream.h */ 1292+#endif /* argp-fmtstream.h */
1293Index: git/libuargp/argp-fs-xinl.c 1293Index: git/libuargp/argp-fs-xinl.c
1294=================================================================== 1294===================================================================
1295--- /dev/null 1295--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1296+++ git/libuargp/argp-fs-xinl.c 1296+++ git/libuargp/argp-fs-xinl.c 2012-06-18 13:10:44.056825544 -0700
1297@@ -0,0 +1,44 @@ 1297@@ -0,0 +1,44 @@
1298+/* Real definitions for extern inline functions in argp-fmtstream.h 1298+/* Real definitions for extern inline functions in argp-fmtstream.h
1299+ Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc. 1299+ Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
@@ -1341,8 +1341,8 @@ Index: git/libuargp/argp-fs-xinl.c
1341+#endif 1341+#endif
1342Index: git/libuargp/argp-help.c 1342Index: git/libuargp/argp-help.c
1343=================================================================== 1343===================================================================
1344--- /dev/null 1344--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1345+++ git/libuargp/argp-help.c 1345+++ git/libuargp/argp-help.c 2012-06-18 13:10:44.060825542 -0700
1346@@ -0,0 +1,1882 @@ 1346@@ -0,0 +1,1882 @@
1347+/* Hierarchial argument parsing help output 1347+/* Hierarchial argument parsing help output
1348+ Copyright (C) 1995-2003, 2004, 2005, 2006, 2007 1348+ Copyright (C) 1995-2003, 2004, 2005, 2006, 2007
@@ -3228,8 +3228,8 @@ Index: git/libuargp/argp-help.c
3228+} 3228+}
3229Index: git/libuargp/argp-parse.c 3229Index: git/libuargp/argp-parse.c
3230=================================================================== 3230===================================================================
3231--- /dev/null 3231--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3232+++ git/libuargp/argp-parse.c 3232+++ git/libuargp/argp-parse.c 2012-06-18 13:10:44.060825542 -0700
3233@@ -0,0 +1,949 @@ 3233@@ -0,0 +1,949 @@
3234+/* Hierarchial argument parsing, layered over getopt 3234+/* Hierarchial argument parsing, layered over getopt
3235+ Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc. 3235+ Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -4182,8 +4182,8 @@ Index: git/libuargp/argp-parse.c
4182+} 4182+}
4183Index: git/libuargp/argp-pv.c 4183Index: git/libuargp/argp-pv.c
4184=================================================================== 4184===================================================================
4185--- /dev/null 4185--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4186+++ git/libuargp/argp-pv.c 4186+++ git/libuargp/argp-pv.c 2012-06-18 13:10:44.060825542 -0700
4187@@ -0,0 +1,25 @@ 4187@@ -0,0 +1,25 @@
4188+/* Default definition for ARGP_PROGRAM_VERSION. 4188+/* Default definition for ARGP_PROGRAM_VERSION.
4189+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. 4189+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
@@ -4212,8 +4212,8 @@ Index: git/libuargp/argp-pv.c
4212+const char *argp_program_version; 4212+const char *argp_program_version;
4213Index: git/libuargp/argp-pvh.c 4213Index: git/libuargp/argp-pvh.c
4214=================================================================== 4214===================================================================
4215--- /dev/null 4215--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4216+++ git/libuargp/argp-pvh.c 4216+++ git/libuargp/argp-pvh.c 2012-06-18 13:10:44.060825542 -0700
4217@@ -0,0 +1,32 @@ 4217@@ -0,0 +1,32 @@
4218+/* Default definition for ARGP_PROGRAM_VERSION_HOOK. 4218+/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
4219+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. 4219+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
@@ -4249,8 +4249,8 @@ Index: git/libuargp/argp-pvh.c
4249+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state); 4249+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
4250Index: git/libuargp/argp-xinl.c 4250Index: git/libuargp/argp-xinl.c
4251=================================================================== 4251===================================================================
4252--- /dev/null 4252--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4253+++ git/libuargp/argp-xinl.c 4253+++ git/libuargp/argp-xinl.c 2012-06-18 13:10:44.060825542 -0700
4254@@ -0,0 +1,35 @@ 4254@@ -0,0 +1,35 @@
4255+/* Real definitions for extern inline functions in argp.h 4255+/* Real definitions for extern inline functions in argp.h
4256+ Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc. 4256+ Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc.
@@ -4289,8 +4289,8 @@ Index: git/libuargp/argp-xinl.c
4289+#include <argp.h> 4289+#include <argp.h>
4290Index: git/test/argp/Makefile 4290Index: git/test/argp/Makefile
4291=================================================================== 4291===================================================================
4292--- /dev/null 4292--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4293+++ git/test/argp/Makefile 4293+++ git/test/argp/Makefile 2012-06-18 13:10:44.060825542 -0700
4294@@ -0,0 +1,7 @@ 4294@@ -0,0 +1,7 @@
4295+# uClibc argp tests 4295+# uClibc argp tests
4296+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. 4296+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
@@ -4301,8 +4301,8 @@ Index: git/test/argp/Makefile
4301+include ../Test.mak 4301+include ../Test.mak
4302Index: git/test/argp/Makefile.in 4302Index: git/test/argp/Makefile.in
4303=================================================================== 4303===================================================================
4304--- /dev/null 4304--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4305+++ git/test/argp/Makefile.in 4305+++ git/test/argp/Makefile.in 2012-06-18 13:10:44.060825542 -0700
4306@@ -0,0 +1,12 @@ 4306@@ -0,0 +1,12 @@
4307+# uClibc argp tests 4307+# uClibc argp tests
4308+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. 4308+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
@@ -4318,8 +4318,8 @@ Index: git/test/argp/Makefile.in
4318+ 4318+
4319Index: git/test/argp/argp-ex1.c 4319Index: git/test/argp/argp-ex1.c
4320=================================================================== 4320===================================================================
4321--- /dev/null 4321--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4322+++ git/test/argp/argp-ex1.c 4322+++ git/test/argp/argp-ex1.c 2012-06-18 13:10:44.060825542 -0700
4323@@ -0,0 +1,15 @@ 4323@@ -0,0 +1,15 @@
4324+/* Argp example #1 -- a minimal program using argp */ 4324+/* Argp example #1 -- a minimal program using argp */
4325+ 4325+
@@ -4338,8 +4338,8 @@ Index: git/test/argp/argp-ex1.c
4338+} 4338+}
4339Index: git/test/argp/argp-ex2.c 4339Index: git/test/argp/argp-ex2.c
4340=================================================================== 4340===================================================================
4341--- /dev/null 4341--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4342+++ git/test/argp/argp-ex2.c 4342+++ git/test/argp/argp-ex2.c 2012-06-18 13:10:44.060825542 -0700
4343@@ -0,0 +1,45 @@ 4343@@ -0,0 +1,45 @@
4344+/* Argp example #2 -- a pretty minimal program using argp */ 4344+/* Argp example #2 -- a pretty minimal program using argp */
4345+ 4345+
@@ -4388,8 +4388,8 @@ Index: git/test/argp/argp-ex2.c
4388+} 4388+}
4389Index: git/test/argp/argp-ex3.c 4389Index: git/test/argp/argp-ex3.c
4390=================================================================== 4390===================================================================
4391--- /dev/null 4391--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4392+++ git/test/argp/argp-ex3.c 4392+++ git/test/argp/argp-ex3.c 2012-06-18 13:10:44.060825542 -0700
4393@@ -0,0 +1,153 @@ 4393@@ -0,0 +1,153 @@
4394+/* Argp example #3 -- a program with options and arguments using argp */ 4394+/* Argp example #3 -- a program with options and arguments using argp */
4395+ 4395+
@@ -4546,8 +4546,8 @@ Index: git/test/argp/argp-ex3.c
4546+} 4546+}
4547Index: git/test/argp/argp-ex4.c 4547Index: git/test/argp/argp-ex4.c
4548=================================================================== 4548===================================================================
4549--- /dev/null 4549--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4550+++ git/test/argp/argp-ex4.c 4550+++ git/test/argp/argp-ex4.c 2012-06-18 13:10:44.060825542 -0700
4551@@ -0,0 +1,167 @@ 4551@@ -0,0 +1,167 @@
4552+/* Argp example #4 -- a program with somewhat more complicated options */ 4552+/* Argp example #4 -- a program with somewhat more complicated options */
4553+ 4553+
@@ -4718,8 +4718,8 @@ Index: git/test/argp/argp-ex4.c
4718+} 4718+}
4719Index: git/test/argp/argp-test.c 4719Index: git/test/argp/argp-test.c
4720=================================================================== 4720===================================================================
4721--- /dev/null 4721--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4722+++ git/test/argp/argp-test.c 4722+++ git/test/argp/argp-test.c 2012-06-18 13:10:44.060825542 -0700
4723@@ -0,0 +1,209 @@ 4723@@ -0,0 +1,209 @@
4724+/* Test program for argp argument parser 4724+/* Test program for argp argument parser
4725+ Copyright (C) 1997 Free Software Foundation, Inc. 4725+ Copyright (C) 1997 Free Software Foundation, Inc.
@@ -4932,8 +4932,8 @@ Index: git/test/argp/argp-test.c
4932+} 4932+}
4933Index: git/test/argp/bug-argp1.c 4933Index: git/test/argp/bug-argp1.c
4934=================================================================== 4934===================================================================
4935--- /dev/null 4935--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4936+++ git/test/argp/bug-argp1.c 4936+++ git/test/argp/bug-argp1.c 2012-06-18 13:10:44.060825542 -0700
4937@@ -0,0 +1,26 @@ 4937@@ -0,0 +1,26 @@
4938+#include <argp.h> 4938+#include <argp.h>
4939+ 4939+
@@ -4963,8 +4963,8 @@ Index: git/test/argp/bug-argp1.c
4963+#include "../test-skeleton.c" 4963+#include "../test-skeleton.c"
4964Index: git/test/argp/tst-argp1.c 4964Index: git/test/argp/tst-argp1.c
4965=================================================================== 4965===================================================================
4966--- /dev/null 4966--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4967+++ git/test/argp/tst-argp1.c 4967+++ git/test/argp/tst-argp1.c 2012-06-18 13:10:44.060825542 -0700
4968@@ -0,0 +1,118 @@ 4968@@ -0,0 +1,118 @@
4969+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. 4969+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
4970+ This file is part of the GNU C Library. 4970+ This file is part of the GNU C Library.
@@ -5086,8 +5086,8 @@ Index: git/test/argp/tst-argp1.c
5086+#include "../test-skeleton.c" 5086+#include "../test-skeleton.c"
5087Index: git/test/argp/tst-argp2.c 5087Index: git/test/argp/tst-argp2.c
5088=================================================================== 5088===================================================================
5089--- /dev/null 5089--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5090+++ git/test/argp/tst-argp2.c 5090+++ git/test/argp/tst-argp2.c 2012-06-18 13:10:44.064825538 -0700
5091@@ -0,0 +1,101 @@ 5091@@ -0,0 +1,101 @@
5092+/* Copyright (C) 2007 Free Software Foundation, Inc. 5092+/* Copyright (C) 2007 Free Software Foundation, Inc.
5093+ This file is part of the GNU C Library. 5093+ This file is part of the GNU C Library.
diff --git a/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch b/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
deleted file mode 100644
index d44accadbb..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1resolver code should always be in arm mode
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6
7Index: uClibc/ldso/ldso/arm/resolve.S
8===================================================================
9--- uClibc.orig/ldso/ldso/arm/resolve.S 2009-03-20 12:03:32.000000000 -0700
10+++ uClibc/ldso/ldso/arm/resolve.S 2009-03-20 12:04:23.000000000 -0700
11@@ -97,7 +97,6 @@
12
13 .text
14 .align 4 @ 16 byte boundary and there are 32 bytes below (arm case)
15- #if !defined(__thumb__) || defined(__thumb2__)
16 .arm
17 .globl _dl_linux_resolve
18 .type _dl_linux_resolve,%function
19@@ -129,7 +128,7 @@
20 #else
21 mov pc,ip
22 #endif
23-#else
24+#if 0
25 @ In the thumb case _dl_linux_resolver is thumb. If a bl is used
26 @ from arm code the linker will insert a stub call which, with
27 @ binutils 2.16, is not PIC. Since this code is accessed by an
diff --git a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch b/meta/recipes-core/uclibc/uclibc-git/orign_path.patch
index c9c15a34b7..81bb8f8459 100644
--- a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/orign_path.patch
@@ -5,9 +5,9 @@ Upstream-Status: Pending
5 5
6Index: git/ldso/ldso/dl-elf.c 6Index: git/ldso/ldso/dl-elf.c
7=================================================================== 7===================================================================
8--- git.orig/ldso/ldso/dl-elf.c 2012-01-23 19:18:58.000000000 -0800 8--- git.orig/ldso/ldso/dl-elf.c 2012-06-19 18:29:08.629931662 -0700
9+++ git/ldso/ldso/dl-elf.c 2012-01-23 21:52:06.144646590 -0800 9+++ git/ldso/ldso/dl-elf.c 2012-06-19 21:21:14.798431393 -0700
10@@ -133,53 +133,60 @@ 10@@ -133,56 +133,60 @@
11 * in uClibc/ldso/util/ldd.c */ 11 * in uClibc/ldso/util/ldd.c */
12 static struct elf_resolve * 12 static struct elf_resolve *
13 search_for_named_library(const char *name, unsigned rflags, const char *path_list, 13 search_for_named_library(const char *name, unsigned rflags, const char *path_list,
@@ -16,9 +16,9 @@ Index: git/ldso/ldso/dl-elf.c
16 { 16 {
17- char *path, *path_n, *mylibname; 17- char *path, *path_n, *mylibname;
18+ char *mylibname; 18+ char *mylibname;
19+ const char *p, *pn;
20 struct elf_resolve *tpnt; 19 struct elf_resolve *tpnt;
21- int done; 20- int done;
21+ const char *p, *pn;
22+ int plen; 22+ int plen;
23 23
24 if (path_list==NULL) 24 if (path_list==NULL)
@@ -82,24 +82,25 @@ Index: git/ldso/ldso/dl-elf.c
82- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */ 82- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
83- _dl_strcat(mylibname, "/"); 83- _dl_strcat(mylibname, "/");
84- _dl_strcat(mylibname, name); 84- _dl_strcat(mylibname, name);
85- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL) 85+ _dl_strcat(mylibname, "/");
86- return tpnt; 86+ _dl_strcat(mylibname, name);
87 #ifdef __LDSO_SAFE_RUNPATH__
88- if (*mylibname == '/')
89+ if (*mylibname == '/')
90 #endif
91- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
92- return tpnt;
87- path_n = path+1; 93- path_n = path+1;
88- } 94- }
89- path++; 95- path++;
90- } while (!done); 96- } while (!done);
91+ _dl_strcat(mylibname, "/"); 97+ if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
92+ _dl_strcat(mylibname, name);
93+
94+ tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname);
95+ if (tpnt != NULL)
96+ return tpnt; 98+ return tpnt;
97+ } 99+ }
98+
99 return NULL; 100 return NULL;
100 } 101 }
101 102
102@@ -231,8 +238,10 @@ 103@@ -234,8 +238,10 @@
103 if (pnt) { 104 if (pnt) {
104 pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; 105 pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
105 _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt); 106 _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
@@ -111,7 +112,7 @@ Index: git/ldso/ldso/dl-elf.c
111 } 112 }
112 #endif 113 #endif
113 114
114@@ -240,7 +249,7 @@ 115@@ -243,7 +249,7 @@
115 /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */ 116 /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
116 if (_dl_library_path) { 117 if (_dl_library_path) {
117 _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path); 118 _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
@@ -120,7 +121,7 @@ Index: git/ldso/ldso/dl-elf.c
120 { 121 {
121 return tpnt1; 122 return tpnt1;
122 } 123 }
123@@ -254,7 +263,7 @@ 124@@ -257,7 +263,7 @@
124 if (pnt) { 125 if (pnt) {
125 pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; 126 pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
126 _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt); 127 _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
@@ -129,7 +130,7 @@ Index: git/ldso/ldso/dl-elf.c
129 return tpnt1; 130 return tpnt1;
130 } 131 }
131 #endif 132 #endif
132@@ -288,7 +297,7 @@ 133@@ -291,7 +297,7 @@
133 /* Look for libraries wherever the shared library loader 134 /* Look for libraries wherever the shared library loader
134 * was installed */ 135 * was installed */
135 _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath); 136 _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
@@ -138,7 +139,7 @@ Index: git/ldso/ldso/dl-elf.c
138 if (tpnt1 != NULL) 139 if (tpnt1 != NULL)
139 return tpnt1; 140 return tpnt1;
140 #endif 141 #endif
141@@ -301,7 +310,7 @@ 142@@ -304,7 +310,7 @@
142 #ifndef __LDSO_CACHE_SUPPORT__ 143 #ifndef __LDSO_CACHE_SUPPORT__
143 ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" 144 ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
144 #endif 145 #endif
@@ -149,9 +150,9 @@ Index: git/ldso/ldso/dl-elf.c
149 150
150Index: git/ldso/ldso/ldso.c 151Index: git/ldso/ldso/ldso.c
151=================================================================== 152===================================================================
152--- git.orig/ldso/ldso/ldso.c 2012-01-23 19:18:58.000000000 -0800 153--- git.orig/ldso/ldso/ldso.c 2012-06-19 18:29:08.633931663 -0700
153+++ git/ldso/ldso/ldso.c 2012-01-23 21:34:11.152594621 -0800 154+++ git/ldso/ldso/ldso.c 2012-06-19 18:29:10.197931738 -0700
154@@ -407,6 +407,20 @@ 155@@ -403,6 +403,20 @@
155 return p - list; 156 return p - list;
156 } 157 }
157 158
@@ -172,7 +173,7 @@ Index: git/ldso/ldso/ldso.c
172 void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, 173 void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
173 ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv 174 ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
174 DL_GET_READY_TO_RUN_EXTRA_PARMS) 175 DL_GET_READY_TO_RUN_EXTRA_PARMS)
175@@ -458,9 +472,7 @@ 176@@ -454,9 +468,7 @@
176 * been fixed up by now. Still no function calls outside of this 177 * been fixed up by now. Still no function calls outside of this
177 * library, since the dynamic resolver is not yet ready. 178 * library, since the dynamic resolver is not yet ready.
178 */ 179 */
@@ -181,5 +182,5 @@ Index: git/ldso/ldso/ldso.c
181- } 182- }
182+ _dl_setup_progname(argv[0]); 183+ _dl_setup_progname(argv[0]);
183 184
184 #ifndef __LDSO_STANDALONE_SUPPORT__ 185 #ifdef __DSBT__
185 if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) { 186 _dl_ldso_dsbt = (void *)tpnt->dynamic_info[DT_DSBT_BASE_IDX];
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index 33f155fb14..1744c48752 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -1,4 +1,4 @@
1SRCREV="e118373cbb58ba5ffa5fb6670957678d5b87cdb9" 1SRCREV="0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a"
2 2
3require uclibc.inc 3require uclibc.inc
4 4
@@ -15,7 +15,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
15 file://uClibc.machine \ 15 file://uClibc.machine \
16 file://uClibc.distro \ 16 file://uClibc.distro \
17 file://uclibc_enable_log2_test.patch \ 17 file://uclibc_enable_log2_test.patch \
18 file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
19 file://powerpc_copysignl.patch \ 18 file://powerpc_copysignl.patch \
20 file://argp-support.patch \ 19 file://argp-support.patch \
21 file://argp-headers.patch \ 20 file://argp-headers.patch \