This is an archive of the discontinued LLVM Phabricator instance.

Differential D108735

[clang][Emscripten] Define __unix family of macros
ClosedPublic

Authored by sbc100 on Aug 25 2021, 3:15 PM.

Details

Reviewers
dschuff
Commits
rGc05d30e444a1: [clang][Emscripten] Define __unix family of macros
Summary

This will allow us to remove these from the downstream
driver:
https://github.com/emscripten-core/emscripten/blob/57270ce8150a5107e591b4e9ec7cbeff0ba7c905/emcc.py#L860-L863

Diff Detail

Unit TestsFailed

TimeTest
14,430 msx64 debian > libarcher.races::task-dependency.c

Event Timeline

sbc100 created this revision.Aug 25 2021, 3:15 PM
Herald added subscribers: wingo, dschuff. · View Herald TranscriptAug 25 2021, 3:15 PM
sbc100 requested review of this revision.Aug 25 2021, 3:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 25 2021, 3:15 PM
Herald added subscribers: cfe-commits, aheejin. · View Herald Transcript
sbc100 added a comment.Aug 25 2021, 3:17 PM

Landing this will allow us to land https://github.com/emscripten-core/emscripten/pull/14953

sbc100 added a reviewer: dschuff.Aug 25 2021, 3:17 PM
dschuff accepted this revision.Aug 25 2021, 4:05 PM
This revision is now accepted and ready to land.Aug 25 2021, 4:05 PM
This revision was landed with ongoing or failed builds.Aug 25 2021, 4:25 PM
Closed by commit rGc05d30e444a1: [clang][Emscripten] Define __unix family of macros (authored by sbc100). · Explain Why
This revision was automatically updated to reflect the committed changes.
sbc100 added a commit: rGc05d30e444a1: [clang][Emscripten] Define __unix family of macros.
Harbormaster completed remote builds in B121248: Diff 368751.Aug 25 2021, 5:09 PM

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
1 line
test/
Preprocessor/
8 lines

Diff 368751

clang/lib/Basic/Targets/OSTargets.h

Show First 20 Lines • Show All 938 Lines • ▼ Show 20 Lines
// Emscripten target // Emscripten target
template <typename Target> template <typename Target>
class LLVM_LIBRARY_VISIBILITY EmscriptenTargetInfo class LLVM_LIBRARY_VISIBILITY EmscriptenTargetInfo
: public WebAssemblyOSTargetInfo<Target> { : public WebAssemblyOSTargetInfo<Target> {
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple, void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
MacroBuilder &Builder) const final { MacroBuilder &Builder) const final {
WebAssemblyOSTargetInfo<Target>::getOSDefines(Opts, Triple, Builder); WebAssemblyOSTargetInfo<Target>::getOSDefines(Opts, Triple, Builder);
DefineStd(Builder, "unix", Opts);
Builder.defineMacro("__EMSCRIPTEN__"); Builder.defineMacro("__EMSCRIPTEN__");
if (Opts.POSIXThreads) if (Opts.POSIXThreads)
Builder.defineMacro("__EMSCRIPTEN_PTHREADS__"); Builder.defineMacro("__EMSCRIPTEN_PTHREADS__");
} }
public: public:
explicit EmscriptenTargetInfo(const llvm::Triple &Triple, explicit EmscriptenTargetInfo(const llvm::Triple &Triple,
const TargetOptions &Opts) const TargetOptions &Opts)
Show All 13 Lines

clang/test/Preprocessor/init.c

Show First 20 Lines • Show All 1,841 Lines • ▼ Show 20 Lines
// WEBASSEMBLY-NEXT:#define __clang__ 1 // WEBASSEMBLY-NEXT:#define __clang__ 1
// WEBASSEMBLY-NEXT:#define __clang_literal_encoding__ {{.*}} // WEBASSEMBLY-NEXT:#define __clang_literal_encoding__ {{.*}}
// WEBASSEMBLY-NEXT:#define __clang_major__ {{.*}} // WEBASSEMBLY-NEXT:#define __clang_major__ {{.*}}
// WEBASSEMBLY-NEXT:#define __clang_minor__ {{.*}} // WEBASSEMBLY-NEXT:#define __clang_minor__ {{.*}}
// WEBASSEMBLY-NEXT:#define __clang_patchlevel__ {{.*}} // WEBASSEMBLY-NEXT:#define __clang_patchlevel__ {{.*}}
// WEBASSEMBLY-NEXT:#define __clang_version__ "{{.*}}" // WEBASSEMBLY-NEXT:#define __clang_version__ "{{.*}}"
// WEBASSEMBLY-NEXT:#define __clang_wide_literal_encoding__ {{.*}} // WEBASSEMBLY-NEXT:#define __clang_wide_literal_encoding__ {{.*}}
// WEBASSEMBLY-NEXT:#define __llvm__ 1 // WEBASSEMBLY-NEXT:#define __llvm__ 1
// WEBASSEMBLY-NOT:#define __unix // WEBASSEMBLY-WASI-NOT:#define __unix
// WEBASSEMBLY-NOT:#define __unix__ // WEBASSEMBLY-WASI-NOT:#define __unix__
// EMSCRIPTEN-NEXT:#define __unix 1
// EMSCRIPTEN-NEXT:#define __unix__ 1
// WEBASSEMBLY-WASI-NEXT:#define __wasi__ 1 // WEBASSEMBLY-WASI-NEXT:#define __wasi__ 1
// WEBASSEMBLY-NOT:#define __wasm_simd128__ // WEBASSEMBLY-NOT:#define __wasm_simd128__
// WEBASSEMBLY-NOT:#define __wasm_simd256__ // WEBASSEMBLY-NOT:#define __wasm_simd256__
// WEBASSEMBLY-NOT:#define __wasm_simd512__ // WEBASSEMBLY-NOT:#define __wasm_simd512__
// WEBASSEMBLY-NEXT:#define __wasm 1 // WEBASSEMBLY-NEXT:#define __wasm 1
// WEBASSEMBLY32-NEXT:#define __wasm32 1 // WEBASSEMBLY32-NEXT:#define __wasm32 1
// WEBASSEMBLY64-NOT:#define __wasm32 // WEBASSEMBLY64-NOT:#define __wasm32
// WEBASSEMBLY32-NEXT:#define __wasm32__ 1 // WEBASSEMBLY32-NEXT:#define __wasm32__ 1
// WEBASSEMBLY64-NOT:#define __wasm32__ // WEBASSEMBLY64-NOT:#define __wasm32__
// WEBASSEMBLY32-NOT:#define __wasm64__ // WEBASSEMBLY32-NOT:#define __wasm64__
// WEBASSEMBLY32-NOT:#define __wasm64 // WEBASSEMBLY32-NOT:#define __wasm64
// WEBASSEMBLY64-NEXT:#define __wasm64 1 // WEBASSEMBLY64-NEXT:#define __wasm64 1
// WEBASSEMBLY64-NEXT:#define __wasm64__ 1 // WEBASSEMBLY64-NEXT:#define __wasm64__ 1
// WEBASSEMBLY-NEXT:#define __wasm__ 1 // WEBASSEMBLY-NEXT:#define __wasm__ 1
// EMSCRIPTEN:#define unix 1
// WEBASSEMBLY-WASI-NOT:#define unix 1
// WEBASSEMBLY-CXX-NOT:_REENTRANT // WEBASSEMBLY-CXX-NOT:_REENTRANT
// WEBASSEMBLY-CXX-NOT:__STDCPP_THREADS__ // WEBASSEMBLY-CXX-NOT:__STDCPP_THREADS__
// WEBASSEMBLY-CXX-ATOMICS:#define _REENTRANT 1 // WEBASSEMBLY-CXX-ATOMICS:#define _REENTRANT 1
// WEBASSEMBLY-CXX-ATOMICS:#define __STDCPP_THREADS__ 1 // WEBASSEMBLY-CXX-ATOMICS:#define __STDCPP_THREADS__ 1
// RUN: %clang_cc1 -E -dM -ffreestanding -triple i686-windows-cygnus < /dev/null | FileCheck -match-full-lines -check-prefix CYGWIN-X32 %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple i686-windows-cygnus < /dev/null | FileCheck -match-full-lines -check-prefix CYGWIN-X32 %s
// CYGWIN-X32: #define __USER_LABEL_PREFIX__ _ // CYGWIN-X32: #define __USER_LABEL_PREFIX__ _
▲ Show 20 Lines • Show All 695 Lines • Show Last 20 Lines