Home Explore Help
Register Sign In
oss
/
uclibc-ng
4
1
Fork 0
Files Issues 3 Pull Requests 0 Wiki
Browse Source

move the sh64 code out of the sh header

Mike Frysinger 19 years ago
parent
2304e36026
commit
996391cf49
2 changed files with 2 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 3
      libc/sysdeps/linux/sh/bits/uClibc_arch_features.h
  2. 1 2
      libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h

+ 1 - 3
libc/sysdeps/linux/sh/bits/uClibc_arch_features.h
View File 

@@ -6,9 +6,7 @@
 
 #define _BITS_UCLIBC_ARCH_FEATURES_H
 
 #define _BITS_UCLIBC_ARCH_FEATURES_H
 
 
 
 /* instruction used when calling abort() to kill yourself */
 
 /* instruction used when calling abort() to kill yourself */
 
-#if defined(__SH5__)
 
+#if defined(__sh2__)
 
-# define __UCLIBC_ABORT_INSTRUCTION__ "movi 0x10, r9; shori 0xff, r9; trapa r9"
 
-#elif defined(__sh2__)
 
 # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #32"
 
 # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #32"
 
 #else /* defined(__sh__) */
 
 #else /* defined(__sh__) */
 
 # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #0xff"
 
 # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #0xff"

+ 1 - 2
libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h
View File 

@@ -6,8 +6,7 @@
 
 #define _BITS_UCLIBC_ARCH_FEATURES_H
 
 #define _BITS_UCLIBC_ARCH_FEATURES_H
 
 
 
 /* instruction used when calling abort() to kill yourself */
 
 /* instruction used when calling abort() to kill yourself */
 
-/*#define __UCLIBC_ABORT_INSTRUCTION__ "asm instruction"*/
 
+#define __UCLIBC_ABORT_INSTRUCTION__ "movi 0x10, r9; shori 0xff, r9; trapa r9"
 
-#undef __UCLIBC_ABORT_INSTRUCTION__
 
 
 
 /* can your target use syscall6() for mmap ? */
 
 /* can your target use syscall6() for mmap ? */
 
 #undef __UCLIBC_MMAP_HAS_6_ARGS__
 
 #undef __UCLIBC_MMAP_HAS_6_ARGS__