Module Name:    src
Committed By:   martin
Date:           Sun May  1 07:25:46 UTC 2016

Modified Files:
        src/lib/csu/common: Makefile.inc

Log Message:
Revert previous (fallout is more subtle but there).
Rework the conditionon so it depends on .S existence instead of an arch
list.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/csu/common/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.29 src/lib/csu/common/Makefile.inc:1.30
--- src/lib/csu/common/Makefile.inc:1.29	Sat Apr 30 13:12:13 2016
+++ src/lib/csu/common/Makefile.inc	Sun May  1 07:25:46 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.29 2016/04/30 13:12:13 martin Exp $
+#	$NetBSD: Makefile.inc,v 1.30 2016/05/01 07:25:46 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -20,8 +20,7 @@ CFLAGS.crtbegin.c+= -fPIE
 # XXXGCC5 - GCC 5 miscompiles crtbeginS.c on many platforms.  on SPARC it
 # XXXGCC5   emits "clr %g1; call %g1", which is effectively jumping to zero.
 . if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && \
-     ${CSU_MACHINE_ARCH} != "i386" && ${CSU_MACHINE_ARCH} != "amd64" && \
-     ${CSU_MACHINE_ARCH} != "sparc64"
+     !exists(${ARCHDIR}/crtbegin.S)
 CFLAGS.crt0-common.c+=	-O1
 CFLAGS.crtbeginS.c+=	-O1
 . endif

Reply via email to