summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/binutils/gas/as.h17
-rw-r--r--gnu/usr.bin/binutils/gas/tc.h19
2 files changed, 16 insertions, 20 deletions
diff --git a/gnu/usr.bin/binutils/gas/as.h b/gnu/usr.bin/binutils/gas/as.h
index 890ecd8f105..58dde367eae 100644
--- a/gnu/usr.bin/binutils/gas/as.h
+++ b/gnu/usr.bin/binutils/gas/as.h
@@ -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. */
+ 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;
/* main program "as.c" (command arguments etc) */
@@ -605,7 +621,6 @@ void print_dependencies (void);
struct expressionS;
struct fix;
typedef struct symbol symbolS;
-struct relax_type;
typedef struct frag fragS;
#ifdef BFD_ASSEMBLER
diff --git a/gnu/usr.bin/binutils/gas/tc.h b/gnu/usr.bin/binutils/gas/tc.h
index f4a2826ae07..5d7b44d6645 100644
--- a/gnu/usr.bin/binutils/gas/tc.h
+++ b/gnu/usr.bin/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);