From 0c0c965a8f1982bc7c366490157cec9a38315418 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 6 Sep 2018 19:21:31 +0000
Subject: [PATCH] Re-enable kernel modules for the MALTA64EL kernel
 configuration.

Update the BOOTSTRAPPING check for libelf to require the fix for
mips64el object files committed in r338478 and re-enable kernel
modules in the MALTA64EL config file.

Reviewed by:	emaste
Approved by:	re (gjb)
Differential Revision:	https://reviews.freebsd.org/D17054
---
 Makefile.inc1           | 3 ++-
 sys/mips/conf/MALTA64EL | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8a86727467ac..7716bfd70669 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1933,7 +1933,8 @@ update: .PHONY
 # r296685 fix cross-endian objcopy
 # r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
 # r334881 added libdwarf constants used by ctfconvert.
-.if ${BOOTSTRAPPING} < 1200067
+# r338478 fixed a crash in objcopy for mips64el objects
+.if ${BOOTSTRAPPING} < 1200084
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
diff --git a/sys/mips/conf/MALTA64EL b/sys/mips/conf/MALTA64EL
index 5b87b6e171f4..34df1da7146c 100644
--- a/sys/mips/conf/MALTA64EL
+++ b/sys/mips/conf/MALTA64EL
@@ -9,5 +9,4 @@ include		"std.MALTA"
 machine		mips mips64el
  
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions	MODULES_OVERRIDE=""
 makeoptions 	KERNLOADADDR=0xffffffff80100000