Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18/120-i386-no-divide-comment.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567) 
     1 diff -durN binutils-2.18.orig/gas/config/tc-i386.c binutils-2.18/gas/config/tc-i386.c

     2 --- binutils-2.18.orig/gas/config/tc-i386.c	2007-08-24 16:01:22.000000000 +0200

     3 +++ binutils-2.18/gas/config/tc-i386.c	2008-09-22 08:11:42.000000000 +0200

     4 @@ -180,24 +180,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 @@ -6061,20 +6047,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      case OPTION_MARCH:

    51 @@ -6142,13 +6114,8 @@

    52    fprintf (stream, _("\

    53    --32/--64               generate 32bit/64bit code\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    fprintf (stream, _("\

    63    -march=CPU/-mtune=CPU   generate code/optimize for CPU, where CPU is one of:\n\

    64                             i386, i486, pentium, pentiumpro, pentium4, nocona,\n\
crosstool-ng