- merged into common patch.

Changed files:
    dietlibc-amd64.patch -> 1.2
    dietlibc-athlon.patch -> 1.2
    dietlibc-pentiumX.patch -> 1.2
    dietlibc-platform.patch -> 1.1

diff --git a/dietlibc-amd64.patch b/dietlibc-amd64.patch
deleted file mode 100644 (file)
index ceb60da..0000000
--- a/dietlibc-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN -x '*~' dietlibc-0.24.orig/diet.c dietlibc-0.24/diet.c
---- dietlibc-0.24.orig/diet.c  2004-12-19 14:07:34.000000000 +0100
-+++ dietlibc-0.24/diet.c       2004-12-19 14:10:01.040058808 +0100
-@@ -120,6 +120,7 @@
-       platform[tmp2-cc+len]=0;
-       if (shortplatform[0]=='i' && shortplatform[2]=='8' && shortplatform[3]=='6') shortplatform[1]='3';
-       else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
-+      else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
-     } else {
- #ifdef __sparc__
- #ifdef __arch64__

diff --git a/dietlibc-athlon.patch b/dietlibc-athlon.patch
deleted file mode 100644 (file)
index c23dc2d..0000000
--- a/dietlibc-athlon.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dietlibc-0.23/diet.c.orig  2003-06-19 13:23:24.000000000 +0200
-+++ dietlibc-0.23/diet.c       2003-10-05 01:35:23.068808824 +0200
-@@ -117,6 +117,7 @@
-       memmove(shortplatform,argv[1],(size_t)(tmp2-cc));
-       platform[tmp2-cc+len]=0;
-       if (shortplatform[0]=='i' && shortplatform[2]=='8' && shortplatform[3]=='6') shortplatform[1]='3';
-+      else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
-     } else {
- #ifdef __sparc__
- #ifdef __arch64__

diff --git a/dietlibc-pentiumX.patch b/dietlibc-platform.patch
similarity index 51%
rename from dietlibc-pentiumX.patch
rename to dietlibc-platform.patch
index a28f1199d6e624da4b655e89a3a07b768501189c..55234ebf37b996da4c3ab0a107179c55050fa674 100644 (file)
--- a/dietlibc-pentiumX.patch
+++ b/dietlibc-platform.patch
@@ -1,11 +1,14 @@
---- dietlibc-0.25/diet.c.orig  2004-04-15 10:47:08.000000000 +0200
-+++ dietlibc-0.25/diet.c       2004-04-15 10:48:29.220804200 +0200
-@@ -119,6 +119,8 @@
+diff -uNrp dietlibc-0.29.orig/diet.c dietlibc-0.29/diet.c
+--- dietlibc-0.29.orig/diet.c  2005-05-18 16:38:55.000000000 +0200
++++ dietlibc-0.29/diet.c       2005-07-24 13:34:27.317983752 +0200
+@@ -142,6 +142,10 @@ int main(int argc,char *argv[]) {
        memmove(shortplatform,argv[1],(size_t)(tmp2-cc));
        platform[tmp2-cc+len]=0;
        if (shortplatform[0]=='i' && shortplatform[2]=='8' && shortplatform[3]=='6') shortplatform[1]='3';
 +      else if (!strncmp(shortplatform, "pentium4", 8)) strcpy(shortplatform, "i386");
 +      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");
++      else if (!strncmp(shortplatform, "athlon", 6)) strcpy(shortplatform, "i386");
++      else if (!strncmp(shortplatform, "amd64", 5)) strcpy(shortplatform, "x86_64");
      } else {
+ #ifdef __sparc__
+ #ifdef __arch64__