- more -m{32,64} handling in diet wrapper

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

diff --git a/dietlibc-diet-m.patch b/dietlibc-diet-m.patch
new file mode 100644 (file)
index 0000000..faf95ab
--- /dev/null
+++ b/dietlibc-diet-m.patch
@@ -0,0 +1,39 @@
+--- dietlibc-0.30/diet.c.orig  2006-12-30 22:29:01.483043000 +0100
++++ dietlibc-0.30/diet.c       2006-12-30 22:51:22.719475784 +0100
+@@ -146,10 +146,17 @@
+       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, "sparc64", 7) && (m==32)) strcpy(shortplatform, "sparc");
++      else if (!strncmp(shortplatform, "sparc", 5) && (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");
++      else if (!strncmp(shortplatform, "s390", 4) && (m==64)) strcpy(shortplatform, "s390x");
+     } else {
+ #ifdef __sparc__
+ #ifdef __arch64__
+-      shortplatform="sparc64";
++      shortplatform=(m==32?"sparc":"sparc64");
+ #else
+       shortplatform="sparc";
+ #endif
+@@ -158,7 +165,7 @@
+       shortplatform="ppc";
+ #endif
+ #ifdef __powerpc64__
+-      shortplatform="ppc64";
++      shortplatform=(m==32?"ppc":"ppc64");
+ #endif
+ #ifdef __i386__
+       shortplatform="i386";
+@@ -173,7 +180,7 @@
+       shortplatform="mips";
+ #endif
+ #ifdef __s390x__
+-      shortplatform="s390x";
++      shortplatform=(m==32?"s390":"s390x");
+ #else
+ #ifdef __s390__
+       shortplatform="s390";