diff options
author | kan <kan@FreeBSD.org> | 2007-04-06 17:43:46 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2007-04-06 17:43:46 +0000 |
commit | 415b6dd3be7d3fd3a48d8bc05b2e370b694e3626 (patch) | |
tree | bbf30677d04c832be7238f2bda65c77beaa273c3 | |
parent | f5e830d091704c984593d6fe745fe30c4036c944 (diff) | |
download | FreeBSD-src-415b6dd3be7d3fd3a48d8bc05b2e370b694e3626.zip FreeBSD-src-415b6dd3be7d3fd3a48d8bc05b2e370b694e3626.tar.gz |
Import two binutils header files from FSF 2.15 branch.
These fix binutils compilation on i386/amd64 with GCC 4.1 and
have no other effect.
No response by: obrien
-rw-r--r-- | contrib/binutils/gas/as.h | 18 | ||||
-rw-r--r-- | contrib/binutils/gas/tc.h | 19 |
2 files changed, 17 insertions, 20 deletions
diff --git a/contrib/binutils/gas/as.h b/contrib/binutils/gas/as.h index 890ecd8..5e30f47 100644 --- a/contrib/binutils/gas/as.h +++ b/contrib/binutils/gas/as.h @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -397,6 +397,22 @@ typedef unsigned int relax_substateT; /* Enough bits for address, but still an integer type. Could be a problem, cross-assembling for 64-bit machines. */ typedef addressT relax_addressT; + +struct relax_type +{ + /* Forward reach. Signed number. > 0. */ + offsetT rlx_forward; + /* Backward reach. Signed number. < 0. */ + offsetT rlx_backward; + + /* Bytes length of this address. */ + unsigned char rlx_length; + + /* Next longer relax-state. 0 means there is no 'next' relax-state. */ + relax_substateT rlx_more; +}; + +typedef struct relax_type relax_typeS; /* main program "as.c" (command arguments etc) */ diff --git a/contrib/binutils/gas/tc.h b/contrib/binutils/gas/tc.h index f4a2826..5d7b44d 100644 --- a/contrib/binutils/gas/tc.h +++ b/contrib/binutils/gas/tc.h @@ -24,25 +24,6 @@ extern const pseudo_typeS md_pseudo_table[]; -/* JF moved this here from as.h under the theory that nobody except MACHINE.c - and write.c care about it anyway. */ - -struct relax_type -{ - /* Forward reach. Signed number. > 0. */ - long rlx_forward; - /* Backward reach. Signed number. < 0. */ - long rlx_backward; - - /* Bytes length of this address. */ - unsigned char rlx_length; - - /* Next longer relax-state. 0 means there is no 'next' relax-state. */ - relax_substateT rlx_more; -}; - -typedef struct relax_type relax_typeS; - extern const int md_reloc_size; /* Size of a relocation record */ char *md_atof (int what_statement_type, char *literalP, int *sizeP); |