svn commit: r357740 - head/usr.sbin/ntp

[Mitchell Horne]

On Mon, Feb 10, 2020 at 12:17 PM Warner Losh <imp at freebsd.org> wrote:
>
> Author: imp
> Date: Mon Feb 10 17:17:03 2020
> New Revision: 357740
> URL: https://svnweb.freebsd.org/changeset/base/357740
>
> Log:
>   Refresh architecture list with latest:
>
>   Remove: sparc, sparc64 (twice), ia64, alpha
>   Add: riscv64
>
>   Remove now-useless sparc64 ifdef
>
>   Reivewed by: cy@, bcr@
>   Differential Revision: https://reviews.freebsd.org/D23593
>
> Modified:
>   head/usr.sbin/ntp/config.h
>
> Modified: head/usr.sbin/ntp/config.h
> ==============================================================================
> --- head/usr.sbin/ntp/config.h  Mon Feb 10 17:16:59 2020        (r357739)
> +++ head/usr.sbin/ntp/config.h  Mon Feb 10 17:17:03 2020        (r357740)
> @@ -1578,11 +1578,7 @@
>  /* #undef STRERROR_R_CHAR_P */
>
>  /* canonical system (cpu-vendor-os) of where we should run */
> -#if defined(__alpha__)
> -#define STR_SYSTEM "alpha-undermydesk-freebsd"
> -#elif defined(__sparc64__)
> -#define STR_SYSTEM "sparc64-undermydesk-freebsd"
> -#elif defined(__amd64__)
> +#if defined(__amd64__)
>  #define STR_SYSTEM "amd64-undermydesk-freebsd"
>  #elif defined(__powerpc64__)
>  #define STR_SYSTEM "powerpc64-undermydesk-freebsd"
> @@ -1596,12 +1592,8 @@
>  #define STR_SYSTEM "arm64-undermydesk-freebsd"
>  #elif defined(__arm__)
>  #define STR_SYSTEM "arm-undermydesk-freebsd"
> -#elif defined(__sparc64__)
> -#define STR_SYSTEM "sparc64-undermydesk-freebsd"
> -#elif defined(__sparc__)
> -#define STR_SYSTEM "sparc-undermydesk-freebsd"
> -#elif defined(__ia64__)
> -#define STR_SYSTEM "ia64-undermydesk-freebsd"
> +#elif defined(__riscv__)

Hi Warner,

Surprisingly, the canonical define for RISC-V is __riscv, not __riscv__.

Mitchell

> +#define STR_SYSTEM "riscv64-undermydesk-freebsd"
>  #else
>  #define STR_SYSTEM "i386-undermydesk-freebsd"
>  #endif
> @@ -1669,7 +1661,7 @@ typedef unsigned int      uintptr_t;
>  /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
>     significant byte first (like Motorola and SPARC, unlike Intel). */
>  #if defined(__ARMEB__) || defined(__MIPSEB__) || defined(__powerpc__) || \
> -    defined(__powerpc64__) || defined(__sparc64__)
> +    defined(__powerpc64__)
>  #define WORDS_BIGENDIAN 1
>  #endif
>