patches/binutils-2.17-musl.diff

   1 diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
   2 --- a/bfd/aclocal.m4
   3 +++ b/bfd/aclocal.m4
   4 @@ -221,7 +221,7 @@
   5         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
   6         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
   7        # icc doesn't choke on unknown options, it will just issue warnings
   8 -      # or remarks (even with -Werror).  So we grep stderr for any message
   9 +      # or remarks (even with ).  So we grep stderr for any message
  10        # that says an option was ignored or not supported.
  11        # When given -MP, icc 7.0 and 7.1 complain thusly:
  12        #   icc: Command line warning: ignoring option '-M'; no argument required
  13 diff --git a/bfd/configure b/bfd/configure
  14 --- a/bfd/configure
  15 +++ b/bfd/configure
  16 @@ -3036,7 +3036,7 @@
  17         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  18         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
  19        # icc doesn't choke on unknown options, it will just issue warnings
  20 -      # or remarks (even with -Werror).  So we grep stderr for any message
  21 +      # or remarks (even with ).  So we grep stderr for any message
  22        # that says an option was ignored or not supported.
  23        # When given -MP, icc 7.0 and 7.1 complain thusly:
  24        #   icc: Command line warning: ignoring option '-M'; no argument required
  25 @@ -4401,14 +4401,14 @@
  26     esac
  27  fi;
  28
  29 -# Enable -Werror by default when using gcc
  30 +# Enable  by default when using gcc
  31  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
  32      ERROR_ON_WARNING=yes
  33  fi
  34
  35  NO_WERROR=
  36  if test "${ERROR_ON_WARNING}" = yes ; then
  37 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
  38 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
  39      NO_WERROR="-Wno-error"
  40  fi
  41
  42 diff --git a/bfd/warning.m4 b/bfd/warning.m4
  43 --- a/bfd/warning.m4
  44 +++ b/bfd/warning.m4
  45 @@ -11,14 +11,14 @@
  46       *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
  47     esac])
  48
  49 -# Enable -Werror by default when using gcc
  50 +# Enable  by default when using gcc
  51  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
  52      ERROR_ON_WARNING=yes
  53  fi
  54
  55  NO_WERROR=
  56  if test "${ERROR_ON_WARNING}" = yes ; then
  57 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
  58 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
  59      NO_WERROR="-Wno-error"
  60  fi
  61
  62 diff --git a/binutils/Makefile.am b/binutils/Makefile.am
  63 --- a/binutils/Makefile.am
  64 +++ b/binutils/Makefile.am
  65 @@ -265,7 +265,7 @@
  66  rcparse.h: rcparse.c
  67  sysinfo.h: sysinfo.c
  68
  69 -# Disable -Werror, if it has been enabled, since old versions of bison/
  70 +# Disable , if it has been enabled, since old versions of bison/
  71  # yacc will produce working code which contain compile time warnings.
  72  arparse.o:
  73         $(COMPILE) -c $< $(NO_WERROR)
  74 diff --git a/binutils/Makefile.in b/binutils/Makefile.in
  75 --- a/binutils/Makefile.in
  76 +++ b/binutils/Makefile.in
  77 @@ -1049,7 +1049,7 @@
  78  rcparse.h: rcparse.c
  79  sysinfo.h: sysinfo.c
  80
  81 -# Disable -Werror, if it has been enabled, since old versions of bison/
  82 +# Disable , if it has been enabled, since old versions of bison/
  83  # yacc will produce working code which contain compile time warnings.
  84  arparse.o:
  85         $(COMPILE) -c $< $(NO_WERROR)
  86 diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
  87 --- a/binutils/aclocal.m4
  88 +++ b/binutils/aclocal.m4
  89 @@ -221,7 +221,7 @@
  90         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
  91         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
  92        # icc doesn't choke on unknown options, it will just issue warnings
  93 -      # or remarks (even with -Werror).  So we grep stderr for any message
  94 +      # or remarks (even with ).  So we grep stderr for any message
  95        # that says an option was ignored or not supported.
  96        # When given -MP, icc 7.0 and 7.1 complain thusly:
  97        #   icc: Command line warning: ignoring option '-M'; no argument required
  98 diff --git a/binutils/configure b/binutils/configure
  99 --- a/binutils/configure
 100 +++ b/binutils/configure
 101 @@ -3032,7 +3032,7 @@
 102         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 103         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 104        # icc doesn't choke on unknown options, it will just issue warnings
 105 -      # or remarks (even with -Werror).  So we grep stderr for any message
 106 +      # or remarks (even with ).  So we grep stderr for any message
 107        # that says an option was ignored or not supported.
 108        # When given -MP, icc 7.0 and 7.1 complain thusly:
 109        #   icc: Command line warning: ignoring option '-M'; no argument required
 110 @@ -4191,14 +4191,14 @@
 111     esac
 112  fi;
 113
 114 -# Enable -Werror by default when using gcc
 115 +# Enable  by default when using gcc
 116  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 117      ERROR_ON_WARNING=yes
 118  fi
 119
 120  NO_WERROR=
 121  if test "${ERROR_ON_WARNING}" = yes ; then
 122 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
 123 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
 124      NO_WERROR="-Wno-error"
 125  fi
 126
 127 diff --git a/config.sub b/config.sub
 128 --- a/config.sub
 129 +++ b/config.sub
 130 @@ -119,7 +119,7 @@
 131  # Here we must recognize all the valid KERNEL-OS combinations.
 132  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 133  case $maybe_os in
 134 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 135 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | linux-musl* | \
 136    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 137    storm-chaos* | os2-emx* | rtmk-nova*)
 138      os=-$maybe_os
 139 @@ -1207,7 +1207,7 @@
 140               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 141               | -chorusos* | -chorusrdb* \
 142               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 143 -             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 144 +             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* | -linux-musl* \
 145               | -uxpv* | -beos* | -mpeix* | -udk* \
 146               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 147               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 148 diff --git a/config/depstand.m4 b/config/depstand.m4
 149 --- a/config/depstand.m4
 150 +++ b/config/depstand.m4
 151 @@ -90,7 +90,7 @@
 152         grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 &&
 153         ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then
 154        # icc doesn't choke on unknown options, it will just issue warnings
 155 -      # or remarks (even with -Werror).  So we grep stderr for any message
 156 +      # or remarks (even with ).  So we grep stderr for any message
 157        # that says an option was ignored or not supported.
 158        # When given -MP, icc 7.0 and 7.1 complain thusly:
 159        #   icc: Command line warning: ignoring option '-M'; no argument required
 160 diff --git a/config/warnings.m4 b/config/warnings.m4
 161 --- a/config/warnings.m4
 162 +++ b/config/warnings.m4
 163 @@ -65,11 +65,11 @@
 164  ])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC
 165
 166  # ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z])
 167 -#   sets WERROR to "-Werror" if the compiler is GCC >=x.y.z, or if
 168 +#   sets WERROR to "" if the compiler is GCC >=x.y.z, or if
 169  #   --enable-werror-always was given on the command line, otherwise
 170  #   to nothing.
 171  #   If the argument is the word "manual" instead of a version number,
 172 -#   then WERROR will be set to -Werror only if --enable-werror-always
 173 +#   then WERROR will be set to  only if --enable-werror-always
 174  #   appeared on the configure command line.
 175  AC_DEFUN([ACX_PROG_CC_WARNINGS_ARE_ERRORS],
 176  [AC_REQUIRE([AC_PROG_CC])dnl
 177 @@ -77,10 +77,10 @@
 178  WERROR=
 179  AC_ARG_ENABLE(werror-always,
 180      AS_HELP_STRING([--enable-werror-always],
 181 -                  [enable -Werror despite compiler version]),
 182 +                  [enable  despite compiler version]),
 183  [], [enable_werror_always=no])
 184  AS_IF([test $enable_werror_always = yes],
 185 -      [WERROR=-Werror],
 186 +      [WERROR=],
 187   m4_if($1, [manual],,
 188   [AS_VAR_PUSHDEF([acx_GCCvers], [acx_cv_prog_cc_gcc_$1_or_newer])dnl
 189    AC_CACHE_CHECK([whether $CC is GCC >=$1], acx_GCCvers,
 190 @@ -94,6 +94,6 @@
 191     [AS_VAR_SET(acx_GCCvers, yes)],
 192     [AS_VAR_SET(acx_GCCvers, no)])])
 193   AS_IF([test AS_VAR_GET(acx_GCCvers) = yes],
 194 -       [WERROR=-WerrorB])
 195 +       [WERROR=B])
 196    AS_VAR_POPDEF([acx_GCCvers])]))
 197  ])# ACX_PROG_CC_WARNINGS_ARE_ERRORS
 198 diff --git a/configure b/configure
 199 --- a/configure
 200 +++ b/configure
 201 @@ -42,7 +42,7 @@
 202    --enable-maintainer-mode enable make rules and dependencies not useful
 203                            (and sometimes confusing) to the casual installer"
 204  ac_help="$ac_help
 205 -  --enable-werror         enable -Werror in bootstrap stage2 and later"
 206 +  --enable-werror         enable  in bootstrap stage2 and later"
 207  ac_help="$ac_help
 208    --with-datarootdir   Use datarootdir as the data root directory."
 209  ac_help="$ac_help
 210 @@ -7220,7 +7220,7 @@
 211  esac
 212
 213
 214 -# Enable -Werror in bootstrap stage2 and later.
 215 +# Enable  in bootstrap stage2 and later.
 216  # Change the default to "no" on release branches.
 217  # Check whether --enable-werror or --disable-werror was given.
 218  if test "${enable_werror+set}" = set; then
 219 diff --git a/configure.in b/configure.in
 220 --- a/configure.in
 221 +++ b/configure.in
 222 @@ -2373,10 +2373,10 @@
 223  esac
 224  AC_SUBST(stage1_cflags)
 225
 226 -# Enable -Werror in bootstrap stage2 and later.
 227 +# Enable  in bootstrap stage2 and later.
 228  # Change the default to "no" on release branches.
 229  AC_ARG_ENABLE(werror,
 230 -[  --enable-werror         enable -Werror in bootstrap stage2 and later], [],
 231 +[  --enable-werror         enable  in bootstrap stage2 and later], [],
 232  [enable_werror=yes])
 233  case ${enable_werror} in
 234    yes) stage2_werror_flag="--enable-werror-always" ;;
 235 diff --git a/gas/Makefile.am b/gas/Makefile.am
 236 --- a/gas/Makefile.am
 237 +++ b/gas/Makefile.am
 238 @@ -601,7 +601,7 @@
 239         if [ $$f = "m68k-parse.y" ]; then \
 240           rm -f m68k-parse.y; \
 241         else true; fi
 242 -# Disable -Werror, if it has been enabled, since old versions of bison/
 243 +# Disable , if it has been enabled, since old versions of bison/
 244  # yacc will produce working code which contain compile time warnings.
 245  m68k-parse.o: m68k-parse.c $(srcdir)/config/m68k-parse.h
 246         $(COMPILE) -c $< $(NO_WERROR)
 247 @@ -628,12 +628,12 @@
 248
 249  itbl-lex.c: $(srcdir)/itbl-lex.l
 250
 251 -# Disable -Werror, if it has been enabled, since old versions of bison/
 252 +# Disable , if it has been enabled, since old versions of bison/
 253  # yacc will produce working code which contain compile time warnings.
 254  itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
 255         $(COMPILE) -c $< $(NO_WERROR)
 256
 257 -# Disable -Werror, if it has been enabled, since old versions of bison/
 258 +# Disable , if it has been enabled, since old versions of bison/
 259  # yacc will produce working code which contain compile time warnings.
 260  itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.h
 261         $(COMPILE) -c $< $(NO_WERROR)
 262 diff --git a/gas/Makefile.in b/gas/Makefile.in
 263 --- a/gas/Makefile.in
 264 +++ b/gas/Makefile.in
 265 @@ -2958,7 +2958,7 @@
 266         if [ $$f = "m68k-parse.y" ]; then \
 267           rm -f m68k-parse.y; \
 268         else true; fi
 269 -# Disable -Werror, if it has been enabled, since old versions of bison/
 270 +# Disable , if it has been enabled, since old versions of bison/
 271  # yacc will produce working code which contain compile time warnings.
 272  m68k-parse.o: m68k-parse.c $(srcdir)/config/m68k-parse.h
 273         $(COMPILE) -c $< $(NO_WERROR)
 274 @@ -2985,12 +2985,12 @@
 275
 276  itbl-lex.c: $(srcdir)/itbl-lex.l
 277
 278 -# Disable -Werror, if it has been enabled, since old versions of bison/
 279 +# Disable , if it has been enabled, since old versions of bison/
 280  # yacc will produce working code which contain compile time warnings.
 281  itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
 282         $(COMPILE) -c $< $(NO_WERROR)
 283
 284 -# Disable -Werror, if it has been enabled, since old versions of bison/
 285 +# Disable , if it has been enabled, since old versions of bison/
 286  # yacc will produce working code which contain compile time warnings.
 287  itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.h
 288         $(COMPILE) -c $< $(NO_WERROR)
 289 diff --git a/gas/aclocal.m4 b/gas/aclocal.m4
 290 --- a/gas/aclocal.m4
 291 +++ b/gas/aclocal.m4
 292 @@ -221,7 +221,7 @@
 293         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 294         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 295        # icc doesn't choke on unknown options, it will just issue warnings
 296 -      # or remarks (even with -Werror).  So we grep stderr for any message
 297 +      # or remarks (even with ).  So we grep stderr for any message
 298        # that says an option was ignored or not supported.
 299        # When given -MP, icc 7.0 and 7.1 complain thusly:
 300        #   icc: Command line warning: ignoring option '-M'; no argument required
 301 diff --git a/gas/configure b/gas/configure
 302 --- a/gas/configure
 303 +++ b/gas/configure
 304 @@ -3032,7 +3032,7 @@
 305         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 306         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 307        # icc doesn't choke on unknown options, it will just issue warnings
 308 -      # or remarks (even with -Werror).  So we grep stderr for any message
 309 +      # or remarks (even with ).  So we grep stderr for any message
 310        # that says an option was ignored or not supported.
 311        # When given -MP, icc 7.0 and 7.1 complain thusly:
 312        #   icc: Command line warning: ignoring option '-M'; no argument required
 313 @@ -4193,14 +4193,14 @@
 314     esac
 315  fi;
 316
 317 -# Enable -Werror by default when using gcc
 318 +# Enable  by default when using gcc
 319  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 320      ERROR_ON_WARNING=yes
 321  fi
 322
 323  NO_WERROR=
 324  if test "${ERROR_ON_WARNING}" = yes ; then
 325 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
 326 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
 327      NO_WERROR="-Wno-error"
 328  fi
 329
 330 diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4
 331 --- a/gprof/aclocal.m4
 332 +++ b/gprof/aclocal.m4
 333 @@ -221,7 +221,7 @@
 334         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 335         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 336        # icc doesn't choke on unknown options, it will just issue warnings
 337 -      # or remarks (even with -Werror).  So we grep stderr for any message
 338 +      # or remarks (even with ).  So we grep stderr for any message
 339        # that says an option was ignored or not supported.
 340        # When given -MP, icc 7.0 and 7.1 complain thusly:
 341        #   icc: Command line warning: ignoring option '-M'; no argument required
 342 diff --git a/gprof/configure b/gprof/configure
 343 --- a/gprof/configure
 344 +++ b/gprof/configure
 345 @@ -3031,7 +3031,7 @@
 346         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 347         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 348        # icc doesn't choke on unknown options, it will just issue warnings
 349 -      # or remarks (even with -Werror).  So we grep stderr for any message
 350 +      # or remarks (even with ).  So we grep stderr for any message
 351        # that says an option was ignored or not supported.
 352        # When given -MP, icc 7.0 and 7.1 complain thusly:
 353        #   icc: Command line warning: ignoring option '-M'; no argument required
 354 @@ -8466,14 +8466,14 @@
 355     esac
 356  fi;
 357
 358 -# Enable -Werror by default when using gcc
 359 +# Enable  by default when using gcc
 360  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 361      ERROR_ON_WARNING=yes
 362  fi
 363
 364  NO_WERROR=
 365  if test "${ERROR_ON_WARNING}" = yes ; then
 366 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
 367 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
 368      NO_WERROR="-Wno-error"
 369  fi
 370
 371 diff --git a/include/gdb/callback.h b/include/gdb/callback.h
 372 --- a/include/gdb/callback.h
 373 +++ b/include/gdb/callback.h
 374 @@ -255,7 +255,7 @@
 375    /* Callbacks for reading/writing memory (e.g. for read/write syscalls).
 376       ??? long or unsigned long might be better to use for the `count'
 377       argument here.  We mimic sim_{read,write} for now.  Be careful to
 378 -     test any changes with -Wall -Werror, mixed signed comparisons
 379 +     test any changes with -Wall , mixed signed comparisons
 380       will get you.  */
 381    int (*read_mem) PARAMS ((host_callback * /*cb*/, struct cb_syscall * /*sc*/,
 382                            unsigned long /*taddr*/, char * /*buf*/,
 383 diff --git a/ld/Makefile.am b/ld/Makefile.am
 384 --- a/ld/Makefile.am
 385 +++ b/ld/Makefile.am
 386 @@ -429,7 +429,7 @@
 387
 388  STAGESTUFF = *.o ldscripts/* e*.c
 389
 390 -# Disable -Werror, if it has been enabled, since old versions of bison/
 391 +# Disable , if it has been enabled, since old versions of bison/
 392  # yacc will produce working code which contain compile time warnings.
 393  ldgram.o:
 394         $(COMPILE) -c $< $(NO_WERROR)
 395 diff --git a/ld/Makefile.in b/ld/Makefile.in
 396 --- a/ld/Makefile.in
 397 +++ b/ld/Makefile.in
 398 @@ -1251,7 +1251,7 @@
 399         uninstall-man1
 400
 401
 402 -# Disable -Werror, if it has been enabled, since old versions of bison/
 403 +# Disable , if it has been enabled, since old versions of bison/
 404  # yacc will produce working code which contain compile time warnings.
 405  ldgram.o:
 406         $(COMPILE) -c $< $(NO_WERROR)
 407 diff --git a/ld/aclocal.m4 b/ld/aclocal.m4
 408 --- a/ld/aclocal.m4
 409 +++ b/ld/aclocal.m4
 410 @@ -221,7 +221,7 @@
 411         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 412         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 413        # icc doesn't choke on unknown options, it will just issue warnings
 414 -      # or remarks (even with -Werror).  So we grep stderr for any message
 415 +      # or remarks (even with ).  So we grep stderr for any message
 416        # that says an option was ignored or not supported.
 417        # When given -MP, icc 7.0 and 7.1 complain thusly:
 418        #   icc: Command line warning: ignoring option '-M'; no argument required
 419 diff --git a/ld/configure b/ld/configure
 420 --- a/ld/configure
 421 +++ b/ld/configure
 422 @@ -3034,7 +3034,7 @@
 423         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 424         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 425        # icc doesn't choke on unknown options, it will just issue warnings
 426 -      # or remarks (even with -Werror).  So we grep stderr for any message
 427 +      # or remarks (even with ).  So we grep stderr for any message
 428        # that says an option was ignored or not supported.
 429        # When given -MP, icc 7.0 and 7.1 complain thusly:
 430        #   icc: Command line warning: ignoring option '-M'; no argument required
 431 @@ -4242,14 +4242,14 @@
 432     esac
 433  fi;
 434
 435 -# Enable -Werror by default when using gcc
 436 +# Enable  by default when using gcc
 437  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 438      ERROR_ON_WARNING=yes
 439  fi
 440
 441  NO_WERROR=
 442  if test "${ERROR_ON_WARNING}" = yes ; then
 443 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
 444 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
 445      NO_WERROR="-Wno-error"
 446  fi
 447
 448 diff --git a/opcodes/aclocal.m4 b/opcodes/aclocal.m4
 449 --- a/opcodes/aclocal.m4
 450 +++ b/opcodes/aclocal.m4
 451 @@ -221,7 +221,7 @@
 452         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 453         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 454        # icc doesn't choke on unknown options, it will just issue warnings
 455 -      # or remarks (even with -Werror).  So we grep stderr for any message
 456 +      # or remarks (even with ).  So we grep stderr for any message
 457        # that says an option was ignored or not supported.
 458        # When given -MP, icc 7.0 and 7.1 complain thusly:
 459        #   icc: Command line warning: ignoring option '-M'; no argument required
 460 diff --git a/opcodes/configure b/opcodes/configure
 461 --- a/opcodes/configure
 462 +++ b/opcodes/configure
 463 @@ -3039,7 +3039,7 @@
 464         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 465         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 466        # icc doesn't choke on unknown options, it will just issue warnings
 467 -      # or remarks (even with -Werror).  So we grep stderr for any message
 468 +      # or remarks (even with ).  So we grep stderr for any message
 469        # that says an option was ignored or not supported.
 470        # When given -MP, icc 7.0 and 7.1 complain thusly:
 471        #   icc: Command line warning: ignoring option '-M'; no argument required
 472 @@ -4359,14 +4359,14 @@
 473     esac
 474  fi;
 475
 476 -# Enable -Werror by default when using gcc
 477 +# Enable  by default when using gcc
 478  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 479      ERROR_ON_WARNING=yes
 480  fi
 481
 482  NO_WERROR=
 483  if test "${ERROR_ON_WARNING}" = yes ; then
 484 -    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
 485 +    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS "
 486      NO_WERROR="-Wno-error"
 487  fi
 488