Update the LLDB Xcode project to use the "GCC_ENABLE_CPP_RTTI" build setting instead of using a custom flag to disable rtti. This will avoid potential conflict between the 2 settings.
http://llvm-reviews.chandlerc.com/D2270 Files: lldb.xcodeproj/project.pbxproj Index: lldb.xcodeproj/project.pbxproj =================================================================== --- lldb.xcodeproj/project.pbxproj +++ lldb.xcodeproj/project.pbxproj @@ -4651,6 +4651,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, @@ -4714,6 +4715,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, __STDC_LIMIT_MACROS, @@ -4826,12 +4828,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -4891,12 +4891,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -5003,13 +5001,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5039,13 +5035,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5075,13 +5069,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5115,6 +5107,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, __STDC_LIMIT_MACROS, @@ -5228,12 +5221,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -5899,6 +5890,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, @@ -6028,12 +6020,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -6094,13 +6084,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER",
Index: lldb.xcodeproj/project.pbxproj =================================================================== --- lldb.xcodeproj/project.pbxproj +++ lldb.xcodeproj/project.pbxproj @@ -4651,6 +4651,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, @@ -4714,6 +4715,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, __STDC_LIMIT_MACROS, @@ -4826,12 +4828,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -4891,12 +4891,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -5003,13 +5001,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5039,13 +5035,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5075,13 +5069,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", @@ -5115,6 +5107,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, __STDC_LIMIT_MACROS, @@ -5228,12 +5221,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -5899,6 +5890,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = c99; + GCC_ENABLE_CPP_RTTI = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( __STDC_CONSTANT_MACROS, @@ -6028,12 +6020,10 @@ ); OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", ); @@ -6094,13 +6084,11 @@ MACH_O_TYPE = staticlib; OTHER_CPLUSPLUSFLAGS = ( "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7", - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER", ); "OTHER_CPLUSPLUSFLAGS[sdk=iphoneos*]" = ( - "-fno-rtti", "-Wglobal-constructors", "$(OTHER_CFLAGS)", "-DLLDB_USE_BUILTIN_DEMANGLER",
_______________________________________________ lldb-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
