Attachment 1446542 Details for Bug 1585015 – The patch fixes the issues.

[patch] The patch fixes the issues.

ganglia-3.7.2-libmetric-linux.patch (text/plain), 1.28 KB, created by huan.xiong on 2018-06-01 07:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: huan.xiong

Created: 2018-06-01 07:03:17 UTC

Size: 1.28 KB

patch

obsolete

>--- libmetrics/linux/metrics.c.orig	2018-06-01 14:56:37.690006517 +0800
>+++ libmetrics/linux/metrics.c	2018-06-01 13:45:18.149298706 +0800
>@@ -593,36 +593,30 @@
> 
> #ifdef __i386__
>    snprintf(val.str, MAX_G_STRING_SIZE, "x86");
>-#endif
>-#ifdef __x86_64__
>+#elif __x86_64__
>    snprintf(val.str, MAX_G_STRING_SIZE, "x86_64");
>-#endif
>-#ifdef __ia64__
>+#elif __ia64__
>    snprintf(val.str, MAX_G_STRING_SIZE, "ia64");
>-#endif
>-#ifdef __sparc__
>+#elif __sparc__
>    snprintf(val.str, MAX_G_STRING_SIZE, "sparc");
>-#endif
>-#ifdef __alpha__
>+#elif __alpha__
>    snprintf(val.str, MAX_G_STRING_SIZE, "alpha");
>-#endif
>-#ifdef __powerpc__
>+#elif __powerpc__
>    snprintf(val.str, MAX_G_STRING_SIZE, "powerpc");
>-#endif
>-#ifdef __m68k__
>+#elif __m68k__
>    snprintf(val.str, MAX_G_STRING_SIZE, "m68k");
>-#endif
>-#ifdef __mips__
>+#elif __mips__
>    snprintf(val.str, MAX_G_STRING_SIZE, "mips");
>-#endif
>-#ifdef __arm__
>+#elif __arm__
>    snprintf(val.str, MAX_G_STRING_SIZE, "arm");
>-#endif
>-#ifdef __hppa__
>+#elif __aarch64__
>+   snprintf(val.str, MAX_G_STRING_SIZE, "aarch64");
>+#elif __hppa__
>    snprintf(val.str, MAX_G_STRING_SIZE, "hppa");
>-#endif
>-#ifdef __s390__
>+#elif __s390__
>    snprintf(val.str, MAX_G_STRING_SIZE, "s390");
>+#else
>+   snprintf(val.str, MAX_G_STRING_SIZE, "unknown");
> #endif
> 
>    return val;

Actions: View | Diff

Attachments on bug 1585015: 1446542