From 6244ddcc7bcc151947d91dad33fcee9e7428fcc3 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Fri, 29 Mar 2024 21:02:11 +0000
Subject: [PATCH] Do not include <machine/frame.h> in libc sparc64 fpu
 routines, they don't need any of its contents. ok claudio@ kettenis@

---
 lib/libc/arch/sparc64/fpu/fpu_add.c     | 3 +--
 lib/libc/arch/sparc64/fpu/fpu_compare.c | 3 +--
 lib/libc/arch/sparc64/fpu/fpu_div.c     | 3 +--
 lib/libc/arch/sparc64/fpu/fpu_explode.c | 3 +--
 lib/libc/arch/sparc64/fpu/fpu_implode.c | 3 +--
 lib/libc/arch/sparc64/fpu/fpu_mul.c     | 4 +---
 lib/libc/arch/sparc64/fpu/fpu_sqrt.c    | 4 +---
 lib/libc/arch/sparc64/fpu/fpu_subr.c    | 3 +--
 8 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/libc/arch/sparc64/fpu/fpu_add.c b/lib/libc/arch/sparc64/fpu/fpu_add.c
index 3f96b40bcac..72bf0f6880b 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_add.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_add.c,v 1.4 2021/09/17 15:12:28 deraadt Exp $	*/
+/*	$OpenBSD: fpu_add.c,v 1.5 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 #include <machine/instr.h>
 
diff --git a/lib/libc/arch/sparc64/fpu/fpu_compare.c b/lib/libc/arch/sparc64/fpu/fpu_compare.c
index d5521f0aa85..c49935d2022 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_compare.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
+/*	$OpenBSD: fpu_compare.c,v 1.4 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -54,7 +54,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 
 #include "fpu_arith.h"
diff --git a/lib/libc/arch/sparc64/fpu/fpu_div.c b/lib/libc/arch/sparc64/fpu/fpu_div.c
index e86369bf2b9..f9e8d82a29b 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_div.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_div.c,v 1.4 2019/03/15 05:42:38 kevlo Exp $	*/
+/*	$OpenBSD: fpu_div.c,v 1.5 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,7 +51,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 
 #include "fpu_arith.h"
diff --git a/lib/libc/arch/sparc64/fpu/fpu_explode.c b/lib/libc/arch/sparc64/fpu/fpu_explode.c
index 987882e9d8b..0e118e447e9 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_explode.c,v 1.11 2021/09/17 15:12:28 deraadt Exp $	*/
+/*	$OpenBSD: fpu_explode.c,v 1.12 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,7 +52,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 #include <machine/ieee.h>
 #include <machine/instr.h>
diff --git a/lib/libc/arch/sparc64/fpu/fpu_implode.c b/lib/libc/arch/sparc64/fpu/fpu_implode.c
index 07498976bb6..63f9677fe22 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_implode.c,v 1.7 2021/09/17 15:12:28 deraadt Exp $	*/
+/*	$OpenBSD: fpu_implode.c,v 1.8 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -52,7 +52,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 #include <machine/ieee.h>
 #include <machine/instr.h>
diff --git a/lib/libc/arch/sparc64/fpu/fpu_mul.c b/lib/libc/arch/sparc64/fpu/fpu_mul.c
index 6f2092d385c..259478b62b9 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_mul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_mul.c,v 1.3 2019/03/15 05:42:38 kevlo Exp $	*/
+/*	$OpenBSD: fpu_mul.c,v 1.4 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,8 +51,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
-
 #include "fpu_arith.h"
 #include "fpu_emu.h"
 #include "fpu_extern.h"
diff --git a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
index e44f10fc2ce..26b840bd16a 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_sqrt.c,v 1.6 2022/12/27 17:10:06 jmc Exp $	*/
+/*	$OpenBSD: fpu_sqrt.c,v 1.7 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,8 +51,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
-
 #include "fpu_arith.h"
 #include "fpu_emu.h"
 #include "fpu_extern.h"
diff --git a/lib/libc/arch/sparc64/fpu/fpu_subr.c b/lib/libc/arch/sparc64/fpu/fpu_subr.c
index 530550de3af..3ef37a1a69d 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_subr.c,v 1.4 2021/09/17 15:12:28 deraadt Exp $	*/
+/*	$OpenBSD: fpu_subr.c,v 1.5 2024/03/29 21:02:11 miod Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,7 +51,6 @@
 
 #include <sys/types.h>
 
-#include <machine/frame.h>
 #include <machine/fsr.h>
 #include <machine/instr.h>
 
-- 
2.20.1