From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 27 Apr 2012 12:05:34 +0000 (+0000)
Subject: [toolchain] gcc: fix getenv() patches for 4.4.7 and 4.5-linaro
X-Git-Tag: v12.09~1642
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=8a777e9a30a3ebbb1c4500d3c910b529b17ef036;p=openwrt-github%2F.git

[toolchain] gcc: fix getenv() patches for 4.4.7 and 4.5-linaro

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31489 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
new file mode 100644
index 0000000000..359c577397
--- /dev/null
+++ b/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -7855,7 +7855,10 @@ getenv_spec_function (int argc, const ch
+ 
+   value = getenv (argv[0]);
+   if (!value)
+-    fatal ("environment variable \"%s\" not defined", argv[0]);
++  {
++    error ("warning: environment variable \"%s\" not defined", argv[0]);
++    value = "";
++  }
+ 
+   /* We have to escape every character of the environment variable so
+      they are not interpreted as active spec characters.  A
diff --git a/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
index 6fd659c04f..001088a25c 100644
--- a/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
@@ -6,7 +6,7 @@
    if (!value)
 -    fatal ("environment variable \"%s\" not defined", argv[0]);
 +  {
-+    warning (0, "environment variable \"%s\" not defined", argv[0]);
++    error ("warning: environment variable \"%s\" not defined", argv[0]);
 +    value = "";
 +  }