diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-01-11 17:39:50 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-01-11 17:39:50 +0000 |
| commit | 8ad7c533ee497f2c6a16cde705a565fcb97dfd12 (patch) | |
| tree | 4f07010b3a8fe3d453dd641837800058e2cd2c4f /gas/config/tc-mn10300.c | |
| parent | 5cd1580898b80c549ab78626bb55e912d5eea214 (diff) | |
| download | gdb-8ad7c533ee497f2c6a16cde705a565fcb97dfd12.zip gdb-8ad7c533ee497f2c6a16cde705a565fcb97dfd12.tar.gz gdb-8ad7c533ee497f2c6a16cde705a565fcb97dfd12.tar.bz2 | |
Fixes for building on 64-bit hosts:
* config/tc-avr.c (mod_index): New union to allow conversion
between pointers and integers.
(md_begin, avr_ldi_expression): Use it.
* config/tc-i370.c (md_assemble): Add cast for argument to print
statement.
* config/tc-tic54x.c (subsym_substitute): Likewise.
* config/tc-mn10200.c (md_assemble): Use a union to convert the
opindex field of fr_cgen structure into a pointer so that it can
be stored in a frag.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-frv.c (frv_debug_tomcat): Use %p to print pointer
types.
* config/tc-v850.c: Replace uses of (int) casts with correct
types.
* gas/tic54x/address.d: Work with 64bit hosts.
* gas/tic54x/addrfar.d: Likewise.
* gas/tic54x/align.d: Likewise.
* gas/tic54x/all-opcodes.d: Likewise.
* gas/tic54x/asg.d: Likewise.
* gas/tic54x/cons.d: Likewise.
* gas/tic54x/consfar.d: Likewise.
* gas/tic54x/extaddr.d: Likewise.
* gas/tic54x/field.d: Likewise.
* gas/tic54x/labels.d: Likewise.
* gas/tic54x/loop.d: Likewise.
* gas/tic54x/lp.d: Likewise.
* gas/tic54x/macro.d: Likewise.
* gas/tic54x/math.d: Likewise.
* gas/tic54x/opcodes.d: Likewise.
* gas/tic54x/sections.d: Likewise.
* gas/tic54x/set.d: Likewise.
* gas/tic54x/struct.d: Likewise.
* gas/tic54x/subsym.d: Likewise.
Diffstat (limited to 'gas/config/tc-mn10300.c')
| -rw-r--r-- | gas/config/tc-mn10300.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 963b1b6..102c2ea 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -1,6 +1,6 @@ /* tc-mn10300.c -- Assembler code for the Matsushita 10300 - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -2005,6 +2005,18 @@ keep_going: if (relaxable && fc > 0) { + /* On a 64-bit host the size of an 'int' is not the same + as the size of a pointer, so we need a union to convert + the opindex field of the fr_cgen structure into a char * + so that it can be stored in the frag. We do not have + to worry about loosing accuracy as we are not going to + be even close to the 32bit limit of the int. */ + union + { + int opindex; + char * ptr; + } + opindex_converter; int type; /* We want to anchor the line info to the previous frag (if @@ -2044,10 +2056,11 @@ keep_going: else type = 3; + opindex_converter.opindex = fixups[0].opindex; f = frag_var (rs_machine_dependent, 8, 8 - size, type, fixups[0].exp.X_add_symbol, fixups[0].exp.X_add_number, - (char *)fixups[0].opindex); + opindex_converter.ptr); /* This is pretty hokey. We basically just care about the opcode, so we have to write out the first word big endian. |