diff --git a/gas/ChangeLog b/gas/ChangeLog
index 065c9b003d4..869f580c5fe 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-29  Nick Clifton  <nickc@cygnus.com>
+
+	* config/tc-sh.h (SEG_NAME): New macro: return the name of a
+	segment.  Works for both BFD_ASSEMBLER and others.
+	(SUB_SEGMENT_ALIGN): Use SEG_NAME.
+
 2000-03-29  Nick Clifton <nickc@cygnus.com
 
 	* config/tc-arm.c (tinsns): Add "bal" instruction pattern.
diff --git a/gas/config/tc-sh.h b/gas/config/tc-sh.h
index 099e9153919..f5ab8a91829 100644
--- a/gas/config/tc-sh.h
+++ b/gas/config/tc-sh.h
@@ -130,19 +130,21 @@ extern void sh_coff_reloc_mangle
 extern int tc_coff_sizemachdep PARAMS ((fragS *));
 
 #ifdef BFD_ASSEMBLER
-#define SUB_SEGMENT_ALIGN(SEG) 4
+#define SEG_NAME(SEG) segment_name (SEG)
 #else
-/* We align most sections to a 16 byte boundary.  */
-#define SUB_SEGMENT_ALIGN(SEG)					\
-  (strncmp (obj_segment_name (SEG), ".stabstr", 8) == 0		\
-   ? 0								\
-   : ((strncmp (obj_segment_name (SEG), ".stab", 5) == 0	\
-       || strcmp (obj_segment_name (SEG), ".ctors") == 0	\
-       || strcmp (obj_segment_name (SEG), ".dtors") == 0)	\
-      ? 2							\
-      : (sh_small ? 2 : 4)))
+#define SEG_NAME(SEG) obj_segment_name (SEG)
 #endif
 
+/* We align most sections to a 16 byte boundary.  */
+#define SUB_SEGMENT_ALIGN(SEG)				\
+  (strncmp (SEG_NAME (SEG), ".stabstr", 8) == 0		\
+   ? 0							\
+   : ((strncmp (SEG_NAME (SEG), ".stab", 5) == 0	\
+       || strcmp (SEG_NAME (SEG), ".ctors") == 0	\
+       || strcmp (SEG_NAME (SEG), ".dtors") == 0)	\
+      ? 2						\
+      : (sh_small ? 2 : 4)))
+
 #endif /* OBJ_COFF */
 
 #ifdef OBJ_ELF