From nobody Tue Jan 11 11:36:13 2022 X-Original-To: dev-commits-src-all@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 5B16B1957DAB; Tue, 11 Jan 2022 11:36:14 +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 4JY7tk0D0Cz3PrR; Tue, 11 Jan 2022 11:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DC2A018694; Tue, 11 Jan 2022 11:36:13 +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 20BBaDWt064714; Tue, 11 Jan 2022 11:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BBaDaw064713; Tue, 11 Jan 2022 11:36:13 GMT (envelope-from git) Date: Tue, 11 Jan 2022 11:36:13 GMT Message-Id: <202201111136.20BBaDaw064713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ac795a774ca2 - main - Remove old arm CPU macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac795a774ca2fc1b6089b789c3ddbf759ced839a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641900974; 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=uZwKrFAWgIG60dRebmGCjDZ+hYaZ2Cavc9s8ybBFLik=; b=FFAHiN/pbszVF8KSbnUO5iphg84nUNEMRpvaiVc4HlK8J6evcpc9h6Dhe39uAOxfjgGWn4 17k30JJOxxj77OcNnv0QqYWKv+euUXRzHbq+MClc4UqfqY4Fj7xe5s1eNImOhm+Tzp0aut wxcrPXtYq5I9+5htMNUYAC2FuJ4Ag+vfZTga4U+UROMYnGst8bJ55xQiSsGFWYCrqaqtdR 0Xs0fWQJtqLIluCwFgnPKr2YF4R1nQ1UAnI4MaydHCoZKU+o+opXKCA3I8Eq+y6bgGTBTQ rdBl2KChgtfBMQAZ5IQTI6Fvq4n7DxyLzRpXdHcI0ENQufncdclN6ebUqA9cJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641900974; a=rsa-sha256; cv=none; b=FU9hSrrB8sFb51idPc+13Q0fVpHQWK776dlV91WTu0uR3A3/AATpfja2dJwC6iWk2/CjPu pC9xvEwH2UgwbrLbZXpMjYhpat7XLO2w2RNWjWj20H6ZR9Wg6mDlyK4oPSx+AdJ41s3ldj mO9Z+n87RjnX4kJrUNxvoL8ieWZBYyVWfJ1BAk+c0KoEL85KYS5Akyja31uA/6di1RKyvs BvGx4dFXI3r3Z/qa9r/M5GL2LJ+oUhAjRTqwQaDz37MF8h6hbwPEFBu1PP67P6LjrJIjEd r+P0qnSJyxDtV4C4+/NWwQwH5eD7rKC8zLNi5V7Uwvra+DRPkyMfJ0MzhssT9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ac795a774ca2fc1b6089b789c3ddbf759ced839a commit ac795a774ca2fc1b6089b789c3ddbf759ced839a Author: Andrew Turner AuthorDate: 2022-01-10 15:22:46 +0000 Commit: Andrew Turner CommitDate: 2022-01-11 11:22:29 +0000 Remove old arm CPU macros The _ARM_ARCH_* and _HAVE_ARMv*_INSTRUCTIONS macros are FreeBSD specific. Remove them as they are unused in the base system. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33806 --- sys/arm/include/asm.h | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index 1974908b65c1..975eca6e680a 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -183,54 +183,10 @@ .stabs __STRING(sym),1,0,0,0 #endif /* __STDC__ */ -/* Exactly one of the __ARM_ARCH_*__ macros will be defined by the compiler. */ -/* The _ARM_ARCH_* macros are deprecated and will be removed soon. */ -/* This should be moved into another header so it can be used in - * both asm and C code. machine/asm.h cannot be included in C code. */ -#if defined (__ARM_ARCH_7__) || defined (__ARM_ARCH_7A__) -#define _ARM_ARCH_7 -#define _HAVE_ARMv7_INSTRUCTIONS 1 -#endif - -#if defined (_HAVE_ARMv7_INSTRUCTIONS) || defined (__ARM_ARCH_6__) || \ - defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \ - defined (__ARM_ARCH_6KZ__) || \ - defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) -#define _ARM_ARCH_6 -#define _HAVE_ARMv6_INSTRUCTIONS 1 -#endif - -#if defined (_HAVE_ARMv6_INSTRUCTIONS) || defined (__ARM_ARCH_5TE__) || \ - defined (__ARM_ARCH_5TEJ__) || defined (__ARM_ARCH_5E__) -#define _ARM_ARCH_5E -#define _HAVE_ARMv5E_INSTRUCTIONS 1 -#endif - -#if defined (_HAVE_ARMv5E_INSTRUCTIONS) || defined (__ARM_ARCH_5__) || \ - defined (__ARM_ARCH_5T__) -#define _ARM_ARCH_5 -#define _HAVE_ARMv5_INSTRUCTIONS 1 -#endif - -#if defined (_HAVE_ARMv5_INSTRUCTIONS) || defined (__ARM_ARCH_4T__) -#define _ARM_ARCH_4T -#define _HAVE_ARMv4T_INSTRUCTIONS 1 -#endif - -/* FreeBSD requires ARMv4, so this is always set. */ -#define _HAVE_ARMv4_INSTRUCTIONS 1 - -#if defined (_HAVE_ARMv4T_INSTRUCTIONS) # define RET bx lr # define RETeq bxeq lr # define RETne bxne lr # define RETc(c) bx##c lr -#else -# define RET mov pc, lr -# define RETeq moveq pc, lr -# define RETne movne pc, lr -# define RETc(c) mov##c pc, lr -#endif #if __ARM_ARCH >= 7 #define ISB isb