summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/brand/shared/brand/Makefile.com5
-rw-r--r--usr/src/lib/brand/solaris10/s10_brand/Makefile.com5
2 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/lib/brand/shared/brand/Makefile.com b/usr/src/lib/brand/shared/brand/Makefile.com
index 0d5afe31f6..f88ee2a794 100644
--- a/usr/src/lib/brand/shared/brand/Makefile.com
+++ b/usr/src/lib/brand/shared/brand/Makefile.com
@@ -55,6 +55,11 @@ CPPFLAGS += -D_REENTRANT -U_ASM -I. -I../sys
CFLAGS += $(CCVERBOSE)
ASFLAGS = -P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys
+#
+# Disable stack protection as this code might be running in an s10 context.
+#
+STACKPROTECT = none
+
# intentional code after abort()
SMOFF += unreachable
diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
index d4c5e5f683..dd3f0c5d73 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
+++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
@@ -84,6 +84,11 @@ DYNFLAGS += $(DYNFLAGS_$(CLASS))
DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start
LDLIBS += -lmapmalloc -lc
+#
+# Disable stack protection as we're running in an s10 context.
+#
+STACKPROTECT = none
+
CERRWARN += $(CNOWARN_UNINIT)
$(LIBS):= PICS += $(SHAREDOBJS)