pkg/54731: cross/arm-none-eabi-gcc fails to compile on arm (needed for u-boot), host_detect_local_cpu() is not defined

[adr%sdf.org@localhost]

>Number:         54731
>Category:       pkg
>Synopsis:       cross/arm-none-eabi-gcc fails to compile on arm (needed for u-boot), host_detect_local_cpu() is not defined
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 02 07:55:00 +0000 2019
>Originator:     adr
>Release:        current 2019-12-1
>Organization:
>Environment:
NetBSD npi 9.99.17 NetBSD 9.99.17 (GENERIC) #0: Wed Nov 20 06:23:31 UTC 2019  mkrepro%mkrepro.NetBSD.org@localhost:/usr/src/sys/arch/evbarm/compile/GENERIC evbarm
>Description:
cross/arm-none-eabi-gcc fails to compile on arm (needed for u-boot), host_detect_local_cpu() is not defined.
>How-To-Repeat:
Try to compile cross/arm-none-eabi-gcc on evbarm.
>Fix:
--- gcc/config/arm/arm.h.orig   2018-03-22 17:24:41.000000000 +0000
+++ gcc/config/arm/arm.h
@@ -2195,19 +2195,19 @@ extern const char *arm_target_thumb_only

 /* -mcpu=native handling only makes sense with compiler running on
    an ARM chip.  */
-#if defined(__arm__)
-extern const char *host_detect_local_cpu (int argc, const char **argv);
-#define HAVE_LOCAL_CPU_DETECT
-# define MCPU_MTUNE_NATIVE_FUNCTIONS                   \
-  { "local_cpu_detect", host_detect_local_cpu },
-# define MCPU_MTUNE_NATIVE_SPECS                               \
-   " %{march=native:%<march=native %:local_cpu_detect(arch)}"  \
-   " %{mcpu=native:%<mcpu=native %:local_cpu_detect(cpu)}"     \
-   " %{mtune=native:%<mtune=native %:local_cpu_detect(tune)}"
-#else
+//#if defined(__arm__)
+// extern const char *host_detect_local_cpu (int argc, const char **argv);
+//#define HAVE_LOCAL_CPU_DETECT
+//# define MCPU_MTUNE_NATIVE_FUNCTIONS                 \
+//  { "local_cpu_detect", host_detect_local_cpu },
+//# define MCPU_MTUNE_NATIVE_SPECS                             \
+//   " %{march=native:%<march=native %:local_cpu_detect(arch)}"        \
+//   " %{mcpu=native:%<mcpu=native %:local_cpu_detect(cpu)}"   \
+//   " %{mtune=native:%<mtune=native %:local_cpu_detect(tune)}"
+//#else
 # define MCPU_MTUNE_NATIVE_FUNCTIONS
 # define MCPU_MTUNE_NATIVE_SPECS ""
-#endif
+//#endif