diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bcc30b4a223..62bb6f6b7e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-29  Hariharan Sandanagobalane <hariharan@picochip.com>
+
+	* config/picochip/picochip.c (picochip_output_internal_label):
+	  This function can now be called for debug CFI labels, which can come in
+	  the middle of a vliw instruction. Postpone until end of vliw.
+
 2010-09-29  Richard Guenther  <rguenther@suse.de>
 
 	* tree.h (SCOPE_FILE_SCOPE_P): New macro.
diff --git a/gcc/config/picochip/picochip.c b/gcc/config/picochip/picochip.c
index 9bd2382915b..1671c41b651 100644
--- a/gcc/config/picochip/picochip.c
+++ b/gcc/config/picochip/picochip.c
@@ -1637,6 +1637,18 @@ picochip_output_internal_label (FILE * stream, const char *prefix,
 	  sprintf (picochip_current_vliw_state.lm_label_name,
 		   "picoMark_%s%ld", prefix, num);
 	}
+      else if (picochip_schedule_type == DFA_TYPE_SPEED &&
+	  (strcmp (prefix, "LCFI")) == 0 && picochip_vliw_continuation)
+	{
+          if (picochip_current_vliw_state.num_cfi_labels_deferred == 2)
+          {
+            internal_error ("LCFI labels have already been deferred.");
+          }
+          sprintf(picochip_current_vliw_state.cfi_label_name[
+                    picochip_current_vliw_state.num_cfi_labels_deferred], 
+                  "picoMark_%s%ld", prefix, num);
+          picochip_current_vliw_state.num_cfi_labels_deferred++;
+	}
       else
 	{
 	  /* Marker label. */