Module Name:    src
Committed By:   christos
Date:           Sat Feb 11 04:56:37 UTC 2017

Modified Files:
        src/crypto/external/bsd/heimdal/lib/libasn1: Makefile

Log Message:
Add hack for profiling bimodal label generation with -m32 on sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile

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

Modified files:

Index: src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3	Sat Jan 28 16:31:51 2017
+++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile	Fri Feb 10 23:56:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:51 christos Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -68,8 +68,19 @@ ${ASN1COMPILEOBJ}/asn1_compile: try_to_b
 SUBDIR=	asn1_compile
 .endif
 
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include <bsd.lib.mk>
 .if ${USETOOLS} != "yes"
 .include <bsd.subdir.mk>
 .endif
+
+.if ${MACHINE_ARCH} == "sparc64"
+# Or anything else that uses PROFILE_HOOK with gcc.
+# What happens is that we end up generating one of two different
+# function orders and since the profile code uses the function
+# number for label generation, we end up with one of two different
+# label orders. Disabling ASLR or optimization fixes it.
+# This happens only with -m32...
+COPTS.asn1_krb5_asn1.c+=-O0
+.endif

Reply via email to