diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d01598972dc02f5664bc715731d6ee9c0d15e48e..4cbb6110c9d0007d4b5137b97cafed98082fcdac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  DJ Delorie  <dj@redhat.com>
+
+	* config/v850/v850.h (ASM_OUTPUT_ADDR_DIFF_ELT): Disabled the
+	shift, as we've disabled the "switch" insn that needs it.
+
 2006-06-01  Per Bothner  <bothner@bothner.com>
 
 	Suppress extra '#1 <built-in> or '#1 <command line>' on -dD output.
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index c1dbd7831135b6ffabc276d34378b82631abda09..45bcead6d795aa63c6d1df9b604999213fd6e783 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -987,12 +987,14 @@ typedef enum
 
 /* This is how to output an element of a case-vector that is relative.  */
 
+/* Disable the shift, which is for the currently disabled "switch"
+   opcode.  Se casesi in v850.md.  */
 #define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) 		\
   fprintf (FILE, "\t%s %s.L%d-.L%d%s\n",				\
 	   (TARGET_BIG_SWITCH ? ".long" : ".short"),			\
-	   (! TARGET_BIG_SWITCH && TARGET_V850E ? "(" : ""),		\
+	   (0 && ! TARGET_BIG_SWITCH && TARGET_V850E ? "(" : ""),		\
 	   VALUE, REL,							\
-	   (! TARGET_BIG_SWITCH && TARGET_V850E ? ")>>1" : ""))
+	   (0 && ! TARGET_BIG_SWITCH && TARGET_V850E ? ")>>1" : ""))
 
 #define ASM_OUTPUT_ALIGN(FILE, LOG)	\
   if ((LOG) != 0)			\