svn commit: r316513 - head/sys/conf

[John Baldwin]

Author: jhb
Date: Wed Apr  5 03:00:52 2017
New Revision: 316513
URL: https://svnweb.freebsd.org/changeset/base/316513

Log:
  Sync SYSTEM_LD in Makefile.arm with kern.pre.mk.
  
  - Add --no-warn-mismatch.
  - Use same whitespace to make future updates simpler.
  
  Reviewed by:	imp (part of a larger change)
  Sponsored by:	DARPA / AFRL
  Differential Revision:	https://reviews.freebsd.org/D10085

Modified:
  head/sys/conf/Makefile.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Wed Apr  5 02:52:49 2017	(r316512)
+++ head/sys/conf/Makefile.arm	Wed Apr  5 03:00:52 2017	(r316513)
@@ -57,8 +57,9 @@ CFLAGS += -mllvm -arm-enable-ehabi
 genassym.o: bus_if.h device_if.h
 
 SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${_LDFLAGS} \
-	  -warn-common -export-dynamic -dynamic-linker /red/herring -o \
-	   ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
+	--no-warn-mismatch --warn-common --export-dynamic \
+	--dynamic-linker /red/herring \
+	-o ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\
 		>ldscript.$M.noheader; \
 		${SYSTEM_LD_}; \