[Lldb-commits] [lldb] r161293 - in /lldb/trunk: include/lldb/Core/cxa_demangle.h lldb.xcodeproj/project.pbxproj source/Core/Mangled.cpp source/Core/cxa_demangle.cpp

[Pawel Worach]

Hi,

This broke the build on FreeBSD:
cxa_demangle.cpp:10:26: error: cxa_demangle.h: No such file or directory
But even with the patch below it dies on:
/data/buildslave/lldb-amd64-freebsd/src-llvm/tools/lldb/source/Core/cxa_demangle.cpp:6675: error: 'dynamic_cast' not permitted with -fno-rtti
/data/buildslave/lldb-amd64-freebsd/src-llvm/tools/lldb/source/Core/cxa_demangle.cpp:10847: error: 'dynamic_cast' not permitted with -fno-rtti

Index: lldb/source/Core/cxa_demangle.cpp
===================================================================
--- lldb/source/Core/cxa_demangle.cpp	(revision 161295)
+++ lldb/source/Core/cxa_demangle.cpp	(working copy)
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "cxa_demangle.h"
+#include "lldb/Core/cxa_demangle.h"
 
 #include <stdlib.h>
 #include <string.h>

ps. I also have these patches to fix the build in other places:

Index: tools/driver/IOChannel.cpp
===================================================================
--- tools/driver/IOChannel.cpp  (revision 161295)
+++ tools/driver/IOChannel.cpp  (working copy)
@@ -220,7 +220,7 @@
     el_set (m_edit_line, EL_BIND, m_completion_key, "lldb_complete", NULL);
     el_set (m_edit_line, EL_BIND, "^r", "em-inc-search-prev", NULL);  // Cycle through backwards search, entering string
     el_set (m_edit_line, EL_BIND, "^w", "ed-delete-prev-word", NULL); // Delete previous word, behave like bash does.
-    el_set (m_edit_line, EL_BIND, "\e[3~", "ed-delete-next-char", NULL); // Fix the delete key.
+    el_set (m_edit_line, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL); // Fix the delete key.
     el_set (m_edit_line, EL_CLIENTDATA, this);
 
     // Source $PWD/.editrc then $HOME/.editrc
Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp      (revision 161295)
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp      (working copy)
@@ -748,7 +748,7 @@
     for (size_t idx = 0; idx < num_cmds; idx++)
     {
         StringExtractorGDBRemote response;
-        printf ("Sending command: \%s.\n", GetExtraStartupCommands().GetArgumentAtIndex(idx));
+        printf ("Sending command: %s.\n", GetExtraStartupCommands().GetArgumentAtIndex(idx));
         m_gdb_comm.SendPacketAndWaitForResponse (GetExtraStartupCommands().GetArgumentAtIndex(idx), response, false);
     }
     return error;


-- 
Pawel