From 7c344a4487ec106234eb790b23a6b7ce33210dfd Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 15 Apr 2024 15:21:11 +0000 Subject: [PATCH] remove unused __bswap16, __bswap32 MD functions from arm and aarch64 ok miod@ --- lib/libc/arch/aarch64/Symbols.list | 2 -- lib/libc/arch/aarch64/gen/Makefile.inc | 4 +-- lib/libc/arch/aarch64/gen/byte_swap_2.S | 42 ------------------------- lib/libc/arch/aarch64/gen/byte_swap_4.S | 40 ----------------------- lib/libc/arch/arm/Symbols.list | 2 -- lib/libc/arch/arm/gen/Makefile.inc | 4 +-- lib/libc/arch/arm/gen/byte_swap_2.S | 40 ----------------------- lib/libc/arch/arm/gen/byte_swap_4.S | 41 ------------------------ 8 files changed, 4 insertions(+), 171 deletions(-) delete mode 100644 lib/libc/arch/aarch64/gen/byte_swap_2.S delete mode 100644 lib/libc/arch/aarch64/gen/byte_swap_4.S delete mode 100644 lib/libc/arch/arm/gen/byte_swap_2.S delete mode 100644 lib/libc/arch/arm/gen/byte_swap_4.S diff --git a/lib/libc/arch/aarch64/Symbols.list b/lib/libc/arch/aarch64/Symbols.list index 48d6f8f5c11..dbbd4860c85 100644 --- a/lib/libc/arch/aarch64/Symbols.list +++ b/lib/libc/arch/aarch64/Symbols.list @@ -1,5 +1,3 @@ -__bswap16 -__bswap32 __mcount __multf3 _fpgetmask diff --git a/lib/libc/arch/aarch64/gen/Makefile.inc b/lib/libc/arch/aarch64/gen/Makefile.inc index c52c3400e45..6c728de81ca 100644 --- a/lib/libc/arch/aarch64/gen/Makefile.inc +++ b/lib/libc/arch/aarch64/gen/Makefile.inc @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile.inc,v 1.2 2020/07/06 13:33:05 pirofti Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2024/04/15 15:21:11 naddy Exp $ # $NetBSD: Makefile.inc,v 1.6 2003/08/01 17:03:47 lukem Exp $ -SRCS+= byte_swap_2.S byte_swap_4.S fabs.c flt_rounds.c infinity.c +SRCS+= fabs.c flt_rounds.c infinity.c SRCS+= ldexp.c modf.c nan.c SRCS+= setjmp.S _setjmp.S sigsetjmp.S SRCS+= clz_tab.c diff --git a/lib/libc/arch/aarch64/gen/byte_swap_2.S b/lib/libc/arch/aarch64/gen/byte_swap_2.S deleted file mode 100644 index efbdbea6852..00000000000 --- a/lib/libc/arch/aarch64/gen/byte_swap_2.S +++ /dev/null @@ -1,42 +0,0 @@ -/* $OpenBSD: byte_swap_2.S,v 1.4 2024/04/15 14:30:48 naddy Exp $ */ -/* $NetBSD: byte_swap_2.S,v 1.3 2003/04/05 23:08:51 bjh21 Exp $ */ - -/*- - * Copyright (c) 1999 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 "DEFS.h" - -_ENTRY(__bswap16) - RETGUARD_SETUP(__bswap16, x15) - and w8, w0, #0xffff - ubfx w0, w0, #8, #8 - bfi w0, w8, #8, #16 - RETGUARD_CHECK(__bswap16, x15) - ret -_END(__bswap16) diff --git a/lib/libc/arch/aarch64/gen/byte_swap_4.S b/lib/libc/arch/aarch64/gen/byte_swap_4.S deleted file mode 100644 index a16fbeb435c..00000000000 --- a/lib/libc/arch/aarch64/gen/byte_swap_4.S +++ /dev/null @@ -1,40 +0,0 @@ -/* $OpenBSD: byte_swap_4.S,v 1.4 2024/04/15 14:30:48 naddy Exp $ */ -/* $NetBSD: byte_swap_4.S,v 1.2 2003/04/05 23:08:51 bjh21 Exp $ */ - -/*- - * Copyright (c) 1997 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Neil A. Carson - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 "DEFS.h" - -_ENTRY(__bswap32) - RETGUARD_SETUP(__bswap32, x15) - rev w0, w0 - RETGUARD_CHECK(__bswap32, x15) - ret -_END(__bswap32) diff --git a/lib/libc/arch/arm/Symbols.list b/lib/libc/arch/arm/Symbols.list index 00e33ba5699..a57d3361b0c 100644 --- a/lib/libc/arch/arm/Symbols.list +++ b/lib/libc/arch/arm/Symbols.list @@ -1,7 +1,5 @@ __adddf3 __addsf3 -__bswap16 -__bswap32 __divdf3 __divsf3 __divsi3 diff --git a/lib/libc/arch/arm/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc index ae135f5885e..bc9d5558bcd 100644 --- a/lib/libc/arch/arm/gen/Makefile.inc +++ b/lib/libc/arch/arm/gen/Makefile.inc @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.16 2020/07/06 13:33:05 pirofti Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2024/04/15 15:21:11 naddy Exp $ # $NetBSD: Makefile.inc,v 1.6 2003/08/01 17:03:47 lukem Exp $ -SRCS+= byte_swap_2.S byte_swap_4.S divsi3.S fabs.c flt_rounds.c infinity.c +SRCS+= divsi3.S fabs.c flt_rounds.c infinity.c SRCS+= ldexp.c modf.c nan.c usertc.c SRCS+= setjmp.S _setjmp.S sigsetjmp.S diff --git a/lib/libc/arch/arm/gen/byte_swap_2.S b/lib/libc/arch/arm/gen/byte_swap_2.S deleted file mode 100644 index 9f242bdbe6a..00000000000 --- a/lib/libc/arch/arm/gen/byte_swap_2.S +++ /dev/null @@ -1,40 +0,0 @@ -/* $OpenBSD: byte_swap_2.S,v 1.5 2024/04/15 14:30:48 naddy Exp $ */ -/* $NetBSD: byte_swap_2.S,v 1.3 2003/04/05 23:08:51 bjh21 Exp $ */ - -/*- - * Copyright (c) 1999 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum. - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 "DEFS.h" - -_ENTRY(__bswap16) - and r1, r0, #0xff - mov r0, r0, lsr #8 - orr r0, r0, r1, lsl #8 - mov pc, lr -_END(__bswap16) diff --git a/lib/libc/arch/arm/gen/byte_swap_4.S b/lib/libc/arch/arm/gen/byte_swap_4.S deleted file mode 100644 index 8194f3006fa..00000000000 --- a/lib/libc/arch/arm/gen/byte_swap_4.S +++ /dev/null @@ -1,41 +0,0 @@ -/* $OpenBSD: byte_swap_4.S,v 1.5 2024/04/15 14:30:48 naddy Exp $ */ -/* $NetBSD: byte_swap_4.S,v 1.2 2003/04/05 23:08:51 bjh21 Exp $ */ - -/*- - * Copyright (c) 1997 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Neil A. Carson - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 "DEFS.h" - -_ENTRY(__bswap32) - eor r1, r0, r0, ror #16 - bic r1, r1, #0x00FF0000 - mov r0, r0, ror #8 - eor r0, r0, r1, lsr #8 - mov pc, lr -_END(__bswap32) -- 2.20.1