--- a/components/aalib/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/aalib/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -72,8 +72,6 @@
 # here, rather than create multiple identical master files.
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/math

--- a/components/avahi/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/avahi/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -92,9 +92,6 @@
 COMPONENT_POST_INSTALL_ACTION += \
  ( $(PYTHON.$(PYTHON_VERSION)) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES) )
 
-# Enable ASLR for this component
-ASLR_MODE = $(ASLR_ENABLE)
-
 # build standalone sub-components only
 SUBDIRS = avahi-common avahi-core avahi-client avahi-glib avahi-gobject avahi-ui
 $(BUILD_32):	COMPONENT_BUILD_TARGETS		+=	SUBDIRS="$(SUBDIRS)"

--- a/components/cloog/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/cloog/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -144,8 +144,6 @@
      '-e "s/copied $$/copied/g"'  \
      '-e "s/copied [0-9]\{1,\}\./copied/g"'
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/gmp
 REQUIRED_PACKAGES += library/mpfr
 REQUIRED_PACKAGES += library/isl

--- a/components/curl/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/curl/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -95,8 +95,6 @@
 	'-e "/^debug.:/d" ' \
 	'-e "/^monitor debug.:/d" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/libssh2
 REQUIRED_PACKAGES += library/openldap

--- a/components/cyrus-sasl/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/cyrus-sasl/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -192,8 +192,6 @@
 	(cd $(TARBALL_DIR) && $(CHMOD) 0777 $(TEST_SCRIPTS))
 	gtar czf sasltest.tgz $(TARBALL_DIR)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += archiver/gnu-tar
 REQUIRED_PACKAGES += database/berkeleydb-5
 REQUIRED_PACKAGES += developer/build/automake-115

--- a/components/desktop/cairo/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/cairo/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -51,8 +51,6 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 LDFLAGS += $(CC_BITS)
 
 # Needed for "gmake test" to work successfully.

--- a/components/desktop/dbus-glib/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/dbus-glib/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -37,8 +37,6 @@
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 include $(WS_MAKE_RULES)/common.mk
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 CONFIGURE_OPTIONS +=	--sysconfdir="$(ETCDIR)"
 CONFIGURE_OPTIONS +=	--libexecdir="$(USRLIB)"
 CONFIGURE_OPTIONS +=	--localstatedir="$(VARDIR)"

--- a/components/desktop/dbus/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/dbus/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -51,8 +51,6 @@
 CONFIGURE_OPTIONS +=	--localstatedir=$(VARDIR)
 CONFIGURE_OPTIONS +=	--disable-static
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += developer/documentation-tool/xmlto

--- a/components/desktop/exempi/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/exempi/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -37,8 +37,6 @@
 
 TPNO=			25504
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # disable for now since it requires boost C++ libraries
 TEST_TARGET= $(SKIP_TEST)
 

--- a/components/desktop/firefox/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/firefox/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -168,8 +168,6 @@
 	    LD_LIBRARY_PATH=$(PROTOUSRLIBDIR)/firefox-$(IPS_COMPONENT_VERSION) $(BUILD_DIR_32)/dist/bin/shlibsign -v -i $(PROTOUSRLIBDIR)/firefox-$(IPS_COMPONENT_VERSION)/$$f ; \
         done ;
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_TEST_DIR =    $(@D)/js/src
 COMPONENT_TEST_TARGETS=check-jit-test
 COMPONENT_TEST_TRANSFORMS += \

--- a/components/desktop/harfbuzz/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/harfbuzz/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -78,8 +78,6 @@
         '-e "/XERROR:/p" ' \
         '-e "/ERROR:/p" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += developer/build/autoconf
 REQUIRED_PACKAGES += developer/build/automake
 REQUIRED_PACKAGES += developer/build/gnu-make

--- a/components/desktop/libgtkspell/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libgtkspell/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -57,8 +57,6 @@
 	automake -a -c -f ; \
 	autoconf )
 
-ASLR_MODE =	$(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/glib2

--- a/components/desktop/libjpeg/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libjpeg/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -58,6 +58,4 @@
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
-ASLR_MODE =	$(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += shell/ksh93

--- a/components/desktop/libotr/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libotr/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -57,6 +57,4 @@
 	automake -a -c -f ; \
 	autoconf )
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += system/library/security/libgcrypt

--- a/components/desktop/libspectre/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libspectre/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -61,6 +61,4 @@
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS += V=1
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += print/filter/ghostscript

--- a/components/desktop/libtiff/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libtiff/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -63,8 +63,6 @@
         '-e "/FAIL:/p" ' \
         '-e "/ERROR:/p" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 configure:	$(CONFIGURE_32_and_64)
 
 build:          $(BUILD_32_and_64)

--- a/components/desktop/libvpx/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libvpx/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -51,8 +51,6 @@
 LDFLAGS += $(CC_BITS)
 LDFLAGS += -Wl,-zgnu-version-script-compat
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 TEST_TARGET= $(NO_TESTS)
 
 include $(WS_MAKE_RULES)/common.mk

--- a/components/desktop/libwebp/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/libwebp/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -40,8 +40,6 @@
 # Required for 64-bit builds.
 LDFLAGS += $(CC_BITS)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 TEST_TARGET= $(NO_TESTS)
 
 include $(WS_MAKE_RULES)/common.mk

--- a/components/desktop/poppler/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/poppler/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -106,8 +106,6 @@
 # Always show the build and link lines for easier debugging.
 COMPONENT_BUILD_ARGS += V=1
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/libpng
 REQUIRED_PACKAGES += image/library/libtiff

--- a/components/desktop/taglib/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/taglib/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -41,8 +41,6 @@
 
 BUILD_STYLE= cmake
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # disable tests for now - 23214794
 TEST_TARGET= $(SKIP_TEST)
 

--- a/components/desktop/thunderbird/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/desktop/thunderbird/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -195,8 +195,6 @@
 	    $(CP) $$f $(PROTOUSRLIBDIR)/thunderbird-$(COMPONENT_VERSION)/cpu/sparcv8plus/libnspr_flt4.so ; \
 	done ;
 
-ASLR_MODE =	$(ASLR_ENABLE)
-
 COMPONENT_TEST_DIR =    $(@D)/js/src
 COMPONENT_TEST_TARGETS=check-jit-test
 COMPONENT_TEST_TRANSFORMS += \

--- a/components/fastcgi/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/fastcgi/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -54,6 +54,4 @@
 
 COMPONENT_PREP_ACTION = (cd $(@D) ; touch NEWS AUTHORS ChangeLog ; autoreconf -if)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += system/library/c++-runtime

--- a/components/gamin/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/gamin/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -85,7 +85,5 @@
 	cp _gamin.so 64 \
 )
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += runtime/python-27

--- a/components/gd2/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/gd2/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -76,8 +76,6 @@
 	'-e "s|^make.*: Entering directory.*$$|XXX_CC_XXX|g" ' \
 	'-e "/^XXX_CC_XXX$$/d" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/libpng
 REQUIRED_PACKAGES += library/zlib

--- a/components/genders/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/genders/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -37,8 +37,6 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 CONFIGURE_OPTIONS +=   --bindir=/usr/bin
 CONFIGURE_OPTIONS +=   --without-cplusplus-extensions
 CONFIGURE_OPTIONS +=   --without-perl-extensions

--- a/components/gnuefi/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/gnuefi/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -44,8 +44,6 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk 
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 REQUIRED_PACKAGES += developer/gnu-binutils 

--- a/components/gnutls-3/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/gnutls-3/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -269,8 +269,6 @@
 CONFIGURE_OPTIONS += --disable-openssl-compatibility
 CONFIGURE_OPTIONS += --disable-tests
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 $(BUILD_DIR)/wanboot-amd64/.configured: BITS=64

--- a/components/gnutls/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/gnutls/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -50,8 +50,6 @@
 CONFIGURE_OPTIONS  += --disable-guile
 CONFIGURE_OPTIONS  += --disable-camellia
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 COMPONENT_TEST_TRANSFORMS += \

--- a/components/jansson/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/jansson/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -48,5 +48,3 @@
 # jansson_config.h in the build subdirectory. We need to rm the one in the
 # original source so that it doesn't get in the way.
 COMPONENT_PREP_ACTION += $(RM) $(@D)/src/jansson_config.h
-
-ASLR_MODE = $(ASLR_ENABLE)

--- a/components/ksh93/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/ksh93/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -48,9 +48,6 @@
 	'-e "s|\(expected .* sec\).*\(got\).*|\1 \2 x secs|"' \
 	'-e "s|^.*\(shcomp-.*\).*|\1|"'
 
-# Enable ASLR for this component
-ASLR_MODE = $(ASLR_ENABLE)
-
 # This flag controls the prep.mk behaviour to patch each archive individually
 PATCH_EACH_ARCHIVE = 1
 

--- a/components/libconfuse/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libconfuse/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -76,5 +76,3 @@
 TEST_LIBPATH.32 =       $(PROTOUSRLIBDIR)
 TEST_LIBPATH.64 =       $(PROTOUSRLIBDIR64)
 COMPONENT_TEST_ENV +=   LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS))
-
-ASLR_MODE = $(ASLR_ENABLE)

--- a/components/libdnet/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libdnet/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -95,8 +95,6 @@
 TEST_LIBPATH.64 =	$(PROTOUSRLIBDIR64)
 COMPONENT_TEST_ENV +=	LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS))
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += developer/test/check
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += shell/ksh93

--- a/components/libffi/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libffi/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -52,6 +52,4 @@
 
 CONFIGURE_OPTIONS += --disable-raw-api
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime

--- a/components/libgcrypt-15/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libgcrypt-15/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -57,8 +57,6 @@
 $(COMPONENT_DIR)/../libgcrypt/build/$(MACH64)/.installed:
 	$(GMAKE) install
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

--- a/components/libgcrypt/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libgcrypt/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -71,8 +71,6 @@
 CONFIGURE_OPTIONS += --enable-maintainer-mode 
 CONFIGURE_OPTIONS += --disable-asm
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 #

--- a/components/libgpg-error/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libgpg-error/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -46,8 +46,6 @@
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 REQUIRED_PACKAGES += consolidation/desktop/desktop-incorporation

--- a/components/libgsl/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libgsl/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -119,8 +119,6 @@
 # diffs failing due to script tracing in output files.
 unexport SHELLOPTS
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # There are known problems in libsunperf that are causing GSL test failures
 # in Solaris 12 with Studio 12.4 just on the x86 platform:
 # linalg: FAIL:   LQ_update m(5,3) [88]                             (32-bit)

--- a/components/libidn/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libidn/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -118,8 +118,6 @@
 	    $(FIND) ./lib -type f -name "*.pl" -exec touch -acm {} + ; \
 	    $(FIND) ./lib -type f -name "*.pl" -exec chmod 0755 {} + )
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 install: $(INSTALL_32_and_64)
 	$(MKDIR) $(HTMLDOCDIR) ; \
 	list1='$(HTMLDOCLIST)' ; for f in $$list1; do \

--- a/components/libmicrohttpd/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libmicrohttpd/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -48,6 +48,3 @@
 # requires an older automake to reconfigure. 
 COMPONENT_PREP_ACTION += \
 	(cd $(@D); ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf -fiv);
-
-ASLR_MODE = $(ASLR_ENABLE)
-

--- a/components/librsync/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/librsync/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -62,8 +62,6 @@
 
 PROTOUSRSHAREDOCDIR = $(PROTOUSRSHAREDIR)/doc/librsync-0.9.7
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # Master test results are the same for 32-bit and 64-bit, so override
 # here, rather than create multiple identical master files.
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

--- a/components/libsndfile/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libsndfile/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -50,8 +50,6 @@
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "s|\(^SunOS\).*|\1|" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += codec/flac
 REQUIRED_PACKAGES += codec/ogg-vorbis
 REQUIRED_PACKAGES += database/sqlite-3

--- a/components/libtasn1/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libtasn1/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -43,8 +43,6 @@
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --enable-shared
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 include ../../make-rules/shared-targets.mk
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master

--- a/components/libtecla/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libtecla/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -45,5 +45,3 @@
 
 # We have our own pre-Solarified man pages.
 CONFIGURE_OPTIONS +=	--without-man-pages
-
-ASLR_MODE =	$(ASLR_ENABLE)

--- a/components/libusb-1/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libusb-1/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -52,8 +52,6 @@
 
 COMPONENT_BUILD_ARGS+=	-C doc docs
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 PROTOUSRSHAREDOCDIR = $(PROTOUSRSHAREDIR)/doc/libusb-1.0
 
 COMPONENT_PREP_ACTION = (cd $(@D); $(AUTORECONF) -if)

--- a/components/libxml2/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libxml2/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -44,8 +44,6 @@
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 CFLAGS +=	$(CPP_LARGEFILES)
 LDFLAGS +=	$(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
 

--- a/components/libxslt/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/libxslt/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -38,8 +38,6 @@
 SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 LINT_FLAGS +=	-I$(COMPONENT_DIR)/../libxml2/build/prototype/$(MACH)/$(USRINCDIR)/libxml2
 
 CFLAGS +=	$(CPP_LARGEFILES)

--- a/components/mysql-5-6/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/mysql-5-6/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -54,9 +54,6 @@
 SYSTEM_TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
-# Enable ASLR for this component
-ASLR_MODE           = $(ASLR_ENABLE)
-
 # MySQL being one of Oracle's own product doesn't require to have a
 # TPNO License number.
 

--- a/components/ncurses/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/ncurses/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -71,8 +71,6 @@
 COMPONENT_TEST_DIR =		$(BUILD_DIR)/$(MACH$(BITS))/test
 COMPONENT_TEST_TARGETS =
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 $(SKIP_TEST_AT_TOP_LEVEL)
 
 REQUIRED_PACKAGES += shell/bash

--- a/components/net-snmp-57/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/net-snmp-57/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -123,8 +123,6 @@
 	    $(ENV) srcdir=$(@D) $(DOXYGEN) $(@D)/doxygen.conf)
 	$(TOUCH) $@
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)

--- a/components/nettle/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/nettle/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -101,8 +101,6 @@
 COMPONENT_PREP_ACTION = \
 	(cd $(@D) ; ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf -fiv)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 $(BUILD_DIR)/$(MACH32)/.configured: CFLAGS += $(CFLAGS.shared)
 $(BUILD_DIR)/$(MACH32)/.configured: CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.shared)
 $(BUILD_DIR)/$(MACH64)/.configured: CFLAGS += $(CFLAGS.shared)

--- a/components/openexr/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/openexr/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -73,8 +73,6 @@
 	( cd $(PROTOPKGCONFIGDIR.$(BITS)) ; \
 	$(GSED) -i "s^-L$(CONFIGURE_LIBDIR.$(BITS))^^g" OpenEXR.pc )
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/ilmbase
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += system/library/c++-runtime

--- a/components/openssl/openssl-default/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/openssl/openssl-default/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -191,9 +191,6 @@
       $(LN) -fs $(COMPONENT_DIR)/../common/engines/pkcs11/*.[ch]	$(@D)/engines; \
       $(LN) -fs $(COMPONENT_DIR)/wanboot-openssl/wanboot-stubs.c	$(@D)/crypto; )
 
-# Enable ASLR for this component
-ASLR_MODE =	$(ASLR_ENABLE)
-
 # OpenSSL for wanboot is built on sparc only.
 ifeq ($(MACH), sparc)
 BUILD_64 +=	$(BUILD_DIR_WANBOOT)/.built

--- a/components/openssl/openssl-fips-140/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/openssl/openssl-fips-140/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -145,9 +145,6 @@
    ( [ $(BITS) -eq 32 ] && $(GPATCH) -p1 $(@D)/crypto/opensslconf.h \
       patches-post-config/opensslconf.patch; cd $(@D); $(MAKE) depend; )
 
-# Enable ASLR for this component
-ASLR_MODE =	$(ASLR_ENABLE)
-
 # We must make sure that openssl-fips component is built before this openssl-fips-140
 # component since in order to build FIPS-140 certified libraries, the canister
 # is needed. Note that we must unset BITS that would override the same variable

--- a/components/pam_pkcs11/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/pam_pkcs11/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -63,9 +63,6 @@
 CONFIGURE_OPTIONS.32 += --with-pcsclite=no
 CONFIGURE_OPTIONS.64 += --with-pcsclite=yes
 
-
-ASLR_MODE = $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/pcsc/pcsclite

--- a/components/pcre/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/pcre/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -103,8 +103,6 @@
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "s|Testsuite summary for PCRE .*|Testsuite summary for PCRE|" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_INSTALL_ARGS+=	"INSTALL=$(INSTALL)"
 COMPONENT_INSTALL_ARGS+=	"MAKE=$(GMAKE)"
 

--- a/components/pcsc-lite/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/pcsc-lite/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -49,9 +49,6 @@
 # configure.ac related patch needs configure script re-creation
 COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf);
 
-# enable ASLR for this component, lint warning against pcscd will occur if this is not set
-ASLR_MODE=$(ASLR_ENABLE)
-
 # options needed for configure, otherwise default will install into /usr/local
 CONFIGURE_OPTIONS +=    --exec-prefix=$(USRLIBDIR64)
 CONFIGURE_OPTIONS +=    --sbindir=$(USRLIBDIR)

--- a/components/perl/perl522/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/perl/perl522/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -145,8 +145,6 @@
 PKG_MACROS 		+=	P_ARCH=$(shell arch)
 PKG_MACROS		+=	PERL_VERSION=$(PERL_VERSION_LOCAL)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 configure:	$(CONFIGURE_64)
 
 build:		$(BUILD_64)

--- a/components/pflogd/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/pflogd/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -57,8 +57,6 @@
 COMPONENT_INSTALL_ARGS +=	MANDIR=$(PROTOUSRSHAREMANDIR)
 COMPONENT_INSTALL_ARGS +=	INSTALL=/usr/gnu/bin/install
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # common targets
 build:		$(BUILD_64)
 

--- a/components/python/python27/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/python/python27/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -168,8 +168,6 @@
 		$(CONFIG_MAKEFILE); \
 	     $(PYTHON.2.7) -m py_compile lib/python2.7/_sysconfigdata.py)
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # common targets
 $(INSTALL_32):  $(INSTALL_64)
 configure:	$(CONFIGURE_32_and_64)

--- a/components/python/python34/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/python/python34/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -134,8 +134,6 @@
 # 64 bit shared objects need to go in a 64-bit directory
 COMPONENT_INSTALL_ARGS.64 += DESTSHARED=$(CONFIGURE_PREFIX)/lib/python3.4/lib-dynload
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # Simplify the definitions of CC, CXX, CFLAGS and LDFLAGS so they hard-code
 # neither paths from our build systems nor Studio-specific options.
 COMPONENT_PRE_INSTALL_ACTION= \

--- a/components/python/python35/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/python/python35/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -135,8 +135,6 @@
 # 64 bit shared objects need to go in a 64-bit directory
 COMPONENT_INSTALL_ARGS.64 += DESTSHARED=$(CONFIGURE_PREFIX)/lib/python3.5/lib-dynload
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 # Simplify the definitions of CC, CXX, CFLAGS and LDFLAGS so they hard-code
 # neither paths from our build systems nor Studio-specific options.
 COMPONENT_PRE_INSTALL_ACTION= \

--- a/components/samba/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/samba/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -98,7 +98,6 @@
 LDFLAGS +=	$(LIBS)
 $(BUILD_DIR_SMB)/.configured:	LDFLAGS +=	$(LIBS4SMBD)
 
-ASLR_MODE =	$(ASLR_ENABLE)
 LD_OPTIONS += 	$(LD_B_DIRECT)
 
 # --enable-fhs should not be on

--- a/components/serf/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/serf/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -72,8 +72,6 @@
 	'-e "/prototype:/d"' \
 	'-e "/argument/d"'
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 $(BUILD_DIR)/%/.built:  $(SOURCE_DIR)/.prep
 	$(RM) -r $(@D) ; $(MKDIR) $(@D)
 	$(CLONEY) $(SOURCE_DIR) $(@D)

--- a/components/slang/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/slang/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -58,8 +58,6 @@
 	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
 	'-e "/^XXX_CC_XXX$$/d" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 configure:	$(CONFIGURE_32_and_64)
 
 build:		$(BUILD_32_and_64)

--- a/components/tcl/tcl/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/tcl/tcl/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -71,8 +71,6 @@
 COMPONENT_TEST_TRANSFORMER =    $(NAWK)
 COMPONENT_TEST_TRANSFORMS =     "'/append.test/ {results = 1}; /httpold.test/ {results = 0}; /if-old.test/ {results = 1}; /Tests ended at/ {results = 0}; {if (results) print $0 } '"
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_POST_INSTALL_ACTION += \
 	sed -f $(COMPONENT_DIR)/files/tclsed.$(BITS) \
 		$(PROTO_DIR)$(USRLIB.$(BITS))/tclConfig.sh > \

--- a/components/tcl/tk/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/tcl/tk/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -66,8 +66,6 @@
 	'-e "/^Tests began at .*$$/d"' \
 	'-e "/^Tests ended at .*$$/d"'
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_POST_INSTALL_ACTION += \
 	sed -f $(COMPONENT_DIR)/files/tksed.$(BITS) \
 		$(PROTO_DIR)$(USRLIB.$(BITS))/tkConfig.sh > \

--- a/components/tidy/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/tidy/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -68,8 +68,6 @@
 COMPONENT_SYSTEM_TEST_CMD =	./testall.sh
 COMPONENT_SYSTEM_TEST_TARGETS =
 
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_POST_INSTALL_ACTION += \
 		($(MKDIR) $(PROTODOCDIR); \
 		$(CP) -r $(SOURCE_DIR)/htmldoc/api $(PROTODOCDIR))

--- a/components/unixodbc/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/unixodbc/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -97,8 +97,6 @@
 CONFIGURE_ENV  +=   LD="$(CC) $(CFLAGS) $(LDFLAGS)"
 CONFIGURE_ENV  +=   INSTALL="$(INSTALL)"
 
-ASLR_MODE =	$(ASLR_ENABLE)
-
 COMPONENT_POST_INSTALL_ACTION.32 += \
 	($(MKDIR) $(PROTOPKGCONFIGDIR); \
 	$(GSED) -e 's|SED_SIZEOF_LONG|4|g' \

--- a/components/wxwidgets/Makefile	Thu Aug 04 09:42:22 2016 -0700
+++ b/components/wxwidgets/Makefile	Thu Aug 04 10:41:57 2016 -0700
@@ -58,8 +58,6 @@
 CONFIGURE_OPTIONS += --with-opengl
 CONFIGURE_OPTIONS += --without-libmpack
 
-ASLR_MODE =   $(ASLR_ENABLE)
-
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/libpng
 REQUIRED_PACKAGES += image/library/libtiff

--- a/make-rules/common.mk	Thu Aug 04 09:42:22 2016 -0700
+++ b/make-rules/common.mk	Thu Aug 04 10:41:57 2016 -0700
@@ -96,10 +96,6 @@
 COMPONENT_BUILD_ENV += LDFLAGS="$(strip $(LDFLAGS))"
 endif
 
-# Assume that components categorized as a library do not need ASLR.
-ifeq ($(findstring library/,$(COMPONENT_BUGDB)),library/)
-ASLR_MODE= $(ASLR_NOT_APPLICABLE)
-else
 # Assume components built with ant do not need ASLR.
 ifeq ($(strip $(BUILD_STYLE)),ant)
 ASLR_MODE= $(ASLR_NOT_APPLICABLE)
@@ -109,7 +105,6 @@
 ASLR_MODE= $(ASLR_ENABLE)
 endif # BUILD_BITS NO_ARCH
 endif # BUILD_STYLE ant
-endif # findstring library
 
 # Determine if we should automatically include lint libraries in build and
 # install targets based on presence of llib* files in component directory. This

--- a/make-rules/shared-macros.mk	Thu Aug 04 09:42:22 2016 -0700
+++ b/make-rules/shared-macros.mk	Thu Aug 04 10:41:57 2016 -0700
@@ -1005,15 +1005,15 @@
 ASLR_DISABLE = 		-zaslr=disable
 ASLR_NOT_APPLICABLE = 	-zaslr=disable
 
-# Disable ASLR by default unless target build is NO_ARCH.
+# Enable ASLR by default unless target build is NO_ARCH.
 ifeq ($(strip $(BUILD_BITS)),NO_ARCH)
 ASLR_MODE= $(ASLR_NOT_APPLICABLE)
 else
-ASLR_MODE= $(ASLR_DISABLE)
+ASLR_MODE= $(ASLR_ENABLE)
 endif
 
-# by default, turn off Address Space Layout Randomization for ELF executables;
-# to explicitly enable ASLR, set ASLR_MODE = $(ASLR_ENABLE)
+# by default, turn on Address Space Layout Randomization for ELF executables;
+# to explicitly disable ASLR, set ASLR_MODE = $(ASLR_DISABLE)
 # in that component's Makefile
 LD_Z_ASLR =		$(ASLR_MODE)