This is an archive of the discontinued LLVM Phabricator instance.

Differential D51883

[Sanitizers] [MinGW] Check for __i386__ in addition to _M_IX86 for i386 specific details
ClosedPublic

Authored by mstorsjo on Sep 10 2018, 12:33 PM.

Details

Reviewers
rnk
timurrrr
Commits
rGfd9aa7e078a3: [Sanitizers] [MinGW] Check for __i386__ in addition to _M_IX86 for i386…
rCRT343013: [Sanitizers] [MinGW] Check for __i386__ in addition to _M_IX86 for i386…
rL343013: [Sanitizers] [MinGW] Check for __i386__ in addition to _M_IX86 for i386…
Summary

The MinGW headers do define _M_IX86 (contrary to clang-cl and MSVC where it is a compiler predefined macro), but the headers that define it aren't included here.

Also check these defines for setting the symbol prefix, instead of inconsistently using _WIN64 for that.

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 10 2018, 12:33 PM
Herald added subscribers: Restricted Project, kubamracek. · View Herald TranscriptSep 10 2018, 12:33 PM
rnk accepted this revision.Sep 10 2018, 4:35 PM
This revision is now accepted and ready to land.Sep 10 2018, 4:35 PM
Closed by commit rL343013: [Sanitizers] [MinGW] Check for __i386__ in addition to _M_IX86 for i386… (authored by mstorsjo). · Explain WhySep 25 2018, 12:53 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptSep 25 2018, 12:53 PM

Revision Contents

PathSize
lib/
sanitizer_common/
8 lines

Diff 164725

lib/sanitizer_common/sanitizer_win_defs.h

Show All 11 Lines
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef SANITIZER_WIN_DEFS_H #ifndef SANITIZER_WIN_DEFS_H
#define SANITIZER_WIN_DEFS_H #define SANITIZER_WIN_DEFS_H
#include "sanitizer_platform.h" #include "sanitizer_platform.h"
#if SANITIZER_WINDOWS #if SANITIZER_WINDOWS
#ifndef WINAPI #ifndef WINAPI
#ifdef _M_IX86 #if defined(_M_IX86) || defined(__i386__)
#define WINAPI __stdcall #define WINAPI __stdcall
#else #else
#define WINAPI #define WINAPI
#endif #endif
#endif #endif
#if defined(_WIN64) #if defined(_M_IX86) || defined(__i386__)
#define WIN_SYM_PREFIX
#else
#define WIN_SYM_PREFIX "_" #define WIN_SYM_PREFIX "_"
#else
#define WIN_SYM_PREFIX
#endif #endif
// For MinGW, the /export: directives contain undecorated symbols, contrary to // For MinGW, the /export: directives contain undecorated symbols, contrary to
// link/lld-link. The GNU linker doesn't support /alternatename and /include // link/lld-link. The GNU linker doesn't support /alternatename and /include
// though, thus lld-link in MinGW mode interprets them in the same way as // though, thus lld-link in MinGW mode interprets them in the same way as
// in the default mode. // in the default mode.
#ifdef __MINGW32__ #ifdef __MINGW32__
#define WIN_EXPORT_PREFIX #define WIN_EXPORT_PREFIX
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines