From 7018b3c67e5eec97a24da2d967a0ebeab6b6f8bb Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 24 Nov 2012 08:09:01 -0600
Subject: [PATCH] Rpi: Convert start.c to cpp

* Wrap _start in extern "C" to prevent
  symbol mangling.
* Thanks mmlr for reminding me of this! :)
---
 src/system/boot/platform/raspberrypi_arm/Jamfile             | 2 +-
 .../boot/platform/raspberrypi_arm/{start.c => start.cpp}     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename src/system/boot/platform/raspberrypi_arm/{start.c => start.cpp} (97%)

diff --git a/src/system/boot/platform/raspberrypi_arm/Jamfile b/src/system/boot/platform/raspberrypi_arm/Jamfile
index 034ecea576f..e1cb1f77cac 100644
--- a/src/system/boot/platform/raspberrypi_arm/Jamfile
+++ b/src/system/boot/platform/raspberrypi_arm/Jamfile
@@ -22,7 +22,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
 BootMergeObject boot_platform_raspberrypi_arm.o :
 	entry.S
-	start.c
+	start.cpp
 	console.cpp
 	cpu.cpp
 	debug.cpp
diff --git a/src/system/boot/platform/raspberrypi_arm/start.c b/src/system/boot/platform/raspberrypi_arm/start.cpp
similarity index 97%
rename from src/system/boot/platform/raspberrypi_arm/start.c
rename to src/system/boot/platform/raspberrypi_arm/start.cpp
index 4bb89729b14..5395444b6c7 100644
--- a/src/system/boot/platform/raspberrypi_arm/start.c
+++ b/src/system/boot/platform/raspberrypi_arm/start.cpp
@@ -15,7 +15,7 @@
 #include <KernelExport.h>
 #include <boot/platform.h>
 #include <boot/heap.h>
-//#include <boot/stage2.h>
+#include <boot/stage2.h>
 #include <arch/cpu.h>
 
 #include <string.h>
@@ -102,7 +102,7 @@ platform_exit(void)
 }
 
 
-void
+extern "C" void
 _start(void)
 {
 	stage2_args args;
@@ -128,4 +128,3 @@ _start(void)
 
 	main(&args);
 }
-