From nobody Mon Feb 6 19:28:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9brq29bPz3n5WV; Mon, 6 Feb 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9brq0Jwdz3ln7; Mon, 6 Feb 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRAV9KmsCEPvw9OPa0YmmPzmuauMK5WhvYxMEpvyQCc=; b=VXkUXiEd+CHQbckV6b2Ktl5bgwpZa+8661zgeR8FdAhj+TFpPwY4XB12wl+pOovRz7SQWX SGEWE6u7xRRl3SEnoQV29M9bfdBNJzGSHLnBkomXFyjmUHn741vCkEJwhoCag+ULl16P8A +cG7/RmmVgJ1000SqwpyhGfOvA+RRPfS9rVv+6sYofloUC1R/DUcSbHyoWWzjgKxx+pweY 85dlPjGgpl9NKFNuhMOPwxG1jqLWYVPSyWdIXZt9QhWSuXLCpUlc9O8qgBaiI8v5S1KkfD GIkD6Q+dzRlUuZOa7X7tpnK1PVF7KNQzSVmbXUei7+FYWmUgv0cRlXPFkJksoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRAV9KmsCEPvw9OPa0YmmPzmuauMK5WhvYxMEpvyQCc=; b=QInX6FmZFUdhiqqSL0yRqWnRueqsUER3yZkFzcZhKZZsEnFBUriZylK/UMp5tkOXkZOWQL Tazd0UT80Rd6FlbwouCW0hhbCYVFLHRqlhfrcxfGSQ9EGeOXT7L7oZV3v3u4kfrJtJt4UB Ko750VdsFZFvOx3jLKqO1z+aPayLL6Af9c1Mh9XqMs2cHqWY0aQcNG3xW6iBh2x1haLNI/ tfeqPeQrbZSeI0059DfCBeM2H4Sma70D1a9bPNYIZNW5QzsPKDvjYQEobsTa4lxh4ZyUfB Ru/G/Qc9667csy9yZRYYfm+mAy6YlDOoafKYylbQzGSvEe7Hcos+qr1UF28YKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675711691; a=rsa-sha256; cv=none; b=gPvs2Pgi/+Rdcqt/rmpO1xe3VGIoiHsYQs36TBiTcAbw2Yjh3c0IE7Hk5iDIbh2gqLPzDt O2gEMyvcsEU4M2dCGljojUziE3sHfO1NwFC7ehPbbcR0xywx1W+LAqmUXpWrk+Z4uhJeci AafHXYibzUp6/QAr1WdHcn6M4JMi7w61fS18IplTbEk1tR9txggYeWkce2ppRKlNz7N7oy 5mJOpb8X+FFF+V2TzlXpF0QDGhQs8E7Iv92EiiHmnAh5rDOA+e8P7t0Ook44nP5fTZ6fOB 8hcEMdgeiyLFRr+kAm4PjVcNRrfdn90wM+vmNDHSpasff455azdGAPHQ1A5nAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9brp6V1CzmsB; Mon, 6 Feb 2023 19:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316JSAmb006522; Mon, 6 Feb 2023 19:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316JSAOn006521; Mon, 6 Feb 2023 19:28:10 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:28:10 GMT Message-Id: <202302061928.316JSAOn006521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2166649fa1de - main - libdtrace: drop remaining mips support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2166649fa1def0506f05a485919e277bf2a04a64 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2166649fa1def0506f05a485919e277bf2a04a64 commit 2166649fa1def0506f05a485919e277bf2a04a64 Author: Mitchell Horne AuthorDate: 2023-02-06 18:20:45 +0000 Commit: Mitchell Horne CommitDate: 2023-02-06 19:26:53 +0000 libdtrace: drop remaining mips support Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38300 --- .../opensolaris/lib/libdtrace/common/dt_link.c | 27 +--------------------- .../opensolaris/lib/libdtrace/common/dt_printf.c | 3 +-- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c index 927b4415409d..4e7935250620 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -215,10 +215,6 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep) dofr[j].dofr_offset; rel->r_info = ELF32_R_INFO(count + dep->de_global, R_386_PC32); -#elif defined(__mips__) -/* XXX */ - printf("%s:%s(%d): MIPS not implemented\n", - __FUNCTION__, __FILE__, __LINE__); #elif defined(__powerpc__) /* * Add 4 bytes to hit the low half of this 64-bit @@ -401,8 +397,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep) R_AARCH64_PREL64); #elif defined(__arm__) /* XXX */ -#elif defined(__mips__) -/* XXX */ #elif defined(__powerpc__) rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; @@ -504,8 +498,6 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd) elf_file.ehdr.e_type = ET_REL; #if defined(__arm__) elf_file.ehdr.e_machine = EM_ARM; -#elif defined(__mips__) - elf_file.ehdr.e_machine = EM_MIPS; #elif defined(__powerpc__) elf_file.ehdr.e_machine = EM_PPC; #elif defined(__i386) || defined(__amd64) @@ -644,8 +636,6 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd) elf_file.ehdr.e_type = ET_REL; #if defined(__arm__) elf_file.ehdr.e_machine = EM_ARM; -#elif defined(__mips__) - elf_file.ehdr.e_machine = EM_MIPS; #elif defined(__powerpc64__) #if defined(_CALL_ELF) && _CALL_ELF == 2 elf_file.ehdr.e_flags = 2; @@ -843,17 +833,6 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, __LINE__); return (-1); } -#elif defined(__mips__) -#define DT_REL_NONE R_MIPS_NONE - -static int -dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, - uint32_t *off) -{ - printf("%s:%s(%d): MIPS not implemented\n", __FUNCTION__, __FILE__, - __LINE__); - return (-1); -} #elif defined(__powerpc__) /* The sentinel is 'xor r3,r3,r3'. */ #define DT_OP_XOR_R3 0x7c631a78 @@ -1167,9 +1146,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp) if (dtp->dt_oflags & DTRACE_O_LP64) { eclass = ELFCLASS64; -#if defined(__mips__) - emachine1 = emachine2 = EM_MIPS; -#elif defined(__powerpc__) +#if defined(__powerpc__) emachine1 = emachine2 = EM_PPC64; #if !defined(_CALL_ELF) || _CALL_ELF == 1 uses_funcdesc = 1; @@ -1184,8 +1161,6 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp) eclass = ELFCLASS32; #if defined(__arm__) emachine1 = emachine2 = EM_ARM; -#elif defined(__mips__) - emachine1 = emachine2 = EM_MIPS; #elif defined(__powerpc__) emachine1 = emachine2 = EM_PPC; #elif defined(__i386) || defined(__amd64) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c index 57a7db4ad0fd..c33ae955ba61 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c @@ -317,8 +317,7 @@ pfprint_fp(dtrace_hdl_t *dtp, FILE *fp, const char *format, case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) && \ - !defined(__mips__) && !defined(__riscv) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__riscv) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn));