Changeset 365


Ignore:
Timestamp:
Mar 11, 2009, 3:32:37 AM (9 years ago)
Author:
khorben
Message:

Merge from upstream

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/System/Sources/libc/src/start.S

    r330 r365  
    1 /* $Id: start.S,v 1.23 2009/02/19 21:48:10 khorben Exp $ */
     1/* $Id: start.S,v 1.24 2009/03/06 12:28:45 khorben Exp $ */
    22/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
    33/* This file is part of DeforaOS System libc */
     
    2323
    2424
     25/* FreeBSD */
     26#if defined(__FreeBSD__)
     27# if defined(__amd64__)
     28#  include "kernel/freebsd/amd64/start.S"
     29# elif defined(__i386__)
     30#  include "kernel/freebsd/i386/start.S"
     31# else /* !__amd64__ && !__i386__ */
     32#  warning Unsupported FreeBSD architecture
     33# endif
     34
    2535/* Linux */
    26 #if defined(__linux__)
     36#elif defined(__linux__)
    2737# if defined(__arm__)
    2838#  include "kernel/linux/arm/start.S"
     
    3343# else /* !__arm__ && !__i386__ && !__sparc__ */
    3444#  warning Unsupported Linux architecture
    35 # endif
    36 
    37 /* FreeBSD */
    38 #elif defined(__FreeBSD__)
    39 # if defined(__i386__)
    40 #  include "kernel/freebsd/i386/start.S"
    41 # else /* !__i386__ */
    42 #  warning Unsupported FreeBSD architecture
    4345# endif
    4446
Note: See TracChangeset for help on using the changeset viewer.