SOURCES: uClibc-toolchain-wrapper.patch - typo - safe if statement

[baggins]

Author: baggins                      Date: Sat Mar 14 01:39:18 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- typo
- safe if statement

---- Files affected:
SOURCES:
   uClibc-toolchain-wrapper.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/uClibc-toolchain-wrapper.patch
diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.11 SOURCES/uClibc-toolchain-wrapper.patch:1.12
--- SOURCES/uClibc-toolchain-wrapper.patch:1.11	Sat Mar 14 02:25:14 2009
+++ SOURCES/uClibc-toolchain-wrapper.patch	Sat Mar 14 02:39:12 2009
@@ -1,7 +1,7 @@
 diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.29/extra/gcc-uClibc/gcc-uClibc.c
 --- uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c	1970-01-01 01:00:00.000000000 +0100
 +++ uClibc-0.9.29/extra/gcc-uClibc/gcc-uClibc.c	2007-06-03 22:10:49.372320596 +0200
-@@ -0,0 +1,674 @@
+@@ -0,0 +1,672 @@
 +/* vi: set sw=4 ts=4: */
 +/*
 + * Copyright (C) 2000 Manuel Novoa III
@@ -396,10 +396,8 @@
 +						if (strstr(argv[i],"--dynamic-linker") != 0) {
 +							dlstr = 0;
 +						}
-+						if (strstr(argv[i],"-z,-combreloc") != 0) {
-+							argv[i] = '\0';
-+						}
-+						if (strstr(argv[i],"-z,relro") != 0) {
++						if ((strstr(argv[i],"-z,combreloc") != 0) ||
++								(strstr(argv[i],"-z,relro") != 0)) {
 +							argv[i] = '\0';
 +						}
 +					}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.11&r2=1.12&f=u