diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 693ea09f3e1dd4435da21a86b03c4404240ea9ad..f5c69d5c07a6015a4d7661f290f3be7948d8f42a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-02 Ben Elliston <bje@au.ibm.com>
+
+ * config/v850/v850.md (casesi): Remove if (0) code.
+ * config/i386/uwin.h (ASM_DECLARE_FUNCTION_NAME): Likewise.
+ * config/alpha/alpha.c (alpha_initialize_trampoline): Likewise.
+
2008-04-01 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.md (rex64suffix): New mode attribute.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 991193f28dc129a7b173fe66c97585c619e3d286..c5923a392fbf28c05b5d9efbbe350507160d1ffe 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -5464,28 +5464,6 @@ alpha_initialize_trampoline (rtx tramp, rtx fnaddr, rtx cxt,
addr = memory_address (mode, plus_constant (tramp, cxtofs));
emit_move_insn (gen_rtx_MEM (mode, addr), cxt);
- /* This has been disabled since the hint only has a 32k range, and in
- no existing OS is the stack within 32k of the text segment. */
- if (0 && jmpofs >= 0)
- {
- /* Compute hint value. */
- temp = force_operand (plus_constant (tramp, jmpofs+4), NULL_RTX);
- temp = expand_binop (DImode, sub_optab, fnaddr, temp, temp, 1,
- OPTAB_WIDEN);
- temp = expand_shift (RSHIFT_EXPR, Pmode, temp,
- build_int_cst (NULL_TREE, 2), NULL_RTX, 1);
- temp = expand_and (SImode, gen_lowpart (SImode, temp),
- GEN_INT (0x3fff), 0);
-
- /* Merge in the hint. */
- addr = memory_address (SImode, plus_constant (tramp, jmpofs));
- temp1 = force_reg (SImode, gen_rtx_MEM (SImode, addr));
- temp1 = expand_and (SImode, temp1, GEN_INT (0xffffc000), NULL_RTX);
- temp1 = expand_binop (SImode, ior_optab, temp1, temp, temp1, 1,
- OPTAB_WIDEN);
- emit_move_insn (gen_rtx_MEM (SImode, addr), temp1);
- }
-
#ifdef ENABLE_EXECUTE_STACK
emit_library_call (init_one_libfunc ("__enable_execute_stack"),
0, VOIDmode, 1, tramp, Pmode);
diff --git a/gcc/config/i386/uwin.h b/gcc/config/i386/uwin.h
index 0c4a767c8bc8dc403fef1cd09861af4668c30bb0..8884b08b7d029adc5dffad3ea1d9e7978d8c3109 100644
--- a/gcc/config/i386/uwin.h
+++ b/gcc/config/i386/uwin.h
@@ -77,10 +77,6 @@ along with GCC; see the file COPYING3. If not see
do \
{ \
i386_pe_maybe_record_exported_symbol (DECL, NAME, 0); \
- /* UWIN binutils bug workaround. */ \
- if (0 && write_symbols != SDB_DEBUG) \
- i386_pe_declare_function_type (FILE, NAME, TREE_PUBLIC (DECL)); \
- ASM_OUTPUT_LABEL (FILE, NAME); \
} \
while (0)
diff --git a/gcc/config/v850/v850.md b/gcc/config/v850/v850.md
index 0f776c802bc53e022352f06ad92034480c5496ab..504a748f4968658f0d3b233d4f3eeaadf6bb81af 100644
--- a/gcc/config/v850/v850.md
+++ b/gcc/config/v850/v850.md
@@ -1250,14 +1250,6 @@
/* Branch to the default label if out of range of the table. */
emit_jump_insn (gen_bgtu (operands[4]));
- /* Disabled because the switch pattern is not being recognized
- properly at the moment. eg. compiling vfscanf.c in newlib. */
- if (0 && ! TARGET_BIG_SWITCH && TARGET_V850E)
- {
- emit_jump_insn (gen_switch (reg, operands[3]));
- DONE;
- }
-
/* Shift index for the table array access. */
emit_insn (gen_ashlsi3 (reg, reg, GEN_INT (TARGET_BIG_SWITCH ? 2 : 1)));
/* Load the table address into a pseudo. */