svn commit: r338506 - in head: . sys/mips/conf

[John Baldwin]

Author: jhb
Date: Thu Sep  6 19:21:31 2018
New Revision: 338506
URL: https://svnweb.freebsd.org/changeset/base/338506

Log:
  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

Modified:
  head/Makefile.inc1
  head/sys/mips/conf/MALTA64EL

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Sep  6 18:51:52 2018	(r338505)
+++ head/Makefile.inc1	Thu Sep  6 19:21:31 2018	(r338506)
@@ -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
 

Modified: head/sys/mips/conf/MALTA64EL
==============================================================================
--- head/sys/mips/conf/MALTA64EL	Thu Sep  6 18:51:52 2018	(r338505)
+++ head/sys/mips/conf/MALTA64EL	Thu Sep  6 19:21:31 2018	(r338506)
@@ -9,5 +9,4 @@ include		"std.MALTA"
 machine		mips mips64el
  
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions	MODULES_OVERRIDE=""
 makeoptions 	KERNLOADADDR=0xffffffff80100000