Index: branches/2018Q3/www/firefox/Makefile.options
===================================================================
--- branches/2018Q3/www/firefox/Makefile.options	(revision 480912)
+++ branches/2018Q3/www/firefox/Makefile.options	(revision 480913)
@@ -1,30 +1,33 @@
 # -*- makefile-bsdmake -*-
 
 OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
 			INTEGER_SAMPLES LIBPROXY \
 			OPTIMIZED_CFLAGS PROFILE TEST
 
-OPTIONS_DEFAULT+=	DBUS DTRACE FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \
+OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \
 			${OPTIONS_MULTI_AUDIO:NSNDIO} \
 			${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA JACK PULSEAUDIO SNDIO
 
 # WebRTC legacy audio library only supports ALSA and PulseAudio
 JACK_IMPLIES=		ALSA
 
 # dragonfly, sparc64, riscv
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
-OPTIONS_EXCLUDE_aarch64=	DTRACE
+# opensolaris/lib/libdtrace/common/dt_link.c:
+#   <arch> not implemented
+#   failed to allocate space for probe
+OPTIONS_DEFAULT_amd64+=	DTRACE
+OPTIONS_DEFAULT_i386+=	DTRACE
 
 BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
 INTEGER_SAMPLES_DESC?=	Integer audio sample format
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 RUST_DESC?=		Build with components written in Rust language
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 480912)
+++ branches/2018Q3	(revision 480913)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r480912