Hello,
I think these should be harmless enough.
- Remove a bunch of trailing commas at the end of enumerated lists.
Fixes compilation with -fpedantic (and is more valid c++ anyway)
- Factor some harcoded python paths/flags into make variables. This allows users
to override these when building in other "environments". The correct
way, of course,
is to have the buildsystem extract these from python-config, but I'm not sure if
that'll need to be in llvm's configure script or in lldb.
--
Jai Menon
Index: source/Expression/IRForTarget.cpp
===================================================================
--- source/Expression/IRForTarget.cpp (revision 124513)
+++ source/Expression/IRForTarget.cpp (working copy)
@@ -374,7 +374,7 @@
result_decl_type);
}
- StoreInst *synthesized_store = new StoreInst::StoreInst(initializer,
+ StoreInst *synthesized_store = new llvm::StoreInst(initializer,
new_result_global,
first_entry_instruction);
Index: lib/Makefile
===================================================================
--- lib/Makefile (revision 124513)
+++ lib/Makefile (working copy)
@@ -17,6 +17,8 @@
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
+PYTHON_BUILD_FLAGS = -lpython2.6
+
# Include all archives in liblldb.a files
USEDLIBS = lldbAPI.a \
lldbBreakpoint.a \
@@ -84,7 +86,7 @@
LLVMLibsOptions += -avoid-version
LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
LLVMLibsOptions += -framework Foundation -framework CoreFoundation
- LLVMLibsOptions += -framework DebugSymbols -lpython2.6 -lobjc
+ LLVMLibsOptions += -framework DebugSymbols $(PYTHON_BUILD_FLAGS) -lobjc
LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports"
# Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
@@ -101,5 +103,5 @@
# Don't allow unresolved symbols.
LLVMLibsOptions += -Wl,--no-undefined
# Link in python
- LD.Flags += -lpython2.6
+ LD.Flags += $(PYTHON_BUILD_FLAGS)
endif
Index: Makefile
===================================================================
--- Makefile (revision 124513)
+++ Makefile (working copy)
@@ -28,12 +28,15 @@
# Include LLVM common makefile.
include $(LEVEL)/Makefile.common
+# Set Python include directory
+PYTHON_INC_DIR = /usr/include/python2.6
+
# Set common LLDB build flags.
CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include
CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/include
CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/../clang/include
CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/../clang/include
-CPP.Flags += -I/usr/include/python2.6
+CPP.Flags += -I$(PYTHON_INC_DIR)
CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source
CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Utility
CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/Utility
Index: include/lldb/Target/ThreadPlanTracer.h
===================================================================
--- include/lldb/Target/ThreadPlanTracer.h (revision 124513)
+++ include/lldb/Target/ThreadPlanTracer.h (working copy)
@@ -31,7 +31,7 @@
eLocation = 0,
eStateChange,
eCheckFrames,
- ePython,
+ ePython
} ThreadPlanTracerStyle;
ThreadPlanTracer (Thread &thread, lldb::StreamSP &stream_sp);
ThreadPlanTracer (Thread &thread);
Index: source/Commands/CommandObjectBreakpoint.h
===================================================================
--- source/Commands/CommandObjectBreakpoint.h (revision 124513)
+++ source/Commands/CommandObjectBreakpoint.h (working copy)
@@ -284,7 +284,7 @@
typedef enum BreakpointClearType
{
eClearTypeInvalid,
- eClearTypeFileAndLine,
+ eClearTypeFileAndLine
} BreakpointClearType;
CommandObjectBreakpointClear (CommandInterpreter &interpreter);
Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
===================================================================
--- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (revision 124513)
+++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (working copy)
@@ -216,7 +216,7 @@
flagsGotDebugPubNamesData = (1 << 7),
flagsGotDebugPubTypesData = (1 << 8),
flagsGotDebugRangesData = (1 << 9),
- flagsGotDebugStrData = (1 << 10),
+ flagsGotDebugStrData = (1 << 10)
};
DISALLOW_COPY_AND_ASSIGN (SymbolFileDWARF);
Index: source/Plugins/Process/Utility/EmulateInstructionARM.cpp
===================================================================
--- source/Plugins/Process/Utility/EmulateInstructionARM.cpp (revision 124513)
+++ source/Plugins/Process/Utility/EmulateInstructionARM.cpp (working copy)
@@ -43,7 +43,7 @@
eEncodingT2,
eEncodingT3,
eEncodingT4,
- eEncodingT5,
+ eEncodingT5
} ARMEncoding;
typedef enum
Index: source/Plugins/Process/Utility/EmulateInstruction.h
===================================================================
--- source/Plugins/Process/Utility/EmulateInstruction.h (revision 124513)
+++ source/Plugins/Process/Utility/EmulateInstruction.h (working copy)
@@ -25,7 +25,7 @@
eContextImmediate,
eContextPushRegisterOnStack,
eContextAdjustStackPointer,
- eContextRegisterPlusOffset,
+ eContextRegisterPlusOffset
};
struct Context
@@ -55,7 +55,7 @@
eOpcode16,
eOpcode32,
eOpcode64,
- eOpcodeBytes,
+ eOpcodeBytes
};
struct Instruction
_______________________________________________
lldb-dev mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-dev
