diff options
| author | Ian Lance Taylor <ian@airs.com> | 1993-03-12 20:01:28 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1993-03-12 20:01:28 +0000 |
| commit | f2f7d044cd6b17d8b44a16a0aa2c382b796eb425 (patch) | |
| tree | 7bdfa4a9030a02996da0619954f473a1784f8377 /gas/write.c | |
| parent | 204ae00cc1ea2db50197fa6d30810f4c9bcd96de (diff) | |
| download | gdb-f2f7d044cd6b17d8b44a16a0aa2c382b796eb425.zip gdb-f2f7d044cd6b17d8b44a16a0aa2c382b796eb425.tar.gz gdb-f2f7d044cd6b17d8b44a16a0aa2c382b796eb425.tar.bz2 | |
* expr.c, write.c: Ultrix native 4.2 cc requires assert condition
to be on a single line.
Diffstat (limited to 'gas/write.c')
| -rw-r--r-- | gas/write.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gas/write.c b/gas/write.c index 4e207f9..0c550b9 100644 --- a/gas/write.c +++ b/gas/write.c @@ -214,7 +214,13 @@ chain_frchains_together (abfd, section, xxx) segT section; char *xxx; /* unused */ { - chain_frchains_together_1 (section, seg_info (section)->frchainP); + segment_info_type *info; + + /* BFD may have introduced its own sections without using + subseg_new, so it is possible that seg_info is NULL. */ + info = seg_info (section); + if (info != (segment_info_type *) NULL) + chain_frchains_together_1 (section, info->frchainP); } #endif @@ -277,8 +283,8 @@ cvt_frag_to_fill (x, fragP) md_convert_frag (headers, fragP); #endif - assert (fragP->fr_next == NULL - || (fragP->fr_next->fr_address - fragP->fr_address + assert (fragP->fr_next == NULL \ + || (fragP->fr_next->fr_address - fragP->fr_address \ == fragP->fr_fix)); /* @@ -557,9 +563,9 @@ write_object_file () @@ Is this really necessary?? */ #ifndef SUB_SEGMENT_ALIGN #ifdef BFD_ASSEMBLER -#define SUB_SEGMENT_ALIGN (0) +#define SUB_SEGMENT_ALIGN(SEG) (0) #else -#define SUB_SEGMENT_ALIGN (2) +#define SUB_SEGMENT_ALIGN(SEG) (2) #endif #endif for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) @@ -569,7 +575,7 @@ write_object_file () #else subseg_new (frchainP->frch_seg, frchainP->frch_subseg); #endif - frag_align (SUB_SEGMENT_ALIGN, NOP_OPCODE); + frag_align (SUB_SEGMENT_ALIGN (now_seg), NOP_OPCODE); /* frag_align will have left a new frag. Use this last frag for an empty ".fill". @@ -1003,9 +1009,6 @@ write_object_file () text_frag_root, data_frag_root); #endif /* VMS */ #else /* BFD_ASSEMBLER */ -#ifdef obj_frob_file - obj_frob_file (); -#endif /* Set up symbol table, and write it out. */ if (symbol_rootP) @@ -1105,6 +1108,10 @@ write_object_file () } } +#ifdef obj_frob_file + obj_frob_file (); +#endif + /* Now that all the sizes are known, and contents correct, we can start writing the file. */ bfd_map_over_sections (stdoutput, write_contents, (char *) 0); |