-int d30v_cleanup PARAMS ((void));
-#define md_after_pass_hook() d30v_cleanup()
-#define md_cleanup() d30v_cleanup()
-#define TC_START_LABEL(ch, ptr) (ch == ':' && d30v_cleanup())
+int d30v_cleanup (int);
+#define md_cleanup() d30v_cleanup (FALSE)
+#define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR) \
+ (NEXT_CHAR == ':' && d30v_cleanup (FALSE))
+void d30v_start_line (void);
+#define md_start_line_hook() d30v_start_line ()
+
+void d30v_frob_label (symbolS *);
+#define tc_frob_label(sym) d30v_frob_label (sym)
+
+void d30v_cons_align (int);
+#define md_cons_align(nbytes) d30v_cons_align (nbytes)