From 996391cf49c44d596516171ee496362b24f4ce41 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 20 Jan 2006 00:39:20 +0000 Subject: move the sh64 code out of the sh header --- libc/sysdeps/linux/sh/bits/uClibc_arch_features.h | 4 +--- libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h index 13788356d..2d4cade7a 100644 --- a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h @@ -6,9 +6,7 @@ #define _BITS_UCLIBC_ARCH_FEATURES_H /* instruction used when calling abort() to kill yourself */ -#if defined(__SH5__) -# define __UCLIBC_ABORT_INSTRUCTION__ "movi 0x10, r9; shori 0xff, r9; trapa r9" -#elif defined(__sh2__) +#if defined(__sh2__) # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #32" #else /* defined(__sh__) */ # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #0xff" diff --git a/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h index 107acb63b..a604c0ce0 100644 --- a/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h @@ -6,8 +6,7 @@ #define _BITS_UCLIBC_ARCH_FEATURES_H /* instruction used when calling abort() to kill yourself */ -/*#define __UCLIBC_ABORT_INSTRUCTION__ "asm instruction"*/ -#undef __UCLIBC_ABORT_INSTRUCTION__ +#define __UCLIBC_ABORT_INSTRUCTION__ "movi 0x10, r9; shori 0xff, r9; trapa r9" /* can your target use syscall6() for mmap ? */ #undef __UCLIBC_MMAP_HAS_6_ARGS__ -- cgit v1.2.3