[MIPS] Remove CONFIG_BUILD_ELF64.

This option is no longer usable with supported compilers.  It will be
replaced by usage of -msym32 in a separate patch.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 3d8dac681c6352de5aab10e7a19deff067ae24c3..c626dd5942f6f1e36d3c20e2fa5ad8e5cfbc5ce5 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -70,18 +70,20 @@ CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN)      += -D__MIPSEL__
 
 CHECKFLAGS                             = $(CHECKFLAGS-y)
 
-ifdef CONFIG_BUILD_ELF64
-gas-abi                        = 64
-ld-emul                        = $(64bit-emul)
-vmlinux-32             = vmlinux.32
-vmlinux-64             = vmlinux
-else
+ifdef CONFIG_32BIT
 gas-abi                        = 32
 ld-emul                        = $(32bit-emul)
 vmlinux-32             = vmlinux
 vmlinux-64             = vmlinux.64
+endif
 
-cflags-$(CONFIG_64BIT) += $(call cc-option,-mno-explicit-relocs)
+ifdef CONFIG_64BIT
+gas-abi                        = 64
+ld-emul                        = $(64bit-emul)
+vmlinux-32             = vmlinux.32
+vmlinux-64             = vmlinux
+
+cflags-y               += $(call cc-option,-mno-explicit-relocs)
 endif
 
 #
@@ -630,7 +632,6 @@ endif
 ifdef CONFIG_SGI_IP27
 core-$(CONFIG_SGI_IP27)                += arch/mips/sgi-ip27/
 cflags-$(CONFIG_SGI_IP27)      += -Iinclude/asm-mips/mach-ip27
-ifdef CONFIG_BUILD_ELF64
 ifdef CONFIG_MAPPED_KERNEL
 load-$(CONFIG_SGI_IP27)                += 0xc00000004001c000
 OBJCOPYFLAGS                   := --change-addresses=0x3fffffff80000000
@@ -639,16 +640,6 @@ else
 load-$(CONFIG_SGI_IP27)                += 0xa80000000001c000
 OBJCOPYFLAGS                   := --change-addresses=0x57ffffff80000000
 endif
-else
-ifdef CONFIG_MAPPED_KERNEL
-load-$(CONFIG_SGI_IP27)                += 0xffffffffc001c000
-OBJCOPYFLAGS                   := --change-addresses=0xc000000080000000
-dataoffset-$(CONFIG_SGI_IP27)  += 0x01000000
-else
-load-$(CONFIG_SGI_IP27)                += 0xffffffff8001c000
-OBJCOPYFLAGS                   := --change-addresses=0xa800000080000000
-endif
-endif
 endif
 
 #

diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 6fd353779813835a5da72a7f101f2e535c118413..e39f1da62976361b4f168b889c47bfa2e6d9c993 100644 (file)
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -247,7 +247,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-CONFIG_BUILD_ELF64=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 58c22cd344d3570ee8efea3f7b4b49d8b12d041d..009ec9d9773882fa8a24debd5f49092866c6feb3 100644 (file)
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -234,7 +234,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-CONFIG_BUILD_ELF64=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index a34db6e82b27c07cd123bba3a86b11882f281f18..54afa2556f5f659c6b9a4b6f2403fa8752e9bdd8 100644 (file)
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -224,7 +224,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
-# CONFIG_BUILD_ELF64 is not set
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index e8d6bb3551a2d2003c881545683a60cd5eef7677..a8fc4c6c10c921a6c7067dae89606a711d066e7b 100644 (file)
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -220,7 +220,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_BUILD_ELF64 is not set
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index b6126ad4d06d22c4a300b7a6807839f455263f16..dab6c896fbb7be30452909dd9b48047f024e64de 100644 (file)
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -223,7 +223,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_BUILD_ELF64 is not set
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 52048c906079a4f8d5774a22983771339ecf38ad..6481fb2426f69f217d6e904783af21350e4a09a3 100644 (file)
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -247,7 +247,6 @@ CONFIG_MMU=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_BUILD_ELF64 is not set
 CONFIG_MIPS32_COMPAT=y
 CONFIG_COMPAT=y
 CONFIG_MIPS32_O32=y

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index d9293c558e413a7020a0c9467d8788afde3ac34f..0cb3b6097e0efecdf1a5ca9142258e5248adc47d 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -447,21 +447,10 @@ static inline void resource_init(void)
 {
        int i;
 
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-       /*
-        * The 64bit code in 32bit object format trick can't represent
-        * 64bit wide relocations for linker script symbols.
-        */
-       code_resource.start = CPHYSADDR(&_text);
-       code_resource.end = CPHYSADDR(&_etext) - 1;
-       data_resource.start = CPHYSADDR(&_etext);
-       data_resource.end = CPHYSADDR(&_edata) - 1;
-#else
        code_resource.start = virt_to_phys(&_text);
        code_resource.end = virt_to_phys(&_etext) - 1;
        data_resource.start = virt_to_phys(&_etext);
        data_resource.end = virt_to_phys(&_edata) - 1;
-#endif
 
        /*
         * Request address space for all standard RAM.

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index ac4f4bfaae50af41ddf5184cd4e87e4c3752536f..599b3c297186d360e3ce05cfd8f5135a827d021a 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -951,7 +951,6 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
        /* No i_nop needed here, since the next insn doesn't touch TMP. */
 
 #ifdef CONFIG_SMP
-# ifdef CONFIG_BUILD_ELF64
        /*
         * 64 bit SMP running in XKPHYS has smp_processor_id() << 3
         * stored in CONTEXT.
@@ -962,18 +961,6 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
        i_daddu(p, ptr, ptr, tmp);
        i_dmfc0(p, tmp, C0_BADVADDR);
        i_ld(p, ptr, rel_lo(pgdc), ptr);
-# else
-       /*
-        * 64 bit SMP running in compat space has the lower part of
-        * &pgd_current[smp_processor_id()] stored in CONTEXT.
-        */
-       if (!in_compat_space_p(pgdc))
-               panic("Invalid page directory address!");
-
-       i_dmfc0(p, ptr, C0_CONTEXT);
-       i_dsra(p, ptr, ptr, 23);
-       i_ld(p, ptr, 0, ptr);
-# endif
 #else
        i_LA_mostly(p, ptr, pgdc);
        i_ld(p, ptr, rel_lo(pgdc), ptr);

diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h
index 19cdf7642e66c8753cc8b9fe225cc7dcd3fa357f..61cf22588137a3505c3d469c0da618734fbea190 100644 (file)
--- a/include/asm-mips/mmu_context.h
+++ b/include/asm-mips/mmu_context.h
@@ -33,12 +33,7 @@ extern unsigned long pgd_current[];
        write_c0_context((unsigned long) smp_processor_id() << 25);     \
        TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
 #endif
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-#define TLBMISS_HANDLER_SETUP()                                                \
-       write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \
-       TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
-#endif
-#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
 #define TLBMISS_HANDLER_SETUP()                                                \
        write_c0_context((unsigned long) smp_processor_id() << 26);     \
        TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)

diff --git a/include/asm-mips/sn/mapped_kernel.h b/include/asm-mips/sn/mapped_kernel.h
index 3a17846df8497d319ed7112fdff2013f4309e989..59edb20f8ec50b492fe7d2c66d7b0ffd5ad198ea 100644 (file)
--- a/include/asm-mips/sn/mapped_kernel.h
+++ b/include/asm-mips/sn/mapped_kernel.h
@@ -23,11 +23,7 @@
 #include <linux/config.h>
 #include <asm/addrspace.h>
 
-#ifdef CONFIG_BUILD_ELF64
 #define REP_BASE       CAC_BASE
-#else
-#define REP_BASE       CKSEG0
-#endif
 
 #ifdef CONFIG_MAPPED_KERNEL
 

diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index a8919dcc93c8661ea16cffbc6fa68df5ac49f8c8..2acf3e844f0001951dcad3ed848eccdde9cba824 100644 (file)
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -63,17 +63,7 @@
                addu    k1, k0
                LONG_L  k1, %lo(kernelsp)(k1)
 #endif
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-               MFC0    k1, CP0_CONTEXT
-               dsra    k1, 23
-               lui     k0, %hi(pgd_current)
-               addiu   k0, %lo(pgd_current)
-               dsubu   k1, k0
-               lui     k0, %hi(kernelsp)
-               daddu   k1, k0
-               LONG_L  k1, %lo(kernelsp)(k1)
-#endif
-#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
                MFC0    k1, CP0_CONTEXT
                lui     k0, %highest(kernelsp)
                dsrl    k1, 23
@@ -91,11 +81,7 @@
                mfc0    \temp, CP0_CONTEXT
                srl     \temp, 23
 #endif
-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-               lw      \temp, TI_CPU(gp)
-               dsll    \temp, 3
-#endif
-#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
                MFC0    \temp, CP0_CONTEXT
                dsrl    \temp, 23
 #endif
@@ -103,7 +89,7 @@
                .endm
 #else
                .macro  get_saved_sp    /* Uniprocessor variation */
-#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
+#ifdef CONFIG_64BIT
                lui     k1, %highest(kernelsp)
                daddiu  k1, %higher(kernelsp)
                dsll    k1, k1, 16