Changeset 372


Ignore:
Timestamp:
Mar 19, 2009, 5:06:25 PM (12 years ago)
Author:
khorben
Message:

Merge from upstream

Location:
trunk/System/Sources/libc/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/System/Sources/libc/src/Makefile

    r330 r372  
    1313AR      = ar -rc
    1414RANLIB  = ranlib
    15 LD      = $(CC) -shared
     15LD      = $(CC) -nostdlib -shared
    1616LN      = ln
    1717LIBTOOL = libtool

  • trunk/System/Sources/libc/src/dl/Makefile

    r330 r372  
    1010AR      = ar -rc
    1111RANLIB  = ranlib
    12 LD      = $(CC) -shared
     12LD      = $(CC) -nostdlib -shared
    1313LN      = ln
    1414LIBTOOL = libtool

  • trunk/System/Sources/libc/src/kernel/freebsd/Makefile

    r331 r372  
    1 SUBDIRS = i386
     1SUBDIRS = amd64 i386
    22
    33

  • trunk/System/Sources/libc/src/math/Makefile

    r330 r372  
    1212AR      = ar -rc
    1313RANLIB  = ranlib
    14 LD      = $(CC) -shared
     14LD      = $(CC) -nostdlib -shared
    1515LN      = ln
    1616LIBTOOL = libtool

  • trunk/System/Sources/libc/src/socket/Makefile

    r330 r372  
    1 SUBDIRS = kernel/linux kernel/netbsd
     1SUBDIRS = kernel/freebsd kernel/linux kernel/netbsd
    22TARGETS = libsocket.la
    33PREFIX  = /usr/local
    … …  
    1010CFLAGS  = -Wall -g -ansi -ffreestanding
    1111AS      = $(CC)
    12 ASFLAGS = -W -Wall -g -ansi -c
     12ASFLAGS = $(CFLAGS) -c
    1313AR      = ar -rc
    1414RANLIB  = ranlib
    15 LD      = $(CC) -shared
     15LD      = $(CC) -nostdlib -shared
    1616LN      = ln
    1717LIBTOOL = libtool

  • trunk/System/Sources/libc/src/socket/syscalls.S

    r368 r372  
    1 /* $Id: syscalls.S,v 1.15 2009-02-22 01:43:06 khorben Exp $ */
     1/* $Id: syscalls.S,v 1.16 2009-03-06 13:12:03 khorben Exp $ */
    22/* Copyright (c) 2008 Pierre Pronchery <khorben@defora.org> */
    33/* This file is part of DeforaOS System libc */
    … …  
    1616
    1717
     18#include "syscalls.h"
     19
     20
    1821.text
    1922
    … …  
    2124/* FreeBSD */
    2225#if defined(__FreeBSD__)
    23 # include "kernel/freebsd/common.h"
    2426# if defined(__amd64__)
    2527#  include "kernel/freebsd/amd64/syscalls.S"
    … …  
    3032/* Linux */
    3133#elif defined(__linux__)
    32 # include "kernel/linux/common.h"
    3334# if defined(__arm__)
    3435#  include "kernel/linux/arm/syscalls.S"
    … …  
    4142/* NetBSD */
    4243#elif defined(__NetBSD__)
    43 # include "kernel/netbsd/common.h"
    4444# if defined(__amd64__)
    4545#  include "kernel/netbsd/amd64/syscalls.S"

  • trunk/System/Sources/libc/src/socket/syscalls.h

    r330 r372  
    1 /* $Id: syscalls.h,v 1.5 2009/02/19 21:44:06 khorben Exp $ */
     1/* $Id: syscalls.h,v 1.6 2009-03-06 13:12:03 khorben Exp $ */
    22/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
    33/* This file is part of RunningBear System libc */
    … …  
    1919# define LIBSOCKET_SYSCALLS_H
    2020
    21 # if defined(__linux__)
     21# if defined(__FreeBSD___)
     22#  include "kernel/freebsd/common.h"
     23# elif defined(__linux__)
    2224#  include "kernel/linux/common.h"
    2325# elif defined(__NetBSD__)
Note: See TracChangeset for help on using the changeset viewer.