olga / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh1505492-undef-malloc.patch

25845f
glibc-rh1293976-2.patch introduced a -Wundef warning related to the
25845f
POWER architecture preprocessor macros.  No upstream patch because
25845f
upstream has fixed the underlying malloc alignment issue on 32-bit POWER
25845f
this portion of the code attempts to work around.
25845f
25845f
diff --git a/malloc/tst-malloc-thread-fail.c b/malloc/tst-malloc-thread-fail.c
25845f
index 7edcd7122fb084b7..5dfb24f5a3154fd7 100644
25845f
--- a/malloc/tst-malloc-thread-fail.c
25845f
+++ b/malloc/tst-malloc-thread-fail.c
25845f
@@ -156,7 +156,7 @@ static void *
25845f
 allocate (void)
25845f
 {
25845f
   struct allocate_result r = allocate_1 ();
25845f
-#if __powerpc__ == 1 && __powerpc64__ == 0
25845f
+#if defined (__powerpc__) == 1 && !defined (__powerpc64__)
25845f
   /* Sourceware bug 6527 on 32-bit POWER.
25845f
      Ignore 16-byte alignment requirement when using malloc, realloc, or
25845f
      calloc, since these functions are known not to provide enough