git: 6c6e00b7f16f - main - mips: remove mips leftovers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 Jan 2026 17:57:05 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=6c6e00b7f16f3bda1b56da6a57d65ff6e26ae3e7
commit 6c6e00b7f16f3bda1b56da6a57d65ff6e26ae3e7
Author: Minsoo Choo <minsoochoo0122@proton.me>
AuthorDate: 2025-12-01 02:48:05 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-01-06 17:56:50 +0000
mips: remove mips leftovers
Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>
Pull-request: https://github.com/freebsd/freebsd-src/pull/1909
---
lib/libkldelf/Makefile | 1 -
lib/libkldelf/ef_mips.c | 116 ---------------------
.../opensolaris/uts/mips/dtrace/fasttrap_isa.c | 30 ------
.../opensolaris/uts/mips/sys/fasttrap_isa.h | 48 ---------
usr.sbin/kldxref/Makefile | 1 -
5 files changed, 196 deletions(-)
diff --git a/lib/libkldelf/Makefile b/lib/libkldelf/Makefile
index 0d1716f17fca..9b0a08352633 100644
--- a/lib/libkldelf/Makefile
+++ b/lib/libkldelf/Makefile
@@ -11,7 +11,6 @@ SRCS= ef.c \
ef_arm.c \
ef_amd64.c \
ef_i386.c \
- ef_mips.c \
ef_powerpc.c \
ef_riscv.c
WARNS?= 2
diff --git a/lib/libkldelf/ef_mips.c b/lib/libkldelf/ef_mips.c
deleted file mode 100644
index 99790e11a9c3..000000000000
--- a/lib/libkldelf/ef_mips.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2019 John Baldwin <jhb@FreeBSD.org>
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory (Department of Computer Science and
- * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
- * DARPA SSITH research programme.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/endian.h>
-
-#include <err.h>
-#include <errno.h>
-#include <gelf.h>
-
-#include "kldelf.h"
-
-/*
- * Apply relocations to the values obtained from the file. `relbase' is the
- * target relocation address of the section, and `dataoff/len' is the region
- * that is to be relocated, and has been copied to *dest
- */
-static int
-ef_mips_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype,
- GElf_Addr relbase, GElf_Addr dataoff, size_t len, void *dest)
-{
- char *where;
- GElf_Addr addr, addend;
- GElf_Size rtype, symidx;
- const GElf_Rel *rel;
- const GElf_Rela *rela;
-
- switch (reltype) {
- case ELF_T_REL:
- rel = (const GElf_Rel *)reldata;
- where = (char *)dest + (relbase + rel->r_offset - dataoff);
- addend = 0;
- rtype = GELF_R_TYPE(rel->r_info);
- symidx = GELF_R_SYM(rel->r_info);
- break;
- case ELF_T_RELA:
- rela = (const GElf_Rela *)reldata;
- where = (char *)dest + (relbase + rela->r_offset - dataoff);
- addend = rela->r_addend;
- rtype = GELF_R_TYPE(rela->r_info);
- symidx = GELF_R_SYM(rela->r_info);
- break;
- default:
- return (EINVAL);
- }
-
- if (where < (char *)dest || where >= (char *)dest + len)
- return (0);
-
- if (reltype == ELF_T_REL) {
- if (elf_class(ef) == ELFCLASS64) {
- if (elf_encoding(ef) == ELFDATA2LSB)
- addend = le64dec(where);
- else
- addend = be64dec(where);
- } else {
- if (elf_encoding(ef) == ELFDATA2LSB)
- addend = le32dec(where);
- else
- addend = be32dec(where);
- }
- }
-
- switch (rtype) {
- case R_MIPS_64: /* S + A */
- addr = EF_SYMADDR(ef, symidx) + addend;
- if (elf_encoding(ef) == ELFDATA2LSB)
- le64enc(where, addr);
- else
- be64enc(where, addr);
- break;
- case R_MIPS_32: /* S + A */
- addr = EF_SYMADDR(ef, symidx) + addend;
- if (elf_encoding(ef) == ELFDATA2LSB)
- le32enc(where, addr);
- else
- be32enc(where, addr);
- break;
- default:
- warnx("unhandled relocation type %d", (int)rtype);
- }
- return (0);
-}
-
-ELF_RELOC(ELFCLASS32, ELFDATA2LSB, EM_MIPS, ef_mips_reloc);
-ELF_RELOC(ELFCLASS32, ELFDATA2MSB, EM_MIPS, ef_mips_reloc);
-ELF_RELOC(ELFCLASS64, ELFDATA2LSB, EM_MIPS, ef_mips_reloc);
-ELF_RELOC(ELFCLASS64, ELFDATA2MSB, EM_MIPS, ef_mips_reloc);
diff --git a/sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c
deleted file mode 100644
index a31eac8cf0b8..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/mips/dtrace/fasttrap_isa.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-
-/*
- * XXX: Placeholder for MIPS fasttrap code
- */
diff --git a/sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h b/sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h
deleted file mode 100644
index eb99752ce415..000000000000
--- a/sys/cddl/contrib/opensolaris/uts/mips/sys/fasttrap_isa.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _FASTTRAP_ISA_H
-#define _FASTTRAP_ISA_H
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * XXXDTRACE: placehodler for MIPS fasttrap stuff
- */
-
-typedef uint32_t fasttrap_instr_t;
-#define FASTTRAP_SUNWDTRACE_SIZE 64
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _FASTTRAP_ISA_H */
diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index ab7b373a45cc..0a409ec20265 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -21,7 +21,6 @@ KLDELF_SRCS= ef.c \
ef_arm.c \
ef_amd64.c \
ef_i386.c \
- ef_mips.c \
ef_powerpc.c \
ef_riscv.c
SRCS+= ${KLDELF_SRCS}