aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorSean Eric Fagan <sef@cygnus>1992-04-07 22:18:18 +0000
committerSean Eric Fagan <sef@cygnus>1992-04-07 22:18:18 +0000
commit343fb08da8ce55884033aabb59b166b432c97a78 (patch)
tree3b082545de296b8bf2fab4b0d30bed0c7c5b827b /gas
parentda7aaffbae21e9ecc3e3a29a5d64219b966b3d0d (diff)
downloadgdb-343fb08da8ce55884033aabb59b166b432c97a78.zip
gdb-343fb08da8ce55884033aabb59b166b432c97a78.tar.gz
gdb-343fb08da8ce55884033aabb59b166b432c97a78.tar.bz2
Change a series of #if/#elif to #if/#else/#if.../#endif. The apollo
compiler lies about being ANSI conformant.
Diffstat (limited to 'gas')
-rw-r--r--gas/write.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/gas/write.c b/gas/write.c
index 8f9a574..d061bad 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -75,11 +75,7 @@ void relax_segment();
*
* Create a fixS in obstack 'notes'.
*/
-fixS *fix_new(frag, where, size, add_symbol, sub_symbol, offset, pcrel
-#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
- , r_type
-#endif
- )
+fixS *fix_new(frag, where, size, add_symbol, sub_symbol, offset, pcrel, r_type)
fragS *frag; /* Which frag? */
int where; /* Where in that frag? */
short int size; /* 1, 2, or 4 usually. */
@@ -87,9 +83,7 @@ symbolS *add_symbol; /* X_add_symbol. */
symbolS *sub_symbol; /* X_subtract_symbol. */
long offset; /* X_add_number. */
int pcrel; /* TRUE if PC-relative relocation. */
-#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
int r_type; /* Relocation type */
-#endif
{
fixS *fixP;
@@ -388,17 +382,19 @@ void write_object_file()
lie->sub,
lie->addnum,
0, 0, 2, 0, 0);
-#elif defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
+#else
+# if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
fix_new( lie->frag, lie->word_goes_here - lie->frag->fr_literal,
2, lie->add,
lie->sub, lie->addnum,
0, NO_RELOC);
-#else
+# else
fix_new( lie->frag, lie->word_goes_here - lie->frag->fr_literal,
2, lie->add,
lie->sub, lie->addnum,
0, 0);
+# endif /* tc_sparc|tc_a29k|need_fx_r_type */
#endif /* TC_NS32K */
/* md_number_to_chars(lie->word_goes_here,
S_GET_VALUE(lie->add)