- simpler and more general

Changed files:
    dietlibc-diet-m.patch -> 1.4

diff --git a/dietlibc-diet-m.patch b/dietlibc-diet-m.patch
index 8d7fd4b79c947880ad959e8fa17f990d99bdf707..a4f6a399811abc67260f3522054af25c9f2bbc2d 100644 (file)
--- a/dietlibc-diet-m.patch
+++ b/dietlibc-diet-m.patch
@@ -1,15 +1,13 @@
 --- 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,32 @@
+@@ -146,22 +146,30 @@
        else if (!strncmp(shortplatform, "pentium3", 8)) strcpy(shortplatform, "i386");
        else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
        else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
 +      if (!strncmp(shortplatform, "x86_64", 6) && (m==32)) strcpy(shortplatform, "i386");
 +      else if (!strncmp(shortplatform, "i386", 4) && (m==64)) strcpy(shortplatform, "x86_64");
-+      else if (!strncmp(shortplatform, "sparc64", 7) && (m==32)) strcpy(shortplatform, "sparc");
++      else if (!strncmp(shortplatform, "sparc", 5) && (m==32)) strcpy(shortplatform, "sparc");
 +      else if (!strncmp(shortplatform, "sparc", 5) && (m==64)) strcpy(shortplatform, "sparc64");
-+      else if (!strncmp(shortplatform, "sparcv9", 7) && (m==32)) strcpy(shortplatform, "sparc");
-+      else if (!strncmp(shortplatform, "sparcv9", 7) && (m==64)) strcpy(shortplatform, "sparc64");
 +      else if (!strncmp(shortplatform, "ppc64", 5) && (m==32)) strcpy(shortplatform, "ppc");
 +      else if (!strncmp(shortplatform, "ppc", 3) && (m==64)) strcpy(shortplatform, "ppc64");
 +      else if (!strncmp(shortplatform, "s390x", 5) && (m==32)) strcpy(shortplatform, "s390");