d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__FreeBSD_ARCH_armv6__ is undefined on clang. We can use __ARM_ARCH in

Browse Source 
it's place. This makes 'uname -p' correctly output 'armv6' on a kernel
built with clang.
This commit is contained in:
Andrew Turner 2013-03-09 23:55:23 +00:00
parent dd9b8b36dd
commit fb769e0f72
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/arm/disassem.c
View File

@ -130,7 +130,7 @@ static const struct arm32_insn arm32_i[] = {
{ 0x0c500000, 0x04100000, "ldr", "daW" },
{ 0x0c500000, 0x04400000, "strb", "daW" },
{ 0x0c500000, 0x04500000, "ldrb", "daW" },
#ifdef __FreeBSD_ARCH_armv6__
#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6)
{ 0xffffffff, 0xf57ff01f, "clrex", "c" },
{ 0x0ff00ff0, 0x01800f90, "strex", "dmo" },
{ 0x0ff00fff, 0x01900f9f, "ldrex", "do" },

2
sys/arm/include/param.h
View File

@ -56,7 +56,7 @@
#define MACHINE "arm"
#endif
#ifndef MACHINE_ARCH
#ifdef __FreeBSD_ARCH_armv6__
#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6)
#ifdef __ARMEB__
#define MACHINE_ARCH "armv6eb"
#else