- updated patches for git updates

diff --git a/dietlibc-arm.patch b/dietlibc-arm.patch
index 06cd19512d96e1734d25d4411b0c229767defb9b..a2d26f967810f32d484c59fd639f72488864431b 100644 (file)
--- a/dietlibc-arm.patch
+++ b/dietlibc-arm.patch
@@ -1,14 +1,3 @@
---- dietlibc-0.30/Makefile.orig        2006-10-06 12:20:29.533089750 +0200
-+++ dietlibc-0.30/Makefile     2006-10-06 12:20:50.878423750 +0200
-@@ -8,7 +8,7 @@
- BINDIR=${prefix}/bin
- MAN1DIR=${prefix}/man/man1
- 
--MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?[lb]/arm/')
-+MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?j\?[lb]/arm/')
- 
- # This extra-ugly cruft is here so make will not run uname and sed each
- # time it looks at $(OBJDIR).  This alone sped up running make when
 diff -Nur dietlibc-0.32.orig/libpthread/Makefile dietlibc-0.32/libpthread/Makefile
 --- dietlibc-0.32.orig/libpthread/Makefile     2003-08-18 13:32:52.000000000 -0400
 +++ dietlibc-0.32/libpthread/Makefile  2010-06-21 09:42:08.000000000 -0400
@@ -17,7 +6,7 @@ diff -Nur dietlibc-0.32.orig/libpthread/Makefile dietlibc-0.32/libpthread/Makefi
  M=$(shell ../findcflags.sh $(CC))
  
 -ARCH=$(shell uname -m | sed 's/i[4-9]86/i386/')
-+ARCH=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?j\?[lb]/arm/')
++ARCH=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-7]t\?[eh]\?j\?[lb]/arm/')
  
  CFLAGS= -g #-pipe -O -march=k6
  CFLAGS= -pipe

diff --git a/dietlibc-diet-m.patch b/dietlibc-diet-m.patch
index 9444d99c63c36ff4a066655fed962c582d82ecd1..515e71f91704d577beb81cd4a76115bdd915ee89 100644 (file)
--- a/dietlibc-diet-m.patch
+++ b/dietlibc-diet-m.patch
@@ -1,6 +1,6 @@
 --- dietlibc-0.30/diet.c.orig  2006-12-31 12:01:17.000000000 +0000
 +++ dietlibc-0.30/diet.c       2006-12-31 12:02:59.000000000 +0000
-@@ -146,22 +146,30 @@
+@@ -146,26 +146,34 @@
        else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
        else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
        else if (!strncmp(shortplatform, "sparcv", 6)) strcpy(shortplatform, "sparc");
@@ -12,6 +12,10 @@
 +      else if (!strncmp(shortplatform, "ppc", 3) && (m==64)) strcpy(shortplatform, "ppc64");
 +      else if (!strncmp(shortplatform, "s390x", 5) && (m==32)) strcpy(shortplatform, "s390");
 +      else if (!strncmp(shortplatform, "s390", 4) && (m==64)) strcpy(shortplatform, "s390x");
+       else if (strcmp(shortplatform, "powerpc") == 0)
+         strcpy(shortplatform, "ppc");
+       else if (strcmp(shortplatform, "powerpc64") == 0)
+         strcpy(shortplatform, "ppc64");
      } else {
  #ifdef __sparc__
  #ifdef __arch64__
@@ -36,16 +40,3 @@
  #endif
  #ifdef __alpha__
        shortplatform="alpha";
-@@ -173,10 +181,10 @@
-       shortplatform="mips";
- #endif
- #ifdef __s390x__
--      shortplatform="s390x";
-+      shortplatform=(m==32?"s390":"s390x");
- #else
- #ifdef __s390__
--      shortplatform="s390";
-+      shortplatform=(m==64?"s390x":"s390");
- #endif
- #endif
- #ifdef __sh__