[patch] 01_all_joined-cpp-defs.patch

01_all_joined-cpp-defs.patch (text/plain), 956 bytes, created by Ryan Hill (RETIRED) on 2011-04-11 09:59:24 UTC

As of 4.6.0 options taking both joined and separate arguments (eg. -DFOO
and -D FOO) are canonicalized into the separate form before being processed.
The spec language doesn't know about separated switches so it sees it as
two different arguments, meaning we can't write spec rules for -D or -U
options anymore. We require this for -U_FORTIFY_SOURCE and hardened to work,
so force the canonical form of these flags to be joined instead.

https://bugs.gentoo.org/361783
http://gcc.gnu.org/PR48524
http://gcc.gnu.org/PR47236


--- a/gcc/opts-common.c
+++ b/gcc/opts-common.c
@@ -276,7 +276,8 @@ generate_canonical_option (size_t opt_index, const char *arg, int value,
   if (arg)
     {
       if ((option->flags & CL_SEPARATE)
-	  && !(option->flags & CL_SEPARATE_ALIAS))
+	  && !(option->flags & CL_SEPARATE_ALIAS)
+	  && !(opt_text[1] == 'D' || opt_text[1] == 'U'))
 	{
 	  decoded->canonical_option[0] = opt_text;
 	  decoded->canonical_option[1] = arg;