Ticket #8422: userlandfs_debug.patch

src/add-ons/kernel/file_systems/userlandfs/server/Jamfile

@@ -17 +17 @@
 DEFINES += DEBUG_APP="\\\"userlandfs_server\\\"" ;
 DEFINES += BUILDING_USERLAND_FS_SERVER=1 ;
 
+if $(DEBUG) > 0 {
+    SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tests add-ons kernel
+        kernelland_emu ] ;
+    DEBUG_FILES += debug.cpp lock.cpp misc.cpp scheduler.cpp ;
+}
+
 Application userlandfs_server
     :
     AreaSupport.cpp
@@ -42 +48 @@
     UserlandRequestHandler.cpp
     Volume.cpp
 
+    $(DEBUG_FILES)
     :
     be
     $(TARGET_LIBSUPC++)

src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp

@@ -22 +22 @@
 #include "SingleReplyRequestHandler.h"
 #include "Volume.h"
 
+// When GCC 2 compiles inline functions in debug mode, it doesn't throw away
+// the generated non-inlined functions, if they aren't used. So we have to
+// provide the dependencies referenced by inline functions in private kernel
+// headers.
+#if __GNUC__ == 2 && DEBUG
+#include <cpu.h>
+#include <smp.h>
+
+#undef acquire_spinlock
+
+cpu_ent gCPU[1];
+
+
+int32
+smp_get_current_cpu(void)
+{
+    return 0;
+}
+
+
+void
+acquire_spinlock(spinlock* lock)
+{ }
+
+
+#endif  // __GNUC__ == 2
 
 // constructor
 UserlandRequestHandler::UserlandRequestHandler(FileSystem* fileSystem)

src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp

@@ -33 +33 @@
 // the generated non-inlined functions, if they aren't used. So we have to
 // provide the dependencies referenced by inline functions in private kernel
 // headers.
-#if __GNUC__ == 2
+#if __GNUC__ == 2 && DEBUG
 
 #include <cpu.h>
 #include <smp.h>
 
+#undef acquire_spinlock
+
 cpu_ent gCPU[1];
 
 
@@ -48 +50 @@
 }
 
 
+void
+acquire_spinlock(spinlock* lock)
+{ }
+
+
 #endif  // __GNUC__ == 2