SOURCES: yaboot-gcc4.patch (NEW) - gcc 4 fix

sparky sparky at pld-linux.org
Fri Dec 9 17:20:40 CET 2005


Author: sparky                       Date: Fri Dec  9 16:20:40 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- gcc 4 fix

---- Files affected:
SOURCES:
   yaboot-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/yaboot-gcc4.patch
diff -u /dev/null SOURCES/yaboot-gcc4.patch:1.1
--- /dev/null	Fri Dec  9 17:20:40 2005
+++ SOURCES/yaboot-gcc4.patch	Fri Dec  9 17:20:34 2005
@@ -0,0 +1,40 @@
+--- yaboot-1.3.13/lib/strstr.c.orig	2001-09-20 15:15:31.000000000 +0200
++++ yaboot-1.3.13/lib/strstr.c	2005-12-09 17:16:58.000000000 +0100
+@@ -65,8 +65,18 @@
+         {
+           register chartype a;
+ 	  register const unsigned char *rhaystack, *rneedle;
++	  
++	  a = *++haystack;
++	  if (a == '\0')
++	      goto ret0;
++	  if (a == b)
++              break;
++	  a = *++haystack;
++	  if (a == '\0')
++              goto ret0;
+ 
+-	  do
++	 do {
++	  while (a != b)
+ 	    {
+ 	      a = *++haystack;
+ 	      if (a == '\0')
+@@ -76,15 +86,13 @@
+ 	      a = *++haystack;
+ 	      if (a == '\0')
+ 		goto ret0;
+-shloop:	    }
+-          while (a != b);
++	    }
+ 
+ jin:	  a = *++haystack;
+ 	  if (a == '\0')
+ 	    goto ret0;
+ 
+-	  if (a != c)
+-	    goto shloop;
++	} while ( a != c );
+ 
+ 	  rhaystack = haystack-- + 1;
+ 	  rneedle = needle;
================================================================



More information about the pld-cvs-commit mailing list