This is an archive of the discontinued LLVM Phabricator instance.

Differential D33152

[PowerPC] Fix test case sem_init_glibc.cc for powerpc64be
AcceptedPublic

Authored by seurer on May 12 2017, 2:07 PM.

Details

Reviewers
llvm-commits
echristo
hfinkel
Summary

On powerpc64be semval_t must be 64 bits even with "old" versions of glibc. This was discovered on a new install of Redhat 7.3 which unfortunately still comes with glibc 2.17 installed.

Diff Detail

Event Timeline

seurer created this revision.May 12 2017, 2:07 PM
Herald added subscribers: nemanjai, kubamracek. · View Herald TranscriptMay 12 2017, 2:07 PM
inouehrs added a subscriber: inouehrs.May 16 2017, 6:47 AM
inouehrs added inline comments.
test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc
12

Is there any difference between __PPC64__ and defined(__powerpc64__) used below (and also in altivec.h etc)?

seurer added inline comments.May 16 2017, 9:16 AM
test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc
12

Both PPC64 and powerpc64 are listed in the power ISA document and are equivalent.

echristo accepted this revision.May 17 2017, 3:16 PM
This revision is now accepted and ready to land.May 17 2017, 3:16 PM

Revision Contents

PathSize
test/
sanitizer_common/
TestCases/
Linux/
6 lines

Diff 98841

test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc

// RUN: %clangxx -O0 -g %s -lutil -o %t && %run %t // RUN: %clangxx -O0 -g %s -lutil -o %t && %run %t
// This test depends on the glibc layout of struct sem_t and checks that we // This test depends on the glibc layout of struct sem_t and checks that we
// don't leave sem_t::private uninitialized. // don't leave sem_t::private uninitialized.
// UNSUPPORTED: android, lsan-x86 // UNSUPPORTED: android, lsan-x86
#include <features.h> #include <features.h>
#include <assert.h> #include <assert.h>
#include <semaphore.h> #include <semaphore.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
// On powerpc64be semval_t must be 64 bits even with "old" versions of glibc.
#if __PPC64__ && __BIG_ENDIAN__
inouehrsUnsubmitted
Not Done
ReplyInline Actions

Is there any difference between __PPC64__ and defined(__powerpc64__) used below (and also in altivec.h etc)?

inouehrs: Is there any difference between `__PPC64__` and `defined(__powerpc64__)` used below (and also…
seurerAuthorUnsubmitted
Not Done
ReplyInline Actions

Both PPC64 and powerpc64 are listed in the power ISA document and are equivalent.

seurer: Both __PPC64__ and __powerpc64__ are listed in the power ISA document and are equivalent.
typedef uint64_t semval_t;
// This condition needs to correspond to __HAVE_64B_ATOMICS macro in glibc. // This condition needs to correspond to __HAVE_64B_ATOMICS macro in glibc.
#if (defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || \ #elif (defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || \
defined(__s390x__) || defined(__sparc64__) || defined(__alpha__) || \ defined(__s390x__) || defined(__sparc64__) || defined(__alpha__) || \
defined(__ia64__) || defined(__m68k__)) && __GLIBC_PREREQ(2, 21) defined(__ia64__) || defined(__m68k__)) && __GLIBC_PREREQ(2, 21)
typedef uint64_t semval_t; typedef uint64_t semval_t;
#else #else
typedef unsigned semval_t; typedef unsigned semval_t;
#endif #endif
// glibc 2.21 has introduced some changes in the way the semaphore value is // glibc 2.21 has introduced some changes in the way the semaphore value is
Show All 38 Lines