Skip to content

Commit e8b5603

Browse files
authored
Merge pull request #742 from linux-on-ibm-z/master-s390x
2 parents c5498b3 + de97c9c commit e8b5603

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

CoreFoundation/Base.subproj/CFInternal.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,16 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount();
171171
#define __builtin_unreachable() do { } while (0)
172172
#endif
173173

174-
#if defined(__i386__) || defined(__x86_64__)
175-
#if defined(__GNUC__)
174+
#if defined(__GNUC__)
175+
#if defined(__i386__) || defined(__x86_64__)
176176
#define HALT do {asm __volatile__("int3"); kill(getpid(), 9); __builtin_unreachable(); } while (0)
177-
#elif defined(_MSC_VER)
178-
#define HALT do { DebugBreak(); abort(); __builtin_unreachable(); } while (0)
179177
#else
180-
#error Compiler not supported
178+
#define HALT do {__builtin_trap(); kill(getpid(), 9); __builtin_unreachable(); } while (0)
181179
#endif
180+
#elif defined(_MSC_VER)
181+
#define HALT do { DebugBreak(); abort(); __builtin_unreachable(); } while (0)
182+
#else
183+
#error Compiler not supported
182184
#endif
183185

184186

0 commit comments

Comments
 (0)