diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-05-02 00:55:13 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-02 00:55:13 +0300 |
commit | 83304e4c221b646d38387930d21011995427a05a (patch) | |
tree | d555f30369771a44ea6c54d8f379c035eacfc5b3 /source/creator | |
parent | 7212dbd7be8d69f1fea5c918d820796641197417 (diff) | |
parent | bba11c68c40480f525a23784ebca81d98e2ec6d2 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/blender.map | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/source/creator/blender.map b/source/creator/blender.map index fda6c37b10d..7720ad2b56c 100644 --- a/source/creator/blender.map +++ b/source/creator/blender.map @@ -18,14 +18,12 @@ local: *cineon*; *COLLADA*; cu*; - decodeInstruction; *default_error_condition*; *dpx*; *embree*; ff_*; fftw*; FLAC*; - ForceStackAlign; FT_*; *GeneratedSaxParser*; *google*; @@ -40,14 +38,11 @@ local: jack_*; jpeg_*; jsimd**; - _Jv_RegisterClasses; lame_*; *llvm*; *LLVM*; *MathML*; *mkldnn*; - Name; - NumNamedVarArgParams; oc_*; ogg*; *oidn*; @@ -72,8 +67,46 @@ local: vp9*; vpx*; x264_*; - X86CompilationCallback*; xml*; xvid*; *YAML*; + + /* LLVM symbols not in the LLVM namespace that can conflict with LLVM usage + * in OpenGL and OpenCL drivers. */ + decodeInstruction; + EnableHotColdSplit; + EnableIPRA; + EnableOrderFileInstrumentation; + EnableVPlanNativePath; + EnableVPlanPredication; + FlattenedProfileUsed; + ForceStackAlign; + ForceSummaryEdgesCold; + FSEC; + __jit_debug_descriptor; + __jit_debug_register_code; + _Jv_RegisterClasses; + MachineRegionInfoPassID; + MemOPSizeLarge; + MemOPSizeRange; + MISchedPostRA; + ModuleSummaryDotFile; + __morestack; + Name; + NumNamedVarArgParams; + PGOViewCounts; + PrintBlockFreqFuncName; + PrintBranchProbFuncName; + ProfileLikelyProb; + StartAfterOptName; + StartBeforeOptName; + StaticLikelyProb; + StopAfterOptName; + StopBeforeOptName; + UseDbgAddr; + ViewBlockFreqFuncName; + ViewBlockLayoutWithBFI; + ViewHotFreqPercent; + WriteRelBFToSummary; + X86CompilationCallback*; }; |