Author: penryu
Date: Wed Mar 22 11:47:14 2017
New Revision: 298517
URL: http://llvm.org/viewvc/llvm-project?rev=298517&view=rev
Log:
Merge changes from r298466 into Xcode project
rdar://problem/31197116
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=298517&r1=298516&r2=298517&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Mar 22 11:47:14 2017
@@ -1345,8 +1345,8 @@
23EDE3371926AAD500F6A132 /* RegisterInfoInterface.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name =
RegisterInfoInterface.h; path = Utility/RegisterInfoInterface.h; sourceTree =
"<group>"; };
23EFE388193D1ABC00E54E54 /* SBTypeEnumMember.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name =
SBTypeEnumMember.h; path = include/lldb/API/SBTypeEnumMember.h; sourceTree =
"<group>"; };
23EFE38A193D1AEC00E54E54 /* SBTypeEnumMember.cpp */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SBTypeEnumMember.cpp; path = source/API/SBTypeEnumMember.cpp; sourceTree =
"<group>"; };
- 23F403471926C8D50046DC9B /* NativeRegisterContextRegisterInfo.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; name = NativeRegisterContextRegisterInfo.h; path =
include/lldb/Host/common/NativeRegisterContextRegisterInfo.h; sourceTree =
"<group>"; };
- 23F403481926CC250046DC9B /*
NativeRegisterContextRegisterInfo.cpp */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name =
NativeRegisterContextRegisterInfo.cpp; path =
source/Host/common/NativeRegisterContextRegisterInfo.cpp; sourceTree =
"<group>"; };
+ 23F403471926C8D50046DC9B /* NativeRegisterContextRegisterInfo.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; name = NativeRegisterContextRegisterInfo.h; path =
Utility/NativeRegisterContextRegisterInfo.h; sourceTree = "<group>"; };
+ 23F403481926CC250046DC9B /*
NativeRegisterContextRegisterInfo.cpp */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name =
NativeRegisterContextRegisterInfo.cpp; path =
Utility/NativeRegisterContextRegisterInfo.cpp; sourceTree = "<group>"; };
250D6AE11A9679270049CC70 /* FileSystem.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = FileSystem.cpp; sourceTree = "<group>"; };
25420ECC1A6490B8009ADBCB /* OptionValueChar.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = OptionValueChar.cpp; path = source/Interpreter/OptionValueChar.cpp;
sourceTree = "<group>"; };
25420ECE1A64911B009ADBCB /* OptionValueChar.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionValueChar.h;
path = include/lldb/Interpreter/OptionValueChar.h; sourceTree = "<group>"; };
@@ -4506,6 +4506,8 @@
26B4666E11A2080F00CF6220 /* Utility */ = {
isa = PBXGroup;
children = (
+ 23F403471926C8D50046DC9B /*
NativeRegisterContextRegisterInfo.h */,
+ 23F403481926CC250046DC9B /*
NativeRegisterContextRegisterInfo.cpp */,
B287E63E12EFAE2C00C9BEFE /* ARMDefines.h */,
B23DD24F12EDFAC1000C3894 /* ARMUtils.h */,
26954EBC1401EE8B00294D09 /*
DynamicRegisterInfo.cpp */,
@@ -5302,8 +5304,6 @@
26E3EEBD11A9870400FBADB6 /* Unwind.h */,
264D8D4E13661BCC003A368F /* UnwindAssembly.h */,
264D8D4F13661BD7003A368F /* UnwindAssembly.cpp
*/,
- 23F403471926C8D50046DC9B /*
NativeRegisterContextRegisterInfo.h */,
- 23F403481926CC250046DC9B /*
NativeRegisterContextRegisterInfo.cpp */,
);
name = Target;
sourceTree = "<group>";
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
