Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips Don't compile the mips64 stuff if we bein...



details:   https://anonhg.NetBSD.org/src/rev/4c1fdc636397
branches:  trunk
changeset: 338701:4c1fdc636397
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jun 04 22:44:43 2015 +0000

description:
Don't compile the mips64 stuff if we being compiled as mips32

diffstat:

 sys/arch/mips/mips/locore_mips3.S |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 3b752dc7fbf5 -r 4c1fdc636397 sys/arch/mips/mips/locore_mips3.S
--- a/sys/arch/mips/mips/locore_mips3.S Thu Jun 04 16:11:48 2015 +0000
+++ b/sys/arch/mips/mips/locore_mips3.S Thu Jun 04 22:44:43 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips3.S,v 1.105 2015/06/04 05:58:17 matt Exp $  */
+/*     $NetBSD: locore_mips3.S,v 1.106 2015/06/04 22:44:43 matt Exp $  */
 
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -235,10 +235,10 @@
 
 #if (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0
        .set push
-#ifdef _LP64
+#ifdef __mips_o32
+       .set mips32
+#else
        .set mips64
-#else
-       .set mips32
 #endif
 /*
  * uint32_t mipsNN_cp0_config1_read(void)
@@ -498,6 +498,7 @@
        JR_HB_RA
 END(mips3_cp0_pg_mask_write)
 
+#if __mips != 32
 LEAF(mips3_ld)
 #if defined(__mips_o32)
        mfc0    t0, MIPS_COP_0_STATUS           # turn off interrupts
@@ -695,6 +696,7 @@
        jr      ra
         nop
 END(mips3_cp0_tlb_entry_lo_probe)
+#endif /* __mips != 32 */
 
 /*
  * uint32_t mips3_cp0_tlb_page_mask_probe(void);



Home | Main Index | Thread Index | Old Index