From b0857d40f503a29f7cf1dd9bfab3f60e6b0152f6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 12 Aug 2013 16:27:02 +0200
Subject: update glibc to latest upstream

---
 toolchain/glibc/patches/gcc_eh.patch      | 18 -----------------
 toolchain/glibc/patches/glibc-cross.patch | 32 ++++++++++---------------------
 2 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 toolchain/glibc/patches/gcc_eh.patch

(limited to 'toolchain/glibc/patches')

diff --git a/toolchain/glibc/patches/gcc_eh.patch b/toolchain/glibc/patches/gcc_eh.patch
deleted file mode 100644
index 8c5f2a0bd..000000000
--- a/toolchain/glibc/patches/gcc_eh.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur glibc-2.16.0.orig/Makeconfig glibc-2.16.0/Makeconfig
---- glibc-2.16.0.orig/Makeconfig	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/Makeconfig	2012-09-28 20:11:14.000000000 +0200
-@@ -519,11 +519,11 @@
- ifneq ($(have-cc-with-libunwind),yes)
-   libunwind =
- else
--  libunwind = -lunwind
-+  libunwind =
- endif
--libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
-+libgcc_eh := -Wl,--as-needed $(libunwind) -Wl,--no-as-needed
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+static-gnulib := -lgcc $(libunwind)
- libc.so-gnulib := -lgcc
- endif
- +preinit = $(addprefix $(csu-objpfx),crti.o)
diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch
index f8e0c2416..dadd8641b 100644
--- a/toolchain/glibc/patches/glibc-cross.patch
+++ b/toolchain/glibc/patches/glibc-cross.patch
@@ -1,6 +1,6 @@
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h
---- glibc-2.16.0.orig/sunrpc/rpc/types.h	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc/types.h	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc/types.h glibc-2.17/sunrpc/rpc/types.h
+--- glibc-2.17.orig/sunrpc/rpc/types.h	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc/types.h	2013-08-12 14:59:35.000000000 +0200
 @@ -69,19 +69,25 @@
  #include <sys/types.h>
  #endif
@@ -39,21 +39,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h
  # define __daddr_t_defined
  #endif
  
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_clntout.c glibc-2.16.0/sunrpc/rpc_clntout.c
---- glibc-2.16.0.orig/sunrpc/rpc_clntout.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_clntout.c	2012-08-01 18:05:49.000000000 +0200
-@@ -31,7 +31,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--#include <rpc/types.h>
-+#include "rpc/types.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- #include "proto.h"
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
---- glibc-2.16.0.orig/sunrpc/rpc_main.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_main.c	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
+--- glibc-2.17.orig/sunrpc/rpc_main.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc_main.c	2013-08-12 14:59:37.000000000 +0200
 @@ -38,7 +38,11 @@
  #include <stdio.h>
  #include <string.h>
@@ -66,7 +54,7 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
  #include <ctype.h>
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -958,10 +962,12 @@
+@@ -954,10 +958,12 @@
  	abort ();
        temp = rindex (cmd->infile, '.');
        cp = stpcpy (mkfilename, "Makefile.");
@@ -82,9 +70,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
  
      }
    else
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_scan.c glibc-2.16.0/sunrpc/rpc_scan.c
---- glibc-2.16.0.orig/sunrpc/rpc_scan.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_scan.c	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc_scan.c glibc-2.17/sunrpc/rpc_scan.c
+--- glibc-2.17.orig/sunrpc/rpc_scan.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc_scan.c	2013-08-12 14:59:37.000000000 +0200
 @@ -37,7 +37,11 @@
  #include <stdio.h>
  #include <ctype.h>
-- 
cgit v1.2.3