projects / packages / dietlibc.git / blame
| Commit | Line | Data |
|---|---|---|
| 813b77ce JB |
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 | |
| f2923a80 | 3 | @@ -146,22 +146,32 @@ |
| 458e4119 JB |
4 | else if (!strncmp(shortplatform, "pentium3", 8)) strcpy(shortplatform, "i386"); |
| 5 | else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386"); | |
| 6 | else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64"); | |
| 7 | + if (!strncmp(shortplatform, "x86_64", 6) && (m==32)) strcpy(shortplatform, "i386"); | |
| 813b77ce | 8 | + else if (!strncmp(shortplatform, "i386", 4) && (m==64)) strcpy(shortplatform, "x86_64"); |
| 458e4119 JB |
9 | + else if (!strncmp(shortplatform, "sparc64", 7) && (m==32)) strcpy(shortplatform, "sparc"); |
| 10 | + else if (!strncmp(shortplatform, "sparc", 5) && (m==64)) strcpy(shortplatform, "sparc64"); | |
| f2923a80 | 11 | + else if (!strncmp(shortplatform, "sparcv9", 7) && (m==32)) strcpy(shortplatform, "sparc"); |
| 12 | + else if (!strncmp(shortplatform, "sparcv9", 7) && (m==64)) strcpy(shortplatform, "sparc64"); | |
| 458e4119 JB |
13 | + else if (!strncmp(shortplatform, "ppc64", 5) && (m==32)) strcpy(shortplatform, "ppc"); |
| 14 | + else if (!strncmp(shortplatform, "ppc", 3) && (m==64)) strcpy(shortplatform, "ppc64"); | |
| 15 | + else if (!strncmp(shortplatform, "s390x", 5) && (m==32)) strcpy(shortplatform, "s390"); | |
| 16 | + else if (!strncmp(shortplatform, "s390", 4) && (m==64)) strcpy(shortplatform, "s390x"); | |
| 17 | } else { | |
| 18 | #ifdef __sparc__ | |
| 19 | #ifdef __arch64__ | |
| 20 | - shortplatform="sparc64"; | |
| 21 | + shortplatform=(m==32?"sparc":"sparc64"); | |
| 22 | #else | |
| 813b77ce JB |
23 | - shortplatform="sparc"; |
| 24 | + shortplatform=(m==64?"sparc64":"sparc"); | |
| 458e4119 | 25 | #endif |
| 813b77ce JB |
26 | #endif |
| 27 | #ifdef __powerpc__ | |
| 28 | - shortplatform="ppc"; | |
| 29 | + shortplatform=(m==64?"ppc64":"ppc"); | |
| 458e4119 JB |
30 | #endif |
| 31 | #ifdef __powerpc64__ | |
| 32 | - shortplatform="ppc64"; | |
| 33 | + shortplatform=(m==32?"ppc":"ppc64"); | |
| 34 | #endif | |
| 35 | #ifdef __i386__ | |
| 813b77ce JB |
36 | - shortplatform="i386"; |
| 37 | + shortplatform=(m==64?"x86_64":"i386"); | |
| 38 | #endif | |
| 39 | #ifdef __alpha__ | |
| 40 | shortplatform="alpha"; | |
| 41 | @@ -173,10 +181,10 @@ | |
| 458e4119 JB |
42 | shortplatform="mips"; |
| 43 | #endif | |
| 44 | #ifdef __s390x__ | |
| 45 | - shortplatform="s390x"; | |
| 46 | + shortplatform=(m==32?"s390":"s390x"); | |
| 47 | #else | |
| 48 | #ifdef __s390__ | |
| 813b77ce JB |
49 | - shortplatform="s390"; |
| 50 | + shortplatform=(m==64?"s390x":"s390"); | |
| 51 | #endif | |
| 52 | #endif | |
| 53 | #ifdef __sh__ |