This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: build regression
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: Binutils Development <binutils at sourceware dot org>
- Date: Mon, 18 Nov 2013 12:22:47 -0800
- Subject: Re: build regression
- Authentication-results: sourceware.org; auth=none
- References: <87pppxo505 dot fsf at fleche dot redhat dot com>
On Mon, Nov 18, 2013 at 11:59 AM, Tom Tromey <tromey@redhat.com> wrote:
> I randomly build do a cross build using the mingw cross tools on Fedora,
> configuring:
>
> ../binutils-gdb/configure --host=i686-w64-mingw32
>
> With today's master, f49fe902baaeff0cc73e86330ed0468d48203046, I get a
> build failure. I didn't try to bisect, but here's the error message:
>
>
> i686-w64-mingw32-gcc -DHAVE_CONFIG_H -I. -I../../binutils-gdb/gas -I. -I../../binutils-gdb/gas -I../bfd -I../../binutils-gdb/gas/config -I../../binutils-gdb/gas/../include -I../../binutils-gdb/gas/.. -I../../binutils-gdb/gas/../bfd -I./../intl -DLOCALEDIR="\"/usr/local/share/locale\"" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wno-format -Werror -g -O2 -D__USE_MINGW_ACCESS -MT tc-i386.o -MD -MP -MF .deps/tc-i386.Tpo -c -o tc-i386.o `test -f 'config/tc-i386.c' || echo '../../binutils-gdb/gas/'`config/tc-i386.c
> ../../binutils-gdb/gas/config/tc-i386.c: In function 'x86_cons':
> ../../binutils-gdb/gas/config/tc-i386.c:7631:7: error: too many arguments to function 'lex_got'
> ../../binutils-gdb/gas/config/tc-i386.c:7530:1: note: declared here
> ../../binutils-gdb/gas/config/tc-i386.c: In function 'i386_immediate':
> ../../binutils-gdb/gas/config/tc-i386.c:7861:6: error: too many arguments to function 'lex_got'
> ../../binutils-gdb/gas/config/tc-i386.c:7530:1: note: declared here
> ../../binutils-gdb/gas/config/tc-i386.c: In function 'i386_displacement':
> ../../binutils-gdb/gas/config/tc-i386.c:8120:6: error: too many arguments to function 'lex_got'
> ../../binutils-gdb/gas/config/tc-i386.c:7530:1: note: declared here
> In file included from ../../binutils-gdb/gas/config/tc-i386.c:10399:0:
> ../../binutils-gdb/gas/config/tc-i386-intel.c: In function 'i386_operator':
> ../../binutils-gdb/gas/config/tc-i386-intel.c:147:10: error: too many arguments to function 'lex_got'
> ../../binutils-gdb/gas/config/tc-i386.c:7530:1: note: declared here
>
> Tom
Sorry for that. I checked this into both trunk and 2.24 branch.
--
H.J.
-
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9d63d12..7fafa26 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ * config/tc-i386.c (lex_got): Add a dummy "int bnd_prefix"
+ argument.
+
2013-11-18 Renlin Li <Renlin.Li@arm.com>
* config/tc-arm.c (arm_archs): New armv7ve architecture option.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index c2ff00d..3c423da 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -7348,7 +7348,7 @@ x86_address_bytes (void)
#if !(defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (OBJ_MACH_O)) \
|| defined (LEX_AT)
-# define lex_got(reloc, adjust, types) NULL
+# define lex_got(reloc, adjust, types, bnd_prefix) NULL
#else
/* Parse operands of the form
<symbol>@GOTOFF+<nnn>
@@ -7532,7 +7532,8 @@ lex_got (enum bfd_reloc_code_real *rel,
static char *
lex_got (enum bfd_reloc_code_real *rel ATTRIBUTE_UNUSED,
int *adjust ATTRIBUTE_UNUSED,
- i386_operand_type *types ATTRIBUTE_UNUSED)
+ i386_operand_type *types,
+ int bnd_prefix ATTRIBUTE_UNUSED)
{
static const struct
{