dtrace: fix dtrace_sdt.sh for UEK4

The new base kernel for UEK4 no longer defines ARCH as x86_64 or sparc64,
but rather as x86 and sparc (and 32/64 is handled on a per-arch level).  So,
various conditionals in this script needed updating.  This commit also gets
rid of some debugging output.

Orabug: 20456825

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Nick Alcock <nick.alcock@oracle.com>

diff --git a/scripts/dtrace_sdt.sh b/scripts/dtrace_sdt.sh
index 6399dcd31da84599f7a84393faeaa86e7f55d083..1fce667026ca00e3aaa054db5e0664af144796e7 100755 (executable)
--- a/scripts/dtrace_sdt.sh
+++ b/scripts/dtrace_sdt.sh
@@ -36,9 +36,9 @@ if [ "$opr" = "sdtstub" ]; then
 
                 END {
                     if (count) {
-                        if (arch == "x86_64") {
+                        if (arch == "x86" || arch == "x86_64") {
                             print "\tret";
-                        } else if (arch == "sparc64") {
+                        } else if (arch == "sparc" || arch == "sparc64") {
                             print "\tretl";
                             print "\tnop";
                         }
@@ -99,7 +99,6 @@ fi
        sort
     [ "x${lfn}" != "x" -a "x${lfn}" != "xkmod" ] && nm ${lfn}
 ) | \
-  tee /tmp/DEBUG | \
     awk -v lfn="${lfn}" \
        -v arch=${ARCH} \
        'function addl(v0, v1, v0h, v0l, v1h, v1l, d, tmp) {
@@ -201,7 +200,7 @@ fi
                     pn = fun":"prb;
                     ad = addl(baseaddr, poffst[pn]);
 
-                    if (arch == "x86_64")
+                    if (arch == "x86" || arch == "x86_64")
                         ad = subl(ad, 1);
 
                     if (lfn != "kmod") {