- typo

- safe if statement

Changed files:
    uClibc-toolchain-wrapper.patch -> 1.12

diff --git a/uClibc-toolchain-wrapper.patch b/uClibc-toolchain-wrapper.patch
index 072f1370a680ac2e15fb4afd0fe4207a5690d123..439faf64073cba4575d390df244a7e6781d6f49c 100644 (file)
--- a/uClibc-toolchain-wrapper.patch
+++ b/uClibc-toolchain-wrapper.patch
@@ -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 @@ diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.29/extra/gc
 +                                              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';
 +                                              }
 +                                      }