dietlibc-diet-m.patch

   1 --- dietlibc-0.30/diet.c.orig   2006-12-31 12:01:17.000000000 +0000
   2 +++ dietlibc-0.30/diet.c        2006-12-31 12:02:59.000000000 +0000
   3 @@ -146,26 +146,34 @@
   4        else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
   5        else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
   6        else if (!strncmp(shortplatform, "sparcv", 6)) strcpy(shortplatform, "sparc");
   7 +      if (!strncmp(shortplatform, "x86_64", 6) && (m==32)) strcpy(shortplatform, "i386");
   8 +      else if (!strncmp(shortplatform, "i386", 4) && (m==64)) strcpy(shortplatform, "x86_64");
   9 +      else if (!strncmp(shortplatform, "sparc64", 7) && (m==32)) strcpy(shortplatform, "sparc");
  10 +      else if (!strncmp(shortplatform, "sparc", 5) && (m==64)) strcpy(shortplatform, "sparc64");
  11 +      else if (!strncmp(shortplatform, "ppc64", 5) && (m==32)) strcpy(shortplatform, "ppc");
  12 +      else if (!strncmp(shortplatform, "ppc", 3) && (m==64)) strcpy(shortplatform, "ppc64");
  13 +      else if (!strncmp(shortplatform, "s390x", 5) && (m==32)) strcpy(shortplatform, "s390");
  14 +      else if (!strncmp(shortplatform, "s390", 4) && (m==64)) strcpy(shortplatform, "s390x");
  15        else if (strcmp(shortplatform, "powerpc") == 0)
  16          strcpy(shortplatform, "ppc");
  17        else if (strcmp(shortplatform, "powerpc64") == 0)
  18          strcpy(shortplatform, "ppc64");
  19      } else {
  20  #ifdef __sparc__
  21  #ifdef __arch64__
  22 -      shortplatform="sparc64";
  23 +      shortplatform=(m==32?"sparc":"sparc64");
  24  #else
  25 -      shortplatform="sparc";
  26 +      shortplatform=(m==64?"sparc64":"sparc");
  27  #endif
  28  #endif
  29  #ifdef __powerpc__
  30 -      shortplatform="ppc";
  31 +      shortplatform=(m==64?"ppc64":"ppc");
  32  #endif
  33  #ifdef __powerpc64__
  34 -      shortplatform="ppc64";
  35 +      shortplatform=(m==32?"ppc":"ppc64");
  36  #endif
  37  #ifdef __i386__
  38 -      shortplatform="i386";
  39 +      shortplatform=(m==64?"x86_64":"i386");
  40  #endif
  41  #ifdef __alpha__
  42        shortplatform="alpha";