summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-08-30 14:50:07 +0000
committerJohn Levon <john.levon@joyent.com>2019-09-04 06:54:48 -0700
commitd58ceae2ed78dc65ab682a0281ce523d6c4116fe (patch)
tree428c45ea5ad53eb9578f1cb674cbbd8d2742f5e9
parenta8ea0c9dd566453d9b69eab5f863930da9d0c4ae (diff)
downloadillumos-joyent-d58ceae2ed78dc65ab682a0281ce523d6c4116fe.tar.gz
11646 fbt entry probes incorrectly placed due to -fshrink-wrap
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/uts/Makefile.uts11
1 files changed, 10 insertions, 1 deletions
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index 033d50a146..e20d768803 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -25,7 +25,7 @@
# Copyright (c) 2011,2017 by Delphix. All rights reserved.
# Copyright (c) 2013 Andrew Stormont. All rights reserved.
# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-# Copyright (c) 2019, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
#
#
@@ -241,6 +241,14 @@ include $(SRC)/Makefile.smatch
#
SMOFF += sizeof
+#
+# Ensure that the standard function prologue remains at the very start
+# of a function, so DTrace fbt will instrument the right place.
+#
+CFLAGS_uts_i386 += -_gcc7=-fno-shrink-wrap
+CFLAGS_uts_i386 += -_gcc8=-fno-shrink-wrap
+CFLAGS_uts_i386 += -_gcc9=-fno-shrink-wrap
+
CSTD = $(CSTD_GNU99)
CFLAGS_uts =
@@ -257,6 +265,7 @@ CFLAGS_uts += $(CGLOBALSTATIC)
CFLAGS_uts += $(EXTRA_CFLAGS)
CFLAGS_uts += $(CSOURCEDEBUGFLAGS)
CFLAGS_uts += $(CUSERFLAGS)
+CFLAGS_uts += $(CFLAGS_uts_$(MACH))
#
# Declare that $(OBJECTS) and $(LINTS) can be compiled in parallel.