1 files changed, 6 insertions, 28 deletions

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 1910223a9c02..cea2bb1621e6 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -147,23 +147,12 @@
                  * Find irq with highest priority
                  */
                 # open coded PTR_LA t1, cpu_mask_nr_tbl
-#if (_MIPS_SZPTR == 32)
+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
                 # open coded la t1, cpu_mask_nr_tbl
                 lui     t1, %hi(cpu_mask_nr_tbl)
                 addiu   t1, %lo(cpu_mask_nr_tbl)
-
-#endif
-#if (_MIPS_SZPTR == 64)
-                # open coded dla t1, cpu_mask_nr_tbl
-                .set    push
-                .set    noat
-                lui     t1, %highest(cpu_mask_nr_tbl)
-                lui     AT, %hi(cpu_mask_nr_tbl)
-                daddiu  t1, t1, %higher(cpu_mask_nr_tbl)
-                daddiu  AT, AT, %lo(cpu_mask_nr_tbl)
-                dsll    t1, 32
-                daddu   t1, t1, AT
-                .set    pop
+#else
+#error GCC `-msym32' option required for 64-bit DECstation builds
 #endif
 1:              lw      t2,(t1)
                 nop
@@ -214,23 +203,12 @@
                  * Find irq with highest priority
                  */
                 # open coded PTR_LA t1,asic_mask_nr_tbl
-#if (_MIPS_SZPTR == 32)
+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
                 # open coded la t1, asic_mask_nr_tbl
                 lui     t1, %hi(asic_mask_nr_tbl)
                 addiu   t1, %lo(asic_mask_nr_tbl)
-
-#endif
-#if (_MIPS_SZPTR == 64)
-                # open coded dla t1, asic_mask_nr_tbl
-                .set    push
-                .set    noat
-                lui     t1, %highest(asic_mask_nr_tbl)
-                lui     AT, %hi(asic_mask_nr_tbl)
-                daddiu  t1, t1, %higher(asic_mask_nr_tbl)
-                daddiu  AT, AT, %lo(asic_mask_nr_tbl)
-                dsll    t1, 32
-                daddu   t1, t1, AT
-                .set    pop
+#else
+#error GCC `-msym32' option required for 64-bit DECstation builds
 #endif
 2:              lw      t2,(t1)
                 nop