Conceal ugly code behing macro.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5f8a12731d04f7a39a8807a940970ed9592715a1..501bc96aaedf3b2d9a3bb3f758054e8d1bbea06b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun 23 13:54:57 1998  Nick Clifton  <nickc@cygnus.com>
+
+       * config/obj-coff.h (SYM_AUXINFO): New macro to conceal ugly
+       code. 
+
+       * config/obj-coff.c (c_symbol_merge): Replace complex expresion
+       with call to macro SYM_AUXINFO.
+
 Tue Jun 23 15:09:27 1998  Mike Stump  <mrs@wrs.com>
 
        * Makefile.am (install-exec-local): Don't let EXEEXT interfere

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 0148c639b24c9018231b122a3a23076adc6e73fa..351fdb46824834e4ebcb3b7f0678c94a39e55f63 100644 (file)
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -1,5 +1,5 @@
 /* coff object file format
-   Copyright (C) 1989, 90, 91, 92, 94, 95, 96, 1997
+   Copyright (C) 1989, 90, 91, 92, 94, 95, 96, 97, 1998
    Free Software Foundation, Inc.
 
    This file is part of GAS.
@@ -127,6 +127,11 @@
 #define TARGET_FORMAT "coff-w65"
 #endif
 
+#ifdef TC_TIC30
+#include "coff/tic30.h"
+#define TARGET_FORMAT "coff-tic30"
+#endif
+
 /* start-sanitize-tic80 */
 #ifdef TC_TIC80
 #include "coff/tic80.h"
@@ -209,6 +214,7 @@ extern void coff_obj_read_begin_hook PARAMS ((void));
 #define sy_obj                 sy_flags
 
 #define SYM_AUXENT(S)  (&coffsymbol ((S)->bsym)->native[1].u.auxent)
+#define SYM_AUXINFO(S) (&coffsymbol ((S)->bsym)->native[1])
 
 #define DO_NOT_STRIP   0