1 diff -Naur a/include/asm/a.out.h b/include/asm/a.out.h 2 --- a/include/asm/a.out.h 2013-06-10 08:16:13.496310000 +0800 3 +++ b/include/asm/a.out.h 2013-09-06 14:13:28.366275000 +0800 4 @@ -33,7 +33,7 @@ 5 #define N_DRSIZE(a) ((a).a_drsize) 6 #define N_SYMSIZE(a) ((a).a_syms) 7 8 -#define M_MACHINE 103 9 +#define M_ARM 103 10 11 #ifndef LIBRARY_START_TEXT 12 #define LIBRARY_START_TEXT (0x00c00000) 13 diff -Naur a/include/asm/byteorder.h b/include/asm/byteorder.h 14 --- a/include/asm/byteorder.h 2013-09-03 12:33:37.353419000 +0800 15 +++ b/include/asm/byteorder.h 2013-08-30 17:41:09.234265000 +0800 16 @@ -19,12 +19,6 @@ 17 { 18 __u32 t; 19 20 -#ifndef __thumb__ 21 - if (!__builtin_constant_p(x)) { 22 - 23 - __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); 24 - } else 25 -#endif 26 t = x ^ ((x << 16) | (x >> 16)); 27 28 x = (x << 24) | (x >> 8); 29 diff -Naur a/include/asm/stat.h b/include/asm/stat.h 30 --- a/include/asm/stat.h 2013-09-03 12:33:37.367418000 +0800 31 +++ b/include/asm/stat.h 2013-08-30 17:41:09.431302000 +0800 32 @@ -29,23 +29,13 @@ 33 #define STAT_HAVE_NSEC 34 35 struct stat { 36 -#ifdef __ARMEB__ 37 - unsigned short st_dev; 38 - unsigned short __pad1; 39 -#else 40 unsigned long st_dev; 41 -#endif 42 unsigned long st_ino; 43 unsigned short st_mode; 44 unsigned short st_nlink; 45 unsigned short st_uid; 46 unsigned short st_gid; 47 -#ifdef __ARMEB__ 48 - unsigned short st_rdev; 49 - unsigned short __pad2; 50 -#else 51 unsigned long st_rdev; 52 -#endif 53 unsigned long st_size; 54 unsigned long st_blksize; 55 unsigned long st_blocks; 56 diff -Naur a/include/asm/types.h b/include/asm/types.h 57 --- a/include/asm/types.h 2013-09-03 12:33:37.313428000 +0800 58 +++ b/include/asm/types.h 2013-08-30 17:41:09.467274000 +0800 59 @@ -25,7 +25,7 @@ 60 typedef __signed__ int __s32; 61 typedef unsigned int __u32; 62 63 -#ifdef __GNUC__ 64 +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) 65 typedef __signed__ long long __s64; 66 typedef unsigned long long __u64; 67 #endif 68 diff -Naur a/include/asm/unaligned.h b/include/asm/unaligned.h 69 --- a/include/asm/unaligned.h 2013-09-03 12:33:37.376422000 +0800 70 +++ b/include/asm/unaligned.h 2013-08-30 17:41:09.500316000 +0800 71 @@ -28,11 +28,6 @@ 72 73 #define __put_unaligned_le(val,ptr) ({ switch (sizeof(*(ptr))) { case 1: *(ptr) = (val); break; case 2: __put_unaligned_2_le((val),(__u8 *)(ptr)); break; case 4: __put_unaligned_4_le((val),(__u8 *)(ptr)); break; case 8: __put_unaligned_8_le((val),(__u8 *)(ptr)); break; default: __bug_unaligned_x(ptr); break; } (void) 0; }) 74 #define __put_unaligned_be(val,ptr) ({ switch (sizeof(*(ptr))) { case 1: *(ptr) = (val); break; case 2: __put_unaligned_2_be((val),(__u8 *)(ptr)); break; case 4: __put_unaligned_4_be((val),(__u8 *)(ptr)); break; case 8: __put_unaligned_8_be((val),(__u8 *)(ptr)); break; default: __bug_unaligned_x(ptr); break; } (void) 0; }) 75 -#ifndef __ARMEB__ 76 #define get_unaligned __get_unaligned_le 77 #define put_unaligned __put_unaligned_le 78 -#else 79 -#define get_unaligned __get_unaligned_be 80 -#define put_unaligned __put_unaligned_be 81 -#endif 82 #endif 83 diff -Naur a/include/asm/unistd.h b/include/asm/unistd.h 84 --- a/include/asm/unistd.h 2013-09-03 12:33:37.322427000 +0800 85 +++ b/include/asm/unistd.h 2013-08-30 17:41:09.506276000 +0800 86 @@ -19,12 +19,7 @@ 87 #ifndef __ASM_MACHINE_UNISTD_H 88 #define __ASM_MACHINE_UNISTD_H 89 #define __NR_OABI_SYSCALL_BASE 0x900000 90 -#if defined(__thumb__) || defined(__ARM_EABI__) 91 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ 92 #define __NR_SYSCALL_BASE 0 93 -#else 94 -#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE 95 -#endif 96 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ 97 #define __NR_restart_syscall (__NR_SYSCALL_BASE+ 0) 98 #define __NR_exit (__NR_SYSCALL_BASE+ 1) 99 diff -Naur a/include/asm/user.h b/include/asm/user.h 100 --- a/include/asm/user.h 2013-09-03 12:33:37.118421000 +0800 101 +++ b/include/asm/user.h 2013-08-30 17:41:09.519301000 +0800 102 @@ -58,15 +58,4 @@ 103 #define HOST_TEXT_START_ADDR (u.start_code) 104 #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) 105 106 -struct user_vfp { 107 - unsigned long long fpregs[32]; 108 - unsigned long fpscr; 109 -}; 110 - 111 -struct user_vfp_exc { 112 - unsigned long fpexc; 113 - unsigned long fpinst; 114 - unsigned long fpinst2; 115 -}; 116 - 117 #endif 118 diff -Naur a/include/machine/asm.h b/include/machine/asm.h 119 --- a/include/machine/asm.h 2013-09-03 12:33:37.135419000 +0800 120 +++ b/include/machine/asm.h 2013-08-30 17:41:09.533294000 +0800 121 @@ -78,17 +78,7 @@ 122 .fnend; \ 123 _ASM_SIZE(x) 124 125 -#ifdef GPROF 126 -# ifdef __ELF__ 127 -# define _PROF_PROLOGUE \ 128 - mov ip, lr; bl __mcount 129 -# else 130 -# define _PROF_PROLOGUE \ 131 - mov ip,lr; bl mcount 132 -# endif 133 -#else 134 # define _PROF_PROLOGUE 135 -#endif 136 137 #define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE 138 #define ENTRY_NP(y) _ENTRY(_C_LABEL(y)) 139
