Changeset 365

Timestamp:

Mar 11, 2009, 3:32:37 AM (11 years ago)

Author:

khorben

Message:

Merge from upstream

File:

• trunk/System/Sources/libc/src/start.S (modified) (3 diffs)

trunk/System/Sources/libc/src/start.S

@@ -1 @@
-/* $Id: start.S,v 1.23 2009/02/19 21:48:10 khorben Exp $ */
+/* $Id: start.S,v 1.24 2009/03/06 12:28:45 khorben Exp $ */
 /* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS System libc */
@@ -23 +23 @@
 
 
+/* FreeBSD */
+#if defined(__FreeBSD__)
+# if defined(__amd64__)
+#  include "kernel/freebsd/amd64/start.S"
+# elif defined(__i386__)
+#  include "kernel/freebsd/i386/start.S"
+# else /* !__amd64__ && !__i386__ */
+#  warning Unsupported FreeBSD architecture
+# endif
+
 /* Linux */
-#if defined(__linux__)
+#elif defined(__linux__)
 # if defined(__arm__)
 #  include "kernel/linux/arm/start.S"
@@ -33 +43 @@
 # else /* !__arm__ && !__i386__ && !__sparc__ */
 #  warning Unsupported Linux architecture
-# endif
-
-/* FreeBSD */
-#elif defined(__FreeBSD__)
-# if defined(__i386__)
-#  include "kernel/freebsd/i386/start.S"
-# else /* !__i386__ */
-#  warning Unsupported FreeBSD architecture
 # endif