aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-04-27 12:05:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-04-27 12:05:34 +0000
commite0c97d69c64ce001e6b75dcaf995e187a5db38e9 (patch)
treec0fe803a399893ffeb41bdc019bd8831d59677dd
parentaf2b3518af1078eccefb91ae1dbbdcf8697a6547 (diff)
downloadupstream-e0c97d69c64ce001e6b75dcaf995e187a5db38e9.tar.gz
upstream-e0c97d69c64ce001e6b75dcaf995e187a5db38e9.tar.bz2
upstream-e0c97d69c64ce001e6b75dcaf995e187a5db38e9.zip
gcc: fix getenv() patches for 4.4.7 and 4.5-linaro
SVN-Revision: 31489
-rw-r--r--toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch14
-rw-r--r--toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch2
2 files changed, 15 insertions, 1 deletions
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 = "";
+ }