git: d11ff7f93386 - main - opensolaris: remove references to sparc

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=d11ff7f93386f36a385ea01498fd9ff9ff3862ce

commit d11ff7f93386f36a385ea01498fd9ff9ff3862ce
Author:     Minsoo Choo <minsoochoo0122@proton.me>
AuthorDate: 2025-11-30 18:56:26 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-12-01 14:19:19 +0000

    opensolaris: remove references to sparc
    
    Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>
    
    Reviewed by:    markj
    MFC after:      1 week
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/1907
---
 .../cmd/dtrace/test/cmd/jdtrace/exception.lst           |  1 -
 .../cmd/dtrace/test/tst/common/safety/tst.vahole.d      |  4 ----
 .../opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h  |  9 ---------
 cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c | 13 -------------
 .../opensolaris/lib/libdtrace/common/dt_program.c       | 17 +++--------------
 cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c          |  4 ----
 6 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst
index 19fc3aca51c2..035dd5cb694e 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst
@@ -66,7 +66,6 @@ common/usdt/tst.reeval.ksh
 common/usdt/tst.static.ksh
 common/usdt/tst.static2.ksh
 common/usdt/tst.user.ksh
-sparc/usdt/tst.tailcall.ksh
 common/pid/tst.provregex3.ksh
 common/pid/tst.provregex4.ksh
 
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d
index 2ef40a5ac474..a285509316d9 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d
@@ -38,11 +38,7 @@
 fbt:::
 {
 	n++;
-#ifdef __sparc
-	trace(*(int *)0x8000000000000000 ^ rand());
-#else
 	trace(*(int *)(`kernelbase - 1));
-#endif
 }
 
 dtrace:::ERROR
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h
index e29654edb672..bebf9754f691 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h
@@ -15,21 +15,12 @@ extern "C" {
 
 #define	TESTER_ENTRY() \
 	__dtrace_tester___entry()
-#ifndef	__sparc
 #define	TESTER_ENTRY_ENABLED() \
 	__dtraceenabled_tester___entry()
-#else
-#define	TESTER_ENTRY_ENABLED() \
-	__dtraceenabled_tester___entry(0)
-#endif
 
 
 extern void __dtrace_tester___entry(void);
-#ifndef	__sparc
 extern int __dtraceenabled_tester___entry(void);
-#else
-extern int __dtraceenabled_tester___entry(long);
-#endif
 
 #else
 
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
index 40200771fd4d..f2352ffe832a 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
@@ -1263,19 +1263,6 @@ alloc:
 	else if (flags & DTRACE_O_ILP32)
 		dtp->dt_conf.dtc_ctfmodel = CTF_MODEL_ILP32;
 
-#ifdef __sparc
-	/*
-	 * On SPARC systems, __sparc is always defined for <sys/isa_defs.h>
-	 * and __sparcv9 is defined if we are doing a 64-bit compile.
-	 */
-	if (dt_cpp_add_arg(dtp, "-D__sparc") == NULL)
-		return (set_open_errno(dtp, errp, EDT_NOMEM));
-
-	if (dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_LP64 &&
-	    dt_cpp_add_arg(dtp, "-D__sparcv9") == NULL)
-		return (set_open_errno(dtp, errp, EDT_NOMEM));
-#endif
-
 #ifdef illumos
 #ifdef __x86
 	/*
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
index 232a3723b11d..ca7bf407290f 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
@@ -441,12 +441,8 @@ dt_header_decl(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
 		return (dt_set_errno(dtp, errno));
 
 	if (fprintf(infop->dthi_out,
-	    "#ifndef\t__sparc\n"
-	    "extern int __dtraceenabled_%s___%s(void);\n"
-	    "#else\n"
-	    "extern int __dtraceenabled_%s___%s(long);\n"
-	    "#endif\n",
-	    infop->dthi_pfname, fname, infop->dthi_pfname, fname) < 0)
+	    "extern int __dtraceenabled_%s___%s(void);\n",
+	    infop->dthi_pfname, fname) < 0)
 		return (dt_set_errno(dtp, errno));
 
 	return (0);
@@ -509,15 +505,8 @@ dt_header_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
 
 	if (!infop->dthi_empty) {
 		if (fprintf(infop->dthi_out,
-		    "#ifndef\t__sparc\n"
-		    "#define\t%s_%s_ENABLED() \\\n"
-		    "\t__dtraceenabled_%s___%s()\n"
-		    "#else\n"
 		    "#define\t%s_%s_ENABLED() \\\n"
-		    "\t__dtraceenabled_%s___%s(0)\n"
-		    "#endif\n",
-		    infop->dthi_pmname, mname,
-		    infop->dthi_pfname, fname,
+		    "\t__dtraceenabled_%s___%s()\n",
 		    infop->dthi_pmname, mname,
 		    infop->dthi_pfname, fname) < 0)
 			return (dt_set_errno(dtp, errno));
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
index 42faaad65db5..815cc5478473 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
@@ -1360,11 +1360,7 @@ typedef struct fp_size_map {
 static const fp_size_map_t fp_encodings[] = {
 	{ { 4, 4 }, { CTF_FP_SINGLE, CTF_FP_CPLX, CTF_FP_IMAGRY } },
 	{ { 8, 8 }, { CTF_FP_DOUBLE, CTF_FP_DCPLX, CTF_FP_DIMAGRY } },
-#ifdef __sparc
-	{ { 16, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } },
-#else
 	{ { 12, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } },
-#endif
 	{ { 0, 0 }, { 0, 0, 0 } }
 };