From ae21b491f05f0cfbcc3841c8c8ecbac880b7938d Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 21 Jun 2008 13:34:29 +0000 Subject: [PATCH] added ulong patch --- dietlibc-0.31.20080212-ulong.patch | 26 ++++++++++++++++++++++++++ dietlibc.spec | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 dietlibc-0.31.20080212-ulong.patch diff --git a/dietlibc-0.31.20080212-ulong.patch b/dietlibc-0.31.20080212-ulong.patch new file mode 100644 index 0000000..89bf8f7 --- /dev/null +++ b/dietlibc-0.31.20080212-ulong.patch @@ -0,0 +1,26 @@ +diff -upN dietlibc-0.31.20080212/lib/strcpy.c.~1~ dietlibc-0.31.20080212/lib/strcpy.c +--- dietlibc-0.31.20080212/lib/strcpy.c.~1~ 2003-12-21 13:06:36.000000000 +0100 ++++ dietlibc-0.31.20080212/lib/strcpy.c 2008-02-14 21:36:45.000000000 +0100 +@@ -25,7 +25,7 @@ strcpy (char *s1, const char *s2) + + while (1) { + l = *(const unsigned long *) s2; +- if (((l - MKW(0x1)) & ~l) & MKW(0x80)) { ++ if (((l - MKW(0x1ul)) & ~l) & MKW(0x80ul)) { + unsigned char c; + while ((*s1++ = (l & 0xff))) l>>=8; + return (res); +diff -upN dietlibc-0.31.20080212/lib/strcmp.c.~1~ dietlibc-0.31.20080212/lib/strcmp.c +--- dietlibc-0.31.20080212/lib/strcmp.c.~1~ 2003-12-21 13:06:36.000000000 +0100 ++++ dietlibc-0.31.20080212/lib/strcmp.c 2008-02-14 21:37:38.000000000 +0100 +@@ -31,8 +31,8 @@ strcmp (const char *s1, const char *s2) + while (1) { + l1 = *lx1++; + l2 = *lx2++; +- if ((((l1 - MKW(0x1)) & ~l1) & MKW(0x80)) || +- ((((l2 - MKW(0x1)) & ~l2) & MKW(0x80))) || l1 != l2) { ++ if ((((l1 - MKW(0x1ul)) & ~l1) & MKW(0x80ul)) || ++ ((((l2 - MKW(0x1ul)) & ~l2) & MKW(0x80ul))) || l1 != l2) { + unsigned char c1, c2; + while (1) { + c1 = l1 & 0xff; diff --git a/dietlibc.spec b/dietlibc.spec index 28854a3..01653d4 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -52,6 +52,7 @@ Patch34: dietlibc-0.31.20080212-printffmt.patch Patch40: dietlibc-0.31-printftest.patch Patch41: dietlibc-0.31.20080212-teststdout.patch Patch42: dietlibc-0.31.20080212-strlen.patch +Patch43: dietlibc-0.31.20080212-ulong.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot %{?with_dynamic:Requires: dietlibc-lib = %version-%release} %{!?with_dynamic:Obsoletes: dietlibc-lib < %version-%release} @@ -93,6 +94,7 @@ This package contains the dynamic libraries for dietlibc. %patch40 -p1 -b .printftest %patch41 -p1 -b .teststdout %patch42 -p1 -b .strlen +%patch43 -p1 -b .ulong %if %{without ssp}