Patchwork [2/6] uClibc: remove useless linuxthreads-errno-fix patch

login
register
mail settings
Submitter Thomas Petazzoni
Date Nov. 15, 2012, 1:53 p.m.
Message ID <898dc2c84add1fd58f43193bcfda39d64c0ae523.1352987586.git.thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/199288/
State Accepted
Headers show

Comments

Thomas Petazzoni - Nov. 15, 2012, 1:53 p.m.
This patch has since a long time been merged upstream in uClibc, so it
cannot apply on any of the recent uClibc snapshots.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../uClibc.snapshot.linuxthreads-errno-fix.patch   |   68 --------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
Peter Korsgaard - Nov. 15, 2012, 3:40 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> This patch has since a long time been merged upstream in uClibc, so it
 Thomas> cannot apply on any of the recent uClibc snapshots.

I like it how you call my patches useless :P

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  .../uClibc.snapshot.linuxthreads-errno-fix.patch   |   68 --------------------
 Thomas>  1 file changed, 68 deletions(-)
 Thomas>  delete mode 100644 toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch

 Thomas> diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
 Thomas> deleted file mode 100644
 Thomas> index c4d0d00..0000000
 Thomas> --- a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
 Thomas> +++ /dev/null
 Thomas> @@ -1,68 +0,0 @@
 Thomas> -From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
 Thomas> -From: Peter Korsgaard <jacmet@sunsite.dk>
 Thomas> -Date: Mon, 5 Jul 2010 14:08:17 +0200
 Thomas> -Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
Thomas Petazzoni - Nov. 15, 2012, 4:02 p.m.
On Thu, 15 Nov 2012 16:40:52 +0100, Peter Korsgaard wrote:
> >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> 
>  Thomas> This patch has since a long time been merged upstream in uClibc, so it
>  Thomas> cannot apply on any of the recent uClibc snapshots.
> 
> I like it how you call my patches useless :P

Sorry if the wording sounded rude. The patch has been merged upstream
since quite some time, so it has become useless as a separate patch in
Buildroot, but it certainly was useful since it got merged upstream.

Thomas

Patch

diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
deleted file mode 100644
index c4d0d00..0000000
--- a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@ 
-From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Mon, 5 Jul 2010 14:08:17 +0200
-Subject: [PATCH] don't make __errno_location / __h_errno_location hidden
-
-Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
-
-__errno_location / __h_errno_location access has to go through the PLT
-like malloc/free, so the linuxthread variants gets used instead when
-compiling with -pthread.
-
-Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/netdb.h                               |    1 -
- libc/misc/internals/__errno_location.c        |    3 ---
- libc/misc/internals/__h_errno_location.c      |    1 -
- libc/sysdeps/linux/common/bits/errno.h        |    1 -
- 6 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/include/netdb.h b/include/netdb.h
-index 9d3807d..ac411ab 100644
---- a/include/netdb.h
-+++ b/include/netdb.h
-@@ -59,7 +59,6 @@ __BEGIN_DECLS
- 
- /* Function to get address of global `h_errno' variable.  */
- extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__h_errno_location)
- 
- /* Macros for accessing h_errno from inside libc.  */
- #ifdef _LIBC
-diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
-index 487a9c2..0620860 100644
---- a/libc/misc/internals/__errno_location.c
-+++ b/libc/misc/internals/__errno_location.c
-@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void)
- {
-     return &errno;
- }
--#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */
--libc_hidden_weak(__errno_location)
--#endif
-diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
-index 213d398..235df4e 100644
---- a/libc/misc/internals/__h_errno_location.c
-+++ b/libc/misc/internals/__h_errno_location.c
-@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void)
- {
-     return &h_errno;
- }
--libc_hidden_weak(__h_errno_location)
-diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
-index 6e520fa..f4a9ebb 100644
---- a/libc/sysdeps/linux/common/bits/errno.h
-+++ b/libc/sysdeps/linux/common/bits/errno.h
-@@ -43,7 +43,6 @@
- # ifndef __ASSEMBLER__
- /* Function to get address of global `errno' variable.  */
- extern int *__errno_location (void) __THROW __attribute__ ((__const__));
--libc_hidden_proto(__errno_location)
- 
- #  ifdef __UCLIBC_HAS_THREADS__
- /* When using threads, errno is a per-thread value.  */
--- 
-1.7.1
-