diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 702f88d456c..edfcda2ca8e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun  4 05:42:23 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.c (barrier_align): Don't return early for normal branch/barrier
+	when optimizing for SH2.
+
 Thu Jun  3 22:27:50 1999  Robert Lipe  <robertlipe@usa.net>
 
 	* i386/udk.h (LINK_SPEC): Correct linker search path for 
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index feca33e1b22..6181783e9e8 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -2712,7 +2712,7 @@ barrier_align (barrier_or_label)
   if (TARGET_SMALLCODE)
     return 0;
 
-  if (! TARGET_SH3 || ! optimize)
+  if (! TARGET_SH2 || ! optimize)
     return CACHE_LOG;
 
   /* When fixing up pcloads, a constant table might be inserted just before