Commit36a5e1a

committed

Merge remote-tracking branch 'origin/apple/stable/20190619' into stable

2 parentsdbf97d9 +7c4fe05 commit36a5e1aCopy full SHA for 36a5e1a

File tree

+24

-4

lines changed

+24

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,13 @@ macro(add_clang_library name)`
`86`	`86`	`# llvm_add_library ignores BUILD_SHARED_LIBS if STATIC is explicitly set,`
`87`	`87`	`# so we need to handle it here.`
`88`	`88`	`if(BUILD_SHARED_LIBS)`
`89`		`- set(LIBTYPE SHARED OBJECT)`
	`89`	`+ set(LIBTYPE SHARED)`
`90`	`90`	`else()`
`91`		`- set(LIBTYPESTATIC OBJECT)`
	`91`	`+ set(LIBTYPESTATIC)`
	`92`	`+ endif()`
	`93`	`+ if(NOT XCODE)`
	`94`	`+# The Xcode generator doesn't handle object libraries correctly.`
	`95`	`+ list(APPEND LIBTYPE OBJECT)`
`92`	`96`	`endif()`
`93`	`97`	`set_property(GLOBALAPPEND PROPERTY CLANG_STATIC_LIBS${name})`
`94`	`98`	`endif()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ typedef enum {`
`297`	`297`	`INDEXSTORE_SYMBOL_ROLE_ADDRESSOF=1 <<7,`
`298`	`298`	`INDEXSTORE_SYMBOL_ROLE_IMPLICIT=1 <<8,`
`299`	`299`	`INDEXSTORE_SYMBOL_ROLE_UNDEFINITION=1 <<19,`
	`300`	`+INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE=1 <<20,`
`300`	`301`
`301`	`302`	`// Relation roles.`
`302`	`303`	`INDEXSTORE_SYMBOL_ROLE_REL_CHILDOF=1 <<9,`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,11 @@ struct DirectoryScan {`
`92`	`92`	`#define__has_include(x)0`
`93`	`93`	`#endif`
`94`	`94`
`95`		`-#if __has_include(<CoreServices/CoreServices.h>)`
	`95`	`+#if !defined(__is_target_os)`
	`96`	`+#define__is_target_os(x)0`
	`97`	`+#endif`
	`98`	`+`
	`99`	`+#if __is_target_os(macos)`
`96`	`100`	`#include"DirectoryWatcher-mac.inc.h"`
`97`	`101`	`#elif __has_include(<sys/inotify.h>)`
`98`	`102`	`#include"DirectoryWatcher-linux.inc.h"`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,8 @@ SymbolRoleSet index::getSymbolRoles(uint64_t Roles) {`
`275`	`275`	`SymbolRoles \|= (SymbolRoleSet)SymbolRole::RelationIBTypeOf;`
`276`	`276`	`if (Roles & INDEXSTORE_SYMBOL_ROLE_REL_SPECIALIZATIONOF)`
`277`	`277`	`SymbolRoles \|= (SymbolRoleSet)SymbolRole::RelationSpecializationOf;`
	`278`	`+if (Roles & INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE)`
	`279`	`+ SymbolRoles \|= (SymbolRoleSet)SymbolRole::NameReference;`
`278`	`280`
`279`	`281`	`return SymbolRoles;`
`280`	`282`	`}`
`@@ -511,6 +513,9 @@ uint64_t index::getIndexStoreRoles(SymbolRoleSet Roles) {`
`511`	`513`	`case SymbolRole::RelationSpecializationOf:`
`512`	`514`	`storeRoles \|= INDEXSTORE_SYMBOL_ROLE_REL_SPECIALIZATIONOF;`
`513`	`515`	`break;`
	`516`	`+case SymbolRole::NameReference:`
	`517`	`+ storeRoles \|= INDEXSTORE_SYMBOL_ROLE_NAMEREFERENCE;`
	`518`	`+break;`
`514`	`519`	`}`
`515`	`520`	`});`
`516`	`521`	`return storeRoles;`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,13 @@ endif()`
`6`	`6`	`get_property(clang_libsGLOBAL PROPERTY CLANG_STATIC_LIBS)`
`7`	`7`
`8`	`8`	`foreach (lib${clang_libs})`
`9`		`- list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)`
	`9`	`+ if(XCODE)`
	`10`	`+# Xcode doesn't support object libraries, so we have to trick it into`
	`11`	`+# linking the static libraries instead.`
	`12`	`+ list(APPEND _DEPS"-force_load"${lib})`
	`13`	`+ else()`
	`14`	`+ list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)`
	`15`	`+ endif()`
`10`	`16`	`list(APPEND _DEPS $<TARGET_PROPERTY:${lib},INTERFACE_LINK_LIBRARIES>)`
`11`	`17`	`list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)`
`12`	`18`	`endforeach ()`

Comments

(0)