patches/binutils/2.17a/210-i386-no-divide-comment.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 866 5fec4dba671e
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -durN binutils-2.17.orig/gas/config/tc-i386.c binutils-2.17/gas/config/tc-i386.c
     2 --- binutils-2.17.orig/gas/config/tc-i386.c	2006-04-07 08:40:57.000000000 +0200
     3 +++ binutils-2.17/gas/config/tc-i386.c	2008-09-22 09:06:07.000000000 +0200
     4 @@ -196,24 +196,10 @@
     5  #endif
     6  	;
     7  
     8 -#if (defined (TE_I386AIX)				\
     9 -     || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF))	\
    10 -	 && !defined (TE_GNU)				\
    11 -	 && !defined (TE_LINUX)				\
    12 - 	 && !defined (TE_NETWARE)			\
    13 -	 && !defined (TE_FreeBSD)			\
    14 -	 && !defined (TE_NetBSD)))
    15  /* This array holds the chars that always start a comment.  If the
    16 -   pre-processor is disabled, these aren't very useful.  The option
    17 -   --divide will remove '/' from this list.  */
    18 -const char *i386_comment_chars = "#/";
    19 -#define SVR4_COMMENT_CHARS 1
    20 -#define PREFIX_SEPARATOR '\\'
    21 -
    22 -#else
    23 +   pre-processor is disabled, these aren't very useful.  */
    24  const char *i386_comment_chars = "#";
    25  #define PREFIX_SEPARATOR '/'
    26 -#endif
    27  
    28  /* This array holds the chars that only start a comment at the beginning of
    29     a line.  If the line seems to have the form '# 123 filename'
    30 @@ -5486,20 +5472,6 @@
    31        break;
    32  
    33      case OPTION_DIVIDE:
    34 -#ifdef SVR4_COMMENT_CHARS
    35 -      {
    36 -	char *n, *t;
    37 -	const char *s;
    38 -
    39 -	n = (char *) xmalloc (strlen (i386_comment_chars) + 1);
    40 -	t = n;
    41 -	for (s = i386_comment_chars; *s != '\0'; s++)
    42 -	  if (*s != '/')
    43 -	    *t++ = *s;
    44 -	*t = '\0';
    45 -	i386_comment_chars = n;
    46 -      }
    47 -#endif
    48        break;
    49  
    50      default:
    51 @@ -5525,13 +5497,8 @@
    52    fprintf (stream, _("\
    53    -s                      ignored\n"));
    54  #endif
    55 -#ifdef SVR4_COMMENT_CHARS
    56 -  fprintf (stream, _("\
    57 -  --divide                do not treat `/' as a comment character\n"));
    58 -#else
    59    fprintf (stream, _("\
    60    --divide                ignored\n"));
    61 -#endif
    62  }
    63  
    64  #if ((defined (OBJ_MAYBE_COFF) && defined (OBJ_MAYBE_AOUT)) \