summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-22 05:04:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-22 15:56:20 (GMT)
commit74ec9ba5730dabaf3ec3e9e69a694dd57081f7dc (patch)
tree782467e8130b61c6a58423123874b67a3bc2c1d8
parentbd10a6d257ab5ce2fc961788c278af7c43637404 (diff)
downloadpoky-74ec9ba5730dabaf3ec3e9e69a694dd57081f7dc.tar.gz
uclibc-git: Upgrades to latest git
Drop upstream accepted patches (From OE-Core rev: b4ee580d37d15e699dd6efc6551f4c7f8e902e2a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/uclibc/uclibc-git.inc5
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch78
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch30
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch25
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/dup3.patch37
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch83
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch16
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch95
8 files changed, 89 insertions, 280 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 4da9c58..ed9b5fd 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,4 +1,4 @@
1SRCREV="cb43f2afba0633400387fa7c55dda3396517f58a" 1SRCREV="9591091f150e8a86c47efbea5def21fa67fffb07"
2 2
3DEFAULT_PREFERENCE = "-1" 3DEFAULT_PREFERENCE = "-1"
4 4
@@ -18,14 +18,11 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
18 file://compile-arm-fork-with-O2.patch \ 18 file://compile-arm-fork-with-O2.patch \
19 file://uclibc-execvpe.patch \ 19 file://uclibc-execvpe.patch \
20 file://orign_path.patch \ 20 file://orign_path.patch \
21 file://dup3.patch \
22 file://define-MSG_CMSG_CLOEXEC.patch \
23 file://posix_fallocate.patch \ 21 file://posix_fallocate.patch \
24 file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \ 22 file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \
25 file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \ 23 file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \
26 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ 24 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
27 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \ 25 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
28 file://mount.h-update.patch \
29 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ 26 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
30 " 27 "
31S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
index 8c202ac..4ac765c 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
@@ -13,18 +13,18 @@ This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18.
13 libc/misc/utmp/wtent.c | 14 ++------- 13 libc/misc/utmp/wtent.c | 14 ++-------
14 4 files changed, 30 insertions(+), 76 deletions(-) 14 4 files changed, 30 insertions(+), 76 deletions(-)
15 15
16diff --git a/include/utmp.h b/include/utmp.h 16Index: git/include/utmp.h
17index cb8e08f..10b75c9 100644 17===================================================================
18--- a/include/utmp.h 18--- git.orig/include/utmp.h 2013-01-21 16:37:18.000000000 -0800
19+++ b/include/utmp.h 19+++ git/include/utmp.h 2013-01-21 16:40:56.987583099 -0800
20@@ -57,29 +57,37 @@ extern void logwtmp (__const char *__ut_line, __const char *__ut_name, 20@@ -56,30 +56,37 @@
21 /* Append entry UTMP to the wtmp-like file WTMP_FILE. */ 21 /* Append entry UTMP to the wtmp-like file WTMP_FILE. */
22 extern void updwtmp (__const char *__wtmp_file, __const struct utmp *__utmp) 22 extern void updwtmp (const char *__wtmp_file, const struct utmp *__utmp)
23 __THROW; 23 __THROW;
24+libc_hidden_proto(updwtmp) 24+libc_hidden_proto(updwtmp)
25 25
26 /* Change name of the utmp file to be examined. */ 26 /* Change name of the utmp file to be examined. */
27 extern int utmpname (__const char *__file) __THROW; 27 extern int utmpname (const char *__file) __THROW;
28+libc_hidden_proto(utmpname) 28+libc_hidden_proto(utmpname)
29 29
30 /* Read next entry from a utmp-like file. */ 30 /* Read next entry from a utmp-like file. */
@@ -41,24 +41,25 @@ index cb8e08f..10b75c9 100644
41 41
42 /* Search forward from the current point in the utmp file until the 42 /* Search forward from the current point in the utmp file until the
43 next entry with a ut_type matching ID->ut_type. */ 43 next entry with a ut_type matching ID->ut_type. */
44 extern struct utmp *getutid (__const struct utmp *__id) __THROW; 44 extern struct utmp *getutid (const struct utmp *__id) __THROW;
45+libc_hidden_proto(getutid) 45+libc_hidden_proto(getutid)
46 46
47 /* Search forward from the current point in the utmp file until the 47 /* Search forward from the current point in the utmp file until the
48 next entry with a ut_line matching LINE->ut_line. */ 48 next entry with a ut_line matching LINE->ut_line. */
49 extern struct utmp *getutline (__const struct utmp *__line) __THROW; 49 extern struct utmp *getutline (const struct utmp *__line) __THROW;
50+libc_hidden_proto(getutline) 50+libc_hidden_proto(getutline)
51 51
52 /* Write out entry pointed to by UTMP_PTR into the utmp file. */ 52 /* Write out entry pointed to by UTMP_PTR into the utmp file. */
53 extern struct utmp *pututline (__const struct utmp *__utmp_ptr) __THROW; 53 extern struct utmp *pututline (const struct utmp *__utmp_ptr) __THROW;
54-
54+libc_hidden_proto(pututline) 55+libc_hidden_proto(pututline)
55 56
56
57 #if 0 /* def __USE_MISC */ 57 #if 0 /* def __USE_MISC */
58diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c 58 /* Reentrant versions of the file for handling utmp files. */
59index a35bb2b..07ca44e 100644 59Index: git/libc/misc/utmp/utent.c
60--- a/libc/misc/utmp/utent.c 60===================================================================
61+++ b/libc/misc/utmp/utent.c 61--- git.orig/libc/misc/utmp/utent.c 2013-01-21 16:37:18.000000000 -0800
62+++ git/libc/misc/utmp/utent.c 2013-01-21 16:38:14.035578638 -0800
62@@ -19,9 +19,6 @@ 63@@ -19,9 +19,6 @@
63 #include <errno.h> 64 #include <errno.h>
64 #include <string.h> 65 #include <string.h>
@@ -69,7 +70,7 @@ index a35bb2b..07ca44e 100644
69 #include <not-cancel.h> 70 #include <not-cancel.h>
70 71
71 #include <bits/uClibc_mutex.h> 72 #include <bits/uClibc_mutex.h>
72@@ -34,7 +31,7 @@ static const char default_file_name[] = _PATH_UTMP; 73@@ -34,7 +31,7 @@
73 static const char *static_ut_name = default_file_name; 74 static const char *static_ut_name = default_file_name;
74 75
75 /* This function must be called with the LOCK held */ 76 /* This function must be called with the LOCK held */
@@ -78,7 +79,7 @@ index a35bb2b..07ca44e 100644
78 { 79 {
79 if (static_fd < 0) { 80 if (static_fd < 0) {
80 static_fd = open_not_cancel_2(static_ut_name, O_RDWR | O_CLOEXEC); 81 static_fd = open_not_cancel_2(static_ut_name, O_RDWR | O_CLOEXEC);
81@@ -53,24 +50,19 @@ static void __setutent_unlocked(void) 82@@ -53,24 +50,19 @@
82 lseek(static_fd, 0, SEEK_SET); 83 lseek(static_fd, 0, SEEK_SET);
83 } 84 }
84 #if defined __UCLIBC_HAS_THREADS__ 85 #if defined __UCLIBC_HAS_THREADS__
@@ -107,7 +108,7 @@ index a35bb2b..07ca44e 100644
107 { 108 {
108 if (static_fd < 0) { 109 if (static_fd < 0) {
109 __setutent(); 110 __setutent();
110@@ -86,27 +78,19 @@ static struct utmp *__getutent_unlocked(void) 111@@ -86,27 +78,19 @@
111 return NULL; 112 return NULL;
112 } 113 }
113 #if defined __UCLIBC_HAS_THREADS__ 114 #if defined __UCLIBC_HAS_THREADS__
@@ -138,7 +139,7 @@ index a35bb2b..07ca44e 100644
138 139
139 static void __endutent(void) 140 static void __endutent(void)
140 { 141 {
141@@ -117,13 +101,10 @@ static void __endutent(void) 142@@ -117,13 +101,10 @@
142 __UCLIBC_MUTEX_UNLOCK(utmplock); 143 __UCLIBC_MUTEX_UNLOCK(utmplock);
143 } 144 }
144 strong_alias(__endutent,endutent) 145 strong_alias(__endutent,endutent)
@@ -154,7 +155,7 @@ index a35bb2b..07ca44e 100644
154 { 155 {
155 struct utmp *lutmp; 156 struct utmp *lutmp;
156 unsigned type; 157 unsigned type;
157@@ -133,7 +114,7 @@ static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) 158@@ -133,7 +114,7 @@
158 type = utmp_entry->ut_type - 1; 159 type = utmp_entry->ut_type - 1;
159 type /= 4; 160 type /= 4;
160 161
@@ -163,7 +164,7 @@ index a35bb2b..07ca44e 100644
163 if (type == 0 && lutmp->ut_type == utmp_entry->ut_type) { 164 if (type == 0 && lutmp->ut_type == utmp_entry->ut_type) {
164 /* one of RUN_LVL, BOOT_TIME, NEW_TIME, OLD_TIME */ 165 /* one of RUN_LVL, BOOT_TIME, NEW_TIME, OLD_TIME */
165 return lutmp; 166 return lutmp;
166@@ -147,34 +128,26 @@ static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) 167@@ -147,34 +128,26 @@
167 return NULL; 168 return NULL;
168 } 169 }
169 #if defined __UCLIBC_HAS_THREADS__ 170 #if defined __UCLIBC_HAS_THREADS__
@@ -202,7 +203,7 @@ index a35bb2b..07ca44e 100644
202 if (lutmp->ut_type == USER_PROCESS || lutmp->ut_type == LOGIN_PROCESS) { 203 if (lutmp->ut_type == USER_PROCESS || lutmp->ut_type == LOGIN_PROCESS) {
203 if (strncmp(lutmp->ut_line, utmp_entry->ut_line, sizeof(lutmp->ut_line)) == 0) { 204 if (strncmp(lutmp->ut_line, utmp_entry->ut_line, sizeof(lutmp->ut_line)) == 0) {
204 break; 205 break;
205@@ -185,13 +158,7 @@ static struct utmp *__getutline(const struct utmp *utmp_entry) 206@@ -185,13 +158,7 @@
206 return lutmp; 207 return lutmp;
207 } 208 }
208 strong_alias(__getutline,getutline) 209 strong_alias(__getutline,getutline)
@@ -217,7 +218,7 @@ index a35bb2b..07ca44e 100644
217 218
218 static struct utmp *__pututline(const struct utmp *utmp_entry) 219 static struct utmp *__pututline(const struct utmp *utmp_entry)
219 { 220 {
220@@ -200,7 +167,7 @@ static struct utmp *__pututline(const struct utmp *utmp_entry) 221@@ -200,7 +167,7 @@
221 the file pointer where they want it, everything will work out. */ 222 the file pointer where they want it, everything will work out. */
222 lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); 223 lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
223 224
@@ -226,7 +227,7 @@ index a35bb2b..07ca44e 100644
226 lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); 227 lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
227 else 228 else
228 lseek(static_fd, (off_t) 0, SEEK_END); 229 lseek(static_fd, (off_t) 0, SEEK_END);
229@@ -211,13 +178,7 @@ static struct utmp *__pututline(const struct utmp *utmp_entry) 230@@ -211,13 +178,7 @@
230 return (struct utmp *)utmp_entry; 231 return (struct utmp *)utmp_entry;
231 } 232 }
232 strong_alias(__pututline,pututline) 233 strong_alias(__pututline,pututline)
@@ -241,7 +242,7 @@ index a35bb2b..07ca44e 100644
241 242
242 static int __utmpname(const char *new_ut_name) 243 static int __utmpname(const char *new_ut_name)
243 { 244 {
244@@ -241,7 +202,4 @@ static int __utmpname(const char *new_ut_name) 245@@ -241,7 +202,4 @@
245 return 0; /* or maybe return -(static_ut_name != new_ut_name)? */ 246 return 0; /* or maybe return -(static_ut_name != new_ut_name)? */
246 } 247 }
247 strong_alias(__utmpname,utmpname) 248 strong_alias(__utmpname,utmpname)
@@ -250,10 +251,10 @@ index a35bb2b..07ca44e 100644
250-strong_alias(__utmpname,utmpxname) 251-strong_alias(__utmpname,utmpxname)
251-#endif 252-#endif
252+libc_hidden_def(utmpname) 253+libc_hidden_def(utmpname)
253diff --git a/libc/misc/utmp/utxent.c b/libc/misc/utmp/utxent.c 254Index: git/libc/misc/utmp/utxent.c
254index 71157cc..a0e80a6 100644 255===================================================================
255--- a/libc/misc/utmp/utxent.c 256--- git.orig/libc/misc/utmp/utxent.c 2013-01-21 16:37:18.000000000 -0800
256+++ b/libc/misc/utmp/utxent.c 257+++ git/libc/misc/utmp/utxent.c 2013-01-21 16:38:14.035578638 -0800
257@@ -13,7 +13,6 @@ 258@@ -13,7 +13,6 @@
258 #include <utmpx.h> 259 #include <utmpx.h>
259 #include <utmp.h> 260 #include <utmp.h>
@@ -262,7 +263,7 @@ index 71157cc..a0e80a6 100644
262 void setutxent(void) 263 void setutxent(void)
263 { 264 {
264 setutent (); 265 setutent ();
265@@ -49,12 +48,10 @@ int utmpxname (const char *new_ut_name) 266@@ -49,12 +48,10 @@
266 return utmpname (new_ut_name); 267 return utmpname (new_ut_name);
267 } 268 }
268 269
@@ -275,15 +276,15 @@ index 71157cc..a0e80a6 100644
275 276
276 /* Copy the information in UTMPX to UTMP. */ 277 /* Copy the information in UTMPX to UTMP. */
277 void getutmp (const struct utmpx *utmpx, struct utmp *utmp) 278 void getutmp (const struct utmpx *utmpx, struct utmp *utmp)
278@@ -107,3 +104,4 @@ void getutmpx (const struct utmp *utmp, struct utmpx *utmpx) 279@@ -107,3 +104,4 @@
279 utmpx->ut_time = utmp->ut_time; 280 utmpx->ut_time = utmp->ut_time;
280 #endif 281 #endif
281 } 282 }
282+ 283+
283diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c 284Index: git/libc/misc/utmp/wtent.c
284index 9b3ad50..b5e4ee5 100644 285===================================================================
285--- a/libc/misc/utmp/wtent.c 286--- git.orig/libc/misc/utmp/wtent.c 2013-01-21 16:37:18.000000000 -0800
286+++ b/libc/misc/utmp/wtent.c 287+++ git/libc/misc/utmp/wtent.c 2013-01-21 16:38:14.035578638 -0800
287@@ -11,9 +11,6 @@ 288@@ -11,9 +11,6 @@
288 #include <time.h> 289 #include <time.h>
289 #include <unistd.h> 290 #include <unistd.h>
@@ -294,7 +295,7 @@ index 9b3ad50..b5e4ee5 100644
294 #include <fcntl.h> 295 #include <fcntl.h>
295 #include <sys/file.h> 296 #include <sys/file.h>
296 #include <not-cancel.h> 297 #include <not-cancel.h>
297@@ -36,7 +33,7 @@ void logwtmp (const char *line, const char *name, const char *host) 298@@ -36,7 +33,7 @@
298 } 299 }
299 #endif 300 #endif
300 301
@@ -303,7 +304,7 @@ index 9b3ad50..b5e4ee5 100644
303 { 304 {
304 int fd; 305 int fd;
305 306
306@@ -49,11 +46,4 @@ static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp) 307@@ -49,11 +46,4 @@
307 } 308 }
308 } 309 }
309 } 310 }
@@ -316,6 +317,3 @@ index 9b3ad50..b5e4ee5 100644
316-} 317-}
317-#endif 318-#endif
318+libc_hidden_def(updwtmp) 319+libc_hidden_def(updwtmp)
319--
3201.7.9.5
321
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
index bf6f2c8..407beb6 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
@@ -11,21 +11,19 @@ Upstream-Status: Pending
11 libc/sysdeps/linux/arm/Makefile.arch | 4 +++- 11 libc/sysdeps/linux/arm/Makefile.arch | 4 +++-
12 1 file changed, 3 insertions(+), 1 deletion(-) 12 1 file changed, 3 insertions(+), 1 deletion(-)
13 13
14diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch 14Index: git/libc/sysdeps/linux/arm/Makefile.arch
15index 5fc3e54..8285b9b 100644 15===================================================================
16--- a/libc/sysdeps/linux/arm/Makefile.arch 16--- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2013-01-21 16:29:25.000000000 -0800
17+++ b/libc/sysdeps/linux/arm/Makefile.arch 17+++ git/libc/sysdeps/linux/arm/Makefile.arch 2013-01-21 16:33:11.575571091 -0800
18@@ -13,7 +13,9 @@ SSRC := \ 18@@ -12,7 +12,10 @@
19 bsd-_setjmp.S sigrestorer.S mmap64.S \
19 vfork.S clone.S 20 vfork.S clone.S
20 21
21 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) 22-SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-aeabi_read_tp.S libc-thumb_atomics.S
22-SSRC += libc-aeabi_read_tp.S libc-thumb_atomics.S 23+SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S
23+SSRC += libc-thumb_atomics.S 24+libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os
24+libc-nonshared-y += $(ARCH_OUT)/libc-aeabi_read_tp.os 25+libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o
25+libc-static-y += $(ARCH_OUT)/libc-aeabi_read_tp.o 26+
26 endif 27 CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c
27 28 CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c
28 ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y) 29 SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S
29--
301.7.9.5
31
diff --git a/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch b/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch
deleted file mode 100644
index 4e900f3..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
2
3Upstream-Status: Pending
4
5Index: git/libc/sysdeps/linux/common/bits/socket.h
6===================================================================
7--- git.orig/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:23:21.537456132 -0800
8+++ git/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:25:10.125461388 -0800
9@@ -235,8 +235,15 @@
10 #define MSG_ERRQUEUE MSG_ERRQUEUE
11 MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */
12 #define MSG_NOSIGNAL MSG_NOSIGNAL
13- MSG_MORE = 0x8000 /* Sender will send more. */
14+ MSG_MORE = 0x8000, /* Sender will send more. */
15 #define MSG_MORE MSG_MORE
16+ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
17+#define MSG_WAITFORONE MSG_WAITFORONE
18+
19+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
20+ descriptor received through
21+ SCM_RIGHTS. */
22+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
23 };
24
25
diff --git a/meta/recipes-core/uclibc/uclibc-git/dup3.patch b/meta/recipes-core/uclibc/uclibc-git/dup3.patch
deleted file mode 100644
index 481f23b..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/dup3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Implement dup3()
2
3Upstream-Status: Pending
4
5Index: git/libc/sysdeps/linux/common/dup3.c
6===================================================================
7--- /dev/null 1970-01-01 00:00:00.000000000 +0000
8+++ git/libc/sysdeps/linux/common/dup3.c 2012-01-27 07:40:52.802900849 -0800
9@@ -0,0 +1,15 @@
10+/* vi: set sw=4 ts=4: */
11+/*
12+ * dup3() for uClibc
13+ *
14+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
15+ *
16+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
17+ */
18+
19+#include <sys/syscall.h>
20+#include <unistd.h>
21+
22+
23+_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
24+libc_hidden_def(dup3)
25Index: git/include/unistd.h
26===================================================================
27--- git.orig/include/unistd.h 2012-01-27 01:19:17.521792781 -0800
28+++ git/include/unistd.h 2012-01-27 07:40:03.106898447 -0800
29@@ -512,6 +512,8 @@
30 /* Duplicate FD to FD2, closing FD2 and making it open on the same file. */
31 extern int dup2 (int __fd, int __fd2) __THROW;
32 libc_hidden_proto(dup2)
33+extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
34+libc_hidden_proto(dup3)
35
36 /* NULL-terminated array of "NAME=VALUE" environment variables. */
37 extern char **__environ;
diff --git a/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
deleted file mode 100644
index 41a410c..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
+++ /dev/null
@@ -1,83 +0,0 @@
1Signed-off-by: Khem Raj <raj.khem@gmail.com>
2Upstream-Status: Pending
3
4sync mount.h with glibc
5
6Index: git/include/sys/mount.h
7===================================================================
8--- git.orig/include/sys/mount.h 2012-08-23 21:26:51.038825295 -0700
9+++ git/include/sys/mount.h 2012-08-23 21:27:09.914826014 -0700
10@@ -1,5 +1,5 @@
11 /* Header file for mounting/unmount Linux filesystems.
12- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
13+ Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc.
14 This file is part of the GNU C Library.
15
16 The GNU C Library is free software; you can redistribute it and/or
17@@ -47,23 +47,46 @@
18 #define MS_REMOUNT MS_REMOUNT
19 MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
20 #define MS_MANDLOCK MS_MANDLOCK
21- S_WRITE = 128, /* Write on file/directory/symlink. */
22-#define S_WRITE S_WRITE
23- S_APPEND = 256, /* Append-only file. */
24-#define S_APPEND S_APPEND
25- S_IMMUTABLE = 512, /* Immutable file. */
26-#define S_IMMUTABLE S_IMMUTABLE
27+ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
28+#define MS_DIRSYNC MS_DIRSYNC
29 MS_NOATIME = 1024, /* Do not update access times. */
30 #define MS_NOATIME MS_NOATIME
31 MS_NODIRATIME = 2048, /* Do not update directory access times. */
32 #define MS_NODIRATIME MS_NODIRATIME
33 MS_BIND = 4096, /* Bind directory at different place. */
34 #define MS_BIND MS_BIND
35+ MS_MOVE = 8192,
36+#define MS_MOVE MS_MOVE
37+ MS_REC = 16384,
38+#define MS_REC MS_REC
39+ MS_SILENT = 32768,
40+#define MS_SILENT MS_SILENT
41+ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
42+#define MS_POSIXACL MS_POSIXACL
43+ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
44+#define MS_UNBINDABLE MS_UNBINDABLE
45+ MS_PRIVATE = 1 << 18, /* Change to private. */
46+#define MS_PRIVATE MS_PRIVATE
47+ MS_SLAVE = 1 << 19, /* Change to slave. */
48+#define MS_SLAVE MS_SLAVE
49+ MS_SHARED = 1 << 20, /* Change to shared. */
50+#define MS_SHARED MS_SHARED
51+ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
52+#define MS_RELATIME MS_RELATIME
53+ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
54+#define MS_KERNMOUNT MS_KERNMOUNT
55+ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
56+#define MS_I_VERSION MS_I_VERSION
57+ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
58+#define MS_STRICTATIME MS_STRICTATIME
59+ MS_ACTIVE = 1 << 30,
60+#define MS_ACTIVE MS_ACTIVE
61+ MS_NOUSER = 1 << 31
62+#define MS_NOUSER MS_NOUSER
63 };
64
65 /* Flags that can be altered by MS_REMOUNT */
66-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
67- |MS_NODIRATIME)
68+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
69
70
71 /* Magic mount flag number. Has to be or-ed to the flag values. */
72@@ -100,8 +123,10 @@
73 #define MNT_FORCE MNT_FORCE
74 MNT_DETACH = 2, /* Just detach from the tree. */
75 #define MNT_DETACH MNT_DETACH
76- MNT_EXPIRE = 4 /* Mark for expiry. */
77+ MNT_EXPIRE = 4, /* Mark for expiry. */
78 #define MNT_EXPIRE MNT_EXPIRE
79+ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
80+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
81 };
82
83
diff --git a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
index 3fa10af..ce58583 100644
--- a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
@@ -6,21 +6,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 6
7Index: git/libc/sysdeps/linux/powerpc/Makefile.arch 7Index: git/libc/sysdeps/linux/powerpc/Makefile.arch
8=================================================================== 8===================================================================
9--- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 9--- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:18:22.000000000 -0800
10+++ git/libc/sysdeps/linux/powerpc/Makefile.arch 10+++ git/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:21:25.363552429 -0800
11@@ -5,7 +5,7 @@ 11@@ -5,7 +5,7 @@
12 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. 12 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
13 # 13 #
14 14
15-CSRC := __syscall_error.c pread_write.c ioctl.c 15-CSRC-y := __syscall_error.c pread_write.c ioctl.c
16+CSRC := __syscall_error.c pread_write.c ioctl.c copysignl.c 16+CSRC-y := __syscall_error.c pread_write.c ioctl.c copysignl.c
17 17
18 ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y) 18 SSRC-y := \
19 CSRC += posix_fadvise.c posix_fadvise64.c 19 __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \
20Index: git/libc/sysdeps/linux/powerpc/copysignl.c 20Index: git/libc/sysdeps/linux/powerpc/copysignl.c
21=================================================================== 21===================================================================
22--- /dev/null 22--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23+++ git/libc/sysdeps/linux/powerpc/copysignl.c 23+++ git/libc/sysdeps/linux/powerpc/copysignl.c 2013-01-21 16:20:46.807552554 -0800
24@@ -0,0 +1,89 @@ 24@@ -0,0 +1,89 @@
25+/* s_copysignl.c -- long double version of s_copysign.c. 25+/* s_copysignl.c -- long double version of s_copysign.c.
26+ * Conversion to long double by Ulrich Drepper, 26+ * Conversion to long double by Ulrich Drepper,
diff --git a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
index bee251c..d2a8a81 100644
--- a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
@@ -5,9 +5,9 @@ Upstream-Status: Pending
5 5
6Index: git/libpthread/nptl/pthread_mutex_timedlock.c 6Index: git/libpthread/nptl/pthread_mutex_timedlock.c
7=================================================================== 7===================================================================
8--- git.orig/libpthread/nptl/pthread_mutex_timedlock.c 8--- git.orig/libpthread/nptl/pthread_mutex_timedlock.c 2013-01-21 16:22:20.000000000 -0800
9+++ git/libpthread/nptl/pthread_mutex_timedlock.c 9+++ git/libpthread/nptl/pthread_mutex_timedlock.c 2013-01-21 16:24:12.275557670 -0800
10@@ -29,7 +29,9 @@ 10@@ -28,7 +28,9 @@
11 * error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ 11 * error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’
12 */ 12 */
13 int 13 int
@@ -19,9 +19,9 @@ Index: git/libpthread/nptl/pthread_mutex_timedlock.c
19 const struct timespec *abstime) 19 const struct timespec *abstime)
20Index: git/libc/sysdeps/linux/powerpc/bits/mathinline.h 20Index: git/libc/sysdeps/linux/powerpc/bits/mathinline.h
21=================================================================== 21===================================================================
22--- git.orig/libc/sysdeps/linux/powerpc/bits/mathinline.h 22--- git.orig/libc/sysdeps/linux/powerpc/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
23+++ git/libc/sysdeps/linux/powerpc/bits/mathinline.h 23+++ git/libc/sysdeps/linux/powerpc/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800
24@@ -27,7 +27,7 @@ 24@@ -26,7 +26,7 @@
25 #ifdef __cplusplus 25 #ifdef __cplusplus
26 # define __MATH_INLINE __inline 26 # define __MATH_INLINE __inline
27 #else 27 #else
@@ -32,9 +32,9 @@ Index: git/libc/sysdeps/linux/powerpc/bits/mathinline.h
32 #if defined __GNUC__ && !defined _SOFT_FLOAT 32 #if defined __GNUC__ && !defined _SOFT_FLOAT
33Index: git/libc/sysdeps/linux/alpha/bits/mathinline.h 33Index: git/libc/sysdeps/linux/alpha/bits/mathinline.h
34=================================================================== 34===================================================================
35--- git.orig/libc/sysdeps/linux/alpha/bits/mathinline.h 35--- git.orig/libc/sysdeps/linux/alpha/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
36+++ git/libc/sysdeps/linux/alpha/bits/mathinline.h 36+++ git/libc/sysdeps/linux/alpha/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800
37@@ -25,7 +25,7 @@ 37@@ -24,7 +24,7 @@
38 #ifdef __cplusplus 38 #ifdef __cplusplus
39 # define __MATH_INLINE __inline 39 # define __MATH_INLINE __inline
40 #else 40 #else
@@ -43,24 +43,11 @@ Index: git/libc/sysdeps/linux/alpha/bits/mathinline.h
43 #endif 43 #endif
44 44
45 #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) 45 #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0)
46Index: git/libc/sysdeps/linux/common/bits/socket.h
47===================================================================
48--- git.orig/libc/sysdeps/linux/common/bits/socket.h
49+++ git/libc/sysdeps/linux/common/bits/socket.h
50@@ -302,7 +302,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st
51 libc_hidden_proto(__cmsg_nxthdr)
52 #ifdef __USE_EXTERN_INLINES
53 # ifndef _EXTERN_INLINE
54-# define _EXTERN_INLINE extern __inline
55+# define _EXTERN_INLINE __extern_inline
56 # endif
57 _EXTERN_INLINE struct cmsghdr *
58 __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
59Index: git/libc/sysdeps/linux/i386/bits/mathinline.h 46Index: git/libc/sysdeps/linux/i386/bits/mathinline.h
60=================================================================== 47===================================================================
61--- git.orig/libc/sysdeps/linux/i386/bits/mathinline.h 48--- git.orig/libc/sysdeps/linux/i386/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
62+++ git/libc/sysdeps/linux/i386/bits/mathinline.h 49+++ git/libc/sysdeps/linux/i386/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800
63@@ -26,7 +26,7 @@ 50@@ -25,7 +25,7 @@
64 #ifdef __cplusplus 51 #ifdef __cplusplus
65 # define __MATH_INLINE __inline 52 # define __MATH_INLINE __inline
66 #else 53 #else
@@ -71,9 +58,9 @@ Index: git/libc/sysdeps/linux/i386/bits/mathinline.h
71 58
72Index: git/libc/sysdeps/linux/ia64/bits/mathinline.h 59Index: git/libc/sysdeps/linux/ia64/bits/mathinline.h
73=================================================================== 60===================================================================
74--- git.orig/libc/sysdeps/linux/ia64/bits/mathinline.h 61--- git.orig/libc/sysdeps/linux/ia64/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
75+++ git/libc/sysdeps/linux/ia64/bits/mathinline.h 62+++ git/libc/sysdeps/linux/ia64/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800
76@@ -24,7 +24,7 @@ 63@@ -23,7 +23,7 @@
77 #ifdef __cplusplus 64 #ifdef __cplusplus
78 # define __MATH_INLINE __inline 65 # define __MATH_INLINE __inline
79 #else 66 #else
@@ -84,9 +71,9 @@ Index: git/libc/sysdeps/linux/ia64/bits/mathinline.h
84 #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2 71 #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2
85Index: git/libc/sysdeps/linux/m68k/bits/mathinline.h 72Index: git/libc/sysdeps/linux/m68k/bits/mathinline.h
86=================================================================== 73===================================================================
87--- git.orig/libc/sysdeps/linux/m68k/bits/mathinline.h 74--- git.orig/libc/sysdeps/linux/m68k/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
88+++ git/libc/sysdeps/linux/m68k/bits/mathinline.h 75+++ git/libc/sysdeps/linux/m68k/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800
89@@ -92,7 +92,7 @@ 76@@ -91,7 +91,7 @@
90 # ifdef __cplusplus 77 # ifdef __cplusplus
91 # define __m81_inline __inline 78 # define __m81_inline __inline
92 # else 79 # else
@@ -95,7 +82,7 @@ Index: git/libc/sysdeps/linux/m68k/bits/mathinline.h
95 # endif 82 # endif
96 # define __M81_MATH_INLINES 1 83 # define __M81_MATH_INLINES 1
97 #endif 84 #endif
98@@ -351,14 +351,14 @@ __inline_functions (long double,l) 85@@ -350,14 +350,14 @@
99 /* Note that there must be no whitespace before the argument passed for 86 /* Note that there must be no whitespace before the argument passed for
100 NAME, to make token pasting work correctly with -traditional. */ 87 NAME, to make token pasting work correctly with -traditional. */
101 # define __inline_forward_c(rettype, name, args1, args2) \ 88 # define __inline_forward_c(rettype, name, args1, args2) \
@@ -112,24 +99,11 @@ Index: git/libc/sysdeps/linux/m68k/bits/mathinline.h
112 { \ 99 { \
113 return __CONCAT(__,name) args2; \ 100 return __CONCAT(__,name) args2; \
114 } 101 }
115Index: git/libc/sysdeps/linux/mips/bits/socket.h
116===================================================================
117--- git.orig/libc/sysdeps/linux/mips/bits/socket.h
118+++ git/libc/sysdeps/linux/mips/bits/socket.h
119@@ -307,7 +307,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st
120 libc_hidden_proto(__cmsg_nxthdr)
121 #ifdef __USE_EXTERN_INLINES
122 # ifndef _EXTERN_INLINE
123-# define _EXTERN_INLINE extern __inline
124+# define _EXTERN_INLINE __extern_inline
125 # endif
126 _EXTERN_INLINE struct cmsghdr *
127 __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
128Index: git/libc/sysdeps/linux/mips/sys/tas.h 102Index: git/libc/sysdeps/linux/mips/sys/tas.h
129=================================================================== 103===================================================================
130--- git.orig/libc/sysdeps/linux/mips/sys/tas.h 104--- git.orig/libc/sysdeps/linux/mips/sys/tas.h 2013-01-21 16:22:20.000000000 -0800
131+++ git/libc/sysdeps/linux/mips/sys/tas.h 105+++ git/libc/sysdeps/linux/mips/sys/tas.h 2013-01-21 16:24:12.275557670 -0800
132@@ -30,7 +30,7 @@ extern int _test_and_set (int *p, int v) 106@@ -29,7 +29,7 @@
133 #ifdef __USE_EXTERN_INLINES 107 #ifdef __USE_EXTERN_INLINES
134 108
135 # ifndef _EXTERN_INLINE 109 # ifndef _EXTERN_INLINE
@@ -140,9 +114,9 @@ Index: git/libc/sysdeps/linux/mips/sys/tas.h
140 _EXTERN_INLINE int 114 _EXTERN_INLINE int
141Index: git/libc/sysdeps/linux/sparc/bits/mathinline.h 115Index: git/libc/sysdeps/linux/sparc/bits/mathinline.h
142=================================================================== 116===================================================================
143--- git.orig/libc/sysdeps/linux/sparc/bits/mathinline.h 117--- git.orig/libc/sysdeps/linux/sparc/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
144+++ git/libc/sysdeps/linux/sparc/bits/mathinline.h 118+++ git/libc/sysdeps/linux/sparc/bits/mathinline.h 2013-01-21 16:24:12.279557671 -0800
145@@ -131,7 +131,7 @@ 119@@ -130,7 +130,7 @@
146 # ifdef __cplusplus 120 # ifdef __cplusplus
147 # define __MATH_INLINE __inline 121 # define __MATH_INLINE __inline
148 # else 122 # else
@@ -151,24 +125,11 @@ Index: git/libc/sysdeps/linux/sparc/bits/mathinline.h
151 # endif /* __cplusplus */ 125 # endif /* __cplusplus */
152 126
153 /* The gcc, version 2.7 or below, has problems with all this inlining 127 /* The gcc, version 2.7 or below, has problems with all this inlining
154Index: git/libc/sysdeps/linux/sparc/bits/socket.h
155===================================================================
156--- git.orig/libc/sysdeps/linux/sparc/bits/socket.h
157+++ git/libc/sysdeps/linux/sparc/bits/socket.h
158@@ -292,7 +292,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st
159 libc_hidden_proto(__cmsg_nxthdr)
160 #ifdef __USE_EXTERN_INLINES
161 # ifndef _EXTERN_INLINE
162-# define _EXTERN_INLINE extern __inline
163+# define _EXTERN_INLINE __extern_inline
164 # endif
165 _EXTERN_INLINE struct cmsghdr *
166 __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
167Index: git/libc/sysdeps/linux/x86_64/bits/mathinline.h 128Index: git/libc/sysdeps/linux/x86_64/bits/mathinline.h
168=================================================================== 129===================================================================
169--- git.orig/libc/sysdeps/linux/x86_64/bits/mathinline.h 130--- git.orig/libc/sysdeps/linux/x86_64/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800
170+++ git/libc/sysdeps/linux/x86_64/bits/mathinline.h 131+++ git/libc/sysdeps/linux/x86_64/bits/mathinline.h 2013-01-21 16:24:12.279557671 -0800
171@@ -25,7 +25,7 @@ 132@@ -24,7 +24,7 @@
172 #ifdef __cplusplus 133 #ifdef __cplusplus
173 # define __MATH_INLINE __inline 134 # define __MATH_INLINE __inline
174 #else 135 #else