svn commit: r279796 - in stable: 10/sys/boot/i386/boot2 10/sys/boot/pc98/boot2 9/sys/boot/i386/boot2 9/sys/boot/pc98/boot2

[Dimitry Andric]

Author: dim
Date: Sun Mar  8 22:50:45 2015
New Revision: 279796
URL: https://svnweb.freebsd.org/changeset/base/279796

Log:
  MFC r279598:
  
  When compiling boot2 with gcc on i386 and pc98, only use the custom flag
  -mno-align-long-strings when compiling with base gcc.  This is checked
  by comparing the version number against 4.2.1, which is not exactly
  right, but good enough.  (There is no other way to check whether we are
  using the non-standard gcc in base, as far as I know.)
  
  Reported by:	rodrigc

Modified:
  stable/9/sys/boot/i386/boot2/Makefile
  stable/9/sys/boot/pc98/boot2/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/boot/i386/boot2/Makefile
  stable/10/sys/boot/pc98/boot2/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/boot/i386/boot2/Makefile
==============================================================================
--- stable/9/sys/boot/i386/boot2/Makefile	Sun Mar  8 22:49:34 2015	(r279795)
+++ stable/9/sys/boot/i386/boot2/Makefile	Sun Mar  8 22:50:45 2015	(r279796)
@@ -42,8 +42,10 @@ CFLAGS=	-Os \
 
 CFLAGS.gcc+=	-fno-guess-branch-probability \
 		-fno-unit-at-a-time \
-		-mno-align-long-strings \
 		--param max-inline-insns-single=100
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
+CFLAGS.gcc+=   -mno-align-long-strings
+.endif
 
 LD_FLAGS=-static -N --gc-sections
 

Modified: stable/9/sys/boot/pc98/boot2/Makefile
==============================================================================
--- stable/9/sys/boot/pc98/boot2/Makefile	Sun Mar  8 22:49:34 2015	(r279795)
+++ stable/9/sys/boot/pc98/boot2/Makefile	Sun Mar  8 22:50:45 2015	(r279796)
@@ -27,7 +27,6 @@ CFLAGS=	-Os \
 	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
 	-fno-unit-at-a-time \
-	-mno-align-long-strings \
 	-mrtd \
 	-mregparm=3 \
 	-D${BOOT2_UFS} \
@@ -45,6 +44,9 @@ CFLAGS=	-Os \
 	-Winline
 
 CFLAGS.gcc+=	--param max-inline-insns-single=100
+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
+CFLAGS.gcc+=   -mno-align-long-strings
+.endif
 
 # Set machine type to PC98_SYSTEM_PARAMETER
 #CFLAGS+=	-DSET_MACHINE_TYPE