Changeset fcd7053 in mainline for uspace/srv


Ignore:
Timestamp:
2009-02-12T20:11:25Z (17 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa024ce
Parents:
84266669
Message:

cleanup configuration
code cleanup

Location:
uspace/srv
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/console/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
    36 include $(LIBC_PREFIX)/Makefile.toolchain
     34
     35include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    3837CFLAGS += -I. -I../kbd/include -I../fb
    … …  
    7574
    7675$(OUTPUT): $(OBJECTS) $(LIBS)
    77         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     76        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7877
    7978disasm: $(OUTPUT).disasm

  • uspace/srv/devmap/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    4746        devmap.c
    4847
    49 CFLAGS += -D$(ARCH)
     48CFLAGS += -D$(UARCH)
    5049
    5150OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    … …  
    6463
    6564$(OUTPUT): $(OBJECTS) $(LIBS)
    66         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     65        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6766
    6867disasm: $(OUTPUT).disasm

  • uspace/srv/fb/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    4847        ppm.c
    4948
    50 ifneq ($(ARCH), ia64)
     49ifneq ($(UARCH),ia64)
    5150        SOURCES += fb.c \
    5251                font-8x16.c
    5352        CFLAGS += -DFB_ENABLED
    5453endif
    55 ifeq ($(ARCH), ia32)
     54
     55ifeq ($(UARCH),ia32)
    5656        SOURCES += ega.c
    5757        CFLAGS += -DEGA_ENABLED
    5858endif
    59 ifeq ($(ARCH), ia64)
     59
     60ifeq ($(UARCH),ia64)
    6061        SOURCES += ega.c \
    61                    ski.c \
    62                    serial_console.c
     62                ski.c \
     63                serial_console.c
    6364        CFLAGS += -DSKI_ENABLED
    6465        CFLAGS += -DEGA_ENABLED
    6566endif
    66 ifeq ($(ARCH), amd64)
     67
     68ifeq ($(UARCH),amd64)
    6769        SOURCES += ega.c
    6870        CFLAGS += -DEGA_ENABLED
    6971endif
    70 ifeq ($(ARCH), arm32)
    71         CFLAGS += -DFB_INVERT_ENDIAN
     72
     73ifeq ($(UARCH),mips32)
     74        SOURCES += msim.c \
     75                serial_console.c
     76        CFLAGS += -DMSIM_ENABLED
    7277endif
    73 ifeq ($(ARCH), mips32)
    74         SOURCES += msim.c \
    75                    serial_console.c
    76         CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
    77 endif
    78 ifeq ($(ARCH), sparc64)
     78
     79ifeq ($(UARCH),sparc64)
    7980        SOURCES += sgcn.c \
    80                    serial_console.c
     81                serial_console.c
    8182        CFLAGS += -DSGCN_ENABLED
    8283endif
    8384
    84 CFLAGS += -D$(ARCH)
     85CFLAGS += -D$(UARCH)
    8586
    8687
    … …  
    100101
    101102$(OUTPUT): $(OBJECTS) $(LIBS)
    102         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     103        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    103104
    104105disasm: $(OUTPUT).disasm

  • uspace/srv/fb/fb.c

    r84266669 rfcd7053  
    237237
    238238
     239/** RGB 8:8:8 conversion
     240 *
     241 */
     242static void rgb_888(void *dst, uint32_t rgb)
     243{
     244        ((uint8_t *) dst)[0] = BLUE(rgb, 8);
     245        ((uint8_t *) dst)[1] = GREEN(rgb, 8);
     246        ((uint8_t *) dst)[2] = RED(rgb, 8);
     247}
     248
     249
    239250/** BGR 8:8:8 conversion
    240251 *
    241252 */
    242 static void rgb_888(void *dst, uint32_t rgb)
    243 {
    244 #if defined(FB_INVERT_ENDIAN)
     253static void bgr_888(void *dst, uint32_t rgb)
     254{
    245255        ((uint8_t *) dst)[0] = RED(rgb, 8);
    246256        ((uint8_t *) dst)[1] = GREEN(rgb, 8);
    247257        ((uint8_t *) dst)[2] = BLUE(rgb, 8);
    248 #else
    249         ((uint8_t *) dst)[0] = BLUE(rgb, 8);
    250         ((uint8_t *) dst)[1] = GREEN(rgb, 8);
    251         ((uint8_t *) dst)[2] = RED(rgb, 8);
    252 #endif
    253258}
    254259
    … …  
    596601        case VISUAL_RGB_8_8_8:
    597602                screen.rgb_conv = rgb_888;
     603                screen.pixelbytes = 3;
     604                break;
     605        case VISUAL_BGR_8_8_8:
     606                screen.rgb_conv = bgr_888;
    598607                screen.pixelbytes = 3;
    599608                break;

  • uspace/srv/fs/fat/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../../lib/libc
    3533LIBFS_PREFIX = ../../../lib/libfs
    3634LIBBLOCK_PREFIX = ../../../lib/libblock
    3735SOFTINT_PREFIX = ../../../lib/softint
     36
    3837include $(LIBC_PREFIX)/Makefile.toolchain
    3938
    … …  
    7170
    7271$(OUTPUT): $(OBJECTS) $(LIBS)
    73         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     72        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7473
    7574disasm: $(OUTPUT).disasm

  • uspace/srv/fs/fat/fat.c

    r84266669 rfcd7053  
    123123        int rc;
    124124
    125         printf("FAT: HelenOS FAT file system server.\n");
     125        printf("fat: HelenOS FAT file system server.\n");
    126126
    127127        rc = fat_idx_init();

  • uspace/srv/fs/tmpfs/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../../lib/libc
    3533LIBFS_PREFIX = ../../../lib/libfs
    3634LIBBLOCK_PREFIX = ../../../lib/libblock
    3735SOFTINT_PREFIX = ../../../lib/softint
     36
    3837include $(LIBC_PREFIX)/Makefile.toolchain
    3938
    … …  
    6968
    7069$(OUTPUT): $(OBJECTS) $(LIBS)
    71         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     70        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7271
    7372disasm: $(OUTPUT).disasm

  • uspace/srv/kbd/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    4948
    5049ARCH_SOURCES = \
    51         arch/$(ARCH)/src/kbd.c
     50        arch/$(UARCH)/src/kbd.c
    5251
    53 ifeq ($(ARCH), ia32)
     52ifeq ($(UARCH), ia32)
    5453        ARCH_SOURCES += \
    55                 arch/$(ARCH)/src/mouse.c \
    56                 arch/$(ARCH)/src/scanc.c
     54                arch/$(UARCH)/src/mouse.c \
     55                arch/$(UARCH)/src/scanc.c
    5756        GENARCH_SOURCES = \
    5857                genarch/src/kbd.c
    5958        CFLAGS += -DMOUSE_ENABLED
    6059endif
    61 ifeq ($(ARCH), ia64)
     60ifeq ($(UARCH), ia64)
    6261        ARCH_SOURCES += \
    63                 arch/$(ARCH)/src/mouse.c \
    64                 arch/$(ARCH)/src/scanc.c \
    65                 arch/$(ARCH)/src/lkbd.c
     62                arch/$(UARCH)/src/mouse.c \
     63                arch/$(UARCH)/src/scanc.c \
     64                arch/$(UARCH)/src/lkbd.c
    6665        GENARCH_SOURCES = \
    6766                genarch/src/kbd.c
    6867        CFLAGS += -DMOUSE_ENABLED
    6968endif
    70 ifeq ($(ARCH), amd64)
     69ifeq ($(UARCH), amd64)
    7170        ARCH_SOURCES += \
    72                 arch/$(ARCH)/src/mouse.c \
    73                 arch/$(ARCH)/src/scanc.c
     71                arch/$(UARCH)/src/mouse.c \
     72                arch/$(UARCH)/src/scanc.c
    7473        GENARCH_SOURCES = \
    7574                genarch/src/kbd.c
    7675        CFLAGS += -DMOUSE_ENABLED
    7776endif
    78 ifeq ($(ARCH), sparc64)
     77ifeq ($(UARCH), sparc64)
    7978        ARCH_SOURCES += \
    80                 arch/$(ARCH)/src/scanc.c \
    81                 arch/$(ARCH)/src/sgcn.c
     79                arch/$(UARCH)/src/scanc.c \
     80                arch/$(UARCH)/src/sgcn.c
    8281        GENARCH_SOURCES = \
    8382                genarch/src/kbd.c \
    8483                genarch/src/nofb.c
    8584endif
    86 ifeq ($(ARCH), arm32)
     85ifeq ($(UARCH), arm32)
    8786        ARCH_SOURCES += \
    88                 arch/$(ARCH)/src/kbd_gxemul.c
     87                arch/$(UARCH)/src/kbd_gxemul.c
    8988endif
    90 ifeq ($(ARCH), mips32)
     89ifeq ($(UARCH), mips32)
    9190        GENARCH_SOURCES += \
    9291            genarch/src/nofb.c
    9392endif
    94 ifeq ($(ARCH), mips32eb)
     93ifeq ($(UARCH), mips32eb)
    9594        GENARCH_SOURCES += \
    9695            genarch/src/nofb.c
    … …  
    110109
    111110links:
    112         ln -sfn ../arch/$(ARCH)/include include/arch
     111        ln -sfn ../arch/$(UARCH)/include include/arch
    113112        ln -sfn ../genarch/include include/genarch
    114113
    … …  
    120119
    121120$(OUTPUT): $(OBJECTS) $(LIBS)
    122         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     121        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    123122
    124123disasm: $(OUTPUT).disasm

  • uspace/srv/kbd/arch/ia64/src/kbd.c

    r84266669 rfcd7053  
    115115
    116116
    117 
    118 irq_cmd_t ski_cmds[1] = {
    119         { CMD_IA64_GETCHAR, 0, 0, 2 }
    120 };
    121 
    122 irq_code_t ski_kbd = {
    123         1,
    124         ski_cmds
    125 };
    126 
    127 
    128 
    129117irq_cmd_t ns16550_cmds[1] = {
    130118        { CMD_PORT_READ_1, 0, 0, 2 },
    … …  
    145133        if (sysinfo_value("kbd")) {
    146134                kbd_type=sysinfo_value("kbd.type");
    147                 if(kbd_type==KBD_SKI) ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ski_kbd);
    148                 if(kbd_type==KBD_LEGACY) return lkbd_arch_init();
    149                 if(kbd_type==KBD_NS16550) {
    150                         ns16550_kbd.cmds[0].addr= (void *)  (sysinfo_value("kbd.port")+RBR_REG);
     135                if (kbd_type == KBD_LEGACY)
     136                        return lkbd_arch_init();
     137                if (kbd_type == KBD_NS16550) {
     138                        ns16550_kbd.cmds[0].addr = (void *) (sysinfo_value("kbd.port") + RBR_REG);
    151139                        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ns16550_kbd);
    152                         iospace_enable(task_get_id(),ns16550_port=sysinfo_value("kbd.port"),8);
    153                 }       
     140                        iospace_enable(task_get_id(), ns16550_port = sysinfo_value("kbd.port"), 8);
     141                }
    154142                return 0;
    155         }       
     143        }
    156144        return 1;
    157145}
    … …  
    171159        static unsigned long buf = 0;
    172160        static int count = 0, esc_count=0;     
    173 
     161       
    174162        int scan_code = IPC_GET_ARG2(*call);
    175 
     163       
    176164        if (scan_code == 0x1b) {
    177165                esc_count++;
    … …  
    182170                esc_count = 0;
    183171        }
    184 
    185         if(scan_code==0x0d) return 1;   //Delete CR
    186         if(scan_code==0x7f) scan_code='\b';     //Convert backspace
    187 
     172       
     173        if (scan_code == 0x0d)
     174                return 1;        /* Delete CR */
     175        if (scan_code == 0x7f)
     176                scan_code='\b';  /* Convert backspace */
     177       
    188178        if(scan_code == 0x7e) {
    189179                switch (buf) {
    … …  
    308298        return 1;
    309299}
    310 
    311 
    312 
    313 
    314 
    315 
    316300
    317301int kbd_ski_process(keybuffer_t *keybuffer, ipc_call_t *call)
    … …  
    394378{
    395379        printf("KBD Key pressed: %x(%c)\n",IPC_GET_ARG2(*call),IPC_GET_ARG2(*call));
    396         if(kbd_type==KBD_SKI) return kbd_ski_process(keybuffer,call);
    397         if(kbd_type==KBD_NS16550) return kbd_ns16550_process(keybuffer,call);
    398         if(kbd_type==KBD_LEGACY) return lkbd_arch_process(keybuffer,call);
    399 
    400        
     380        if (kbd_type == KBD_SKI)
     381                return kbd_ski_process(keybuffer, call);
     382        if (kbd_type == KBD_NS16550)
     383                return kbd_ns16550_process(keybuffer,call);
     384        if (kbd_type == KBD_LEGACY)
     385                return lkbd_arch_process(keybuffer,call);
    401386}
    402387
    … …  
    405390/**
    406391 * @}
    407  */ 
     392 */

  • uspace/srv/kbd/arch/ppc32/src/kbd.c

    r84266669 rfcd7053  
    4040#include <kbd.h>
    4141#include <keys.h>
    42 
    43 irq_cmd_t cuda_cmds[1] = {
    44         { CMD_PPC32_GETCHAR, 0, 0, 2 }
    45 };
    46 
    47 irq_code_t cuda_kbd = {
    48         1,
    49         cuda_cmds
    50 };
    5142
    5243
    … …  
    187178                return 0;
    188179       
    189         return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &cuda_kbd);
     180        return ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, 0);
    190181}
    191182

  • uspace/srv/loader/Makefile

    r84266669 rfcd7053  
    2828#
    2929
    30 -include ../../../Makefile.config
    31 
    3230## Setup toolchain
    3331#
    … …  
    3533LIBC_PREFIX = ../../lib/libc
    3634SOFTINT_PREFIX = ../../lib/softint
     35
    3736include $(LIBC_PREFIX)/Makefile.toolchain
    38 include arch/$(ARCH)/Makefile.inc
     37include arch/$(UARCH)/Makefile.inc
    3938
    4039CFLAGS += -Iinclude
    4140
    4241LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
    43 DEFS += -DRELEASE=\"$(RELEASE)\"
    44 
    45 ifdef REVISION
    46         DEFS += "-DREVISION=\"$(REVISION)\""
    47 endif
    48 
    49 ifdef TIMESTAMP
    50         DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    51 endif
    5242
    5343## Sources
    … …  
    7060
    7161clean:
    72         -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
     62        -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
    7363
    7464depend:
    7565        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    7666
    77 $(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
    78         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
     67$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
     68        $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
    7969
    8070disasm:
    8171        $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
    8272
    83 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     73arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
    8474        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
    8575

  • uspace/srv/loader/arch/amd64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/amd64.s
     30ARCH_SOURCES := arch/$(UARCH)/amd64.s

  • uspace/srv/loader/arch/amd64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/srv/loader/arch/arm32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/arm32.s
     30ARCH_SOURCES := arch/$(UARCH)/arm32.s

  • uspace/srv/loader/arch/arm32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ia32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ia32.s
     30ARCH_SOURCES := arch/$(UARCH)/ia32.s

  • uspace/srv/loader/arch/ia32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The difference from _link.ld.in for regular statically-linked apps
    33 * is the base address and the special interp section.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ia64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ia64.s
     30ARCH_SOURCES := arch/$(UARCH)/ia64.s
    3131AFLAGS += -xexplicit

  • uspace/srv/loader/arch/ia64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/srv/loader/arch/mips32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/mips32.s
     30ARCH_SOURCES := arch/$(UARCH)/mips32.s

  • uspace/srv/loader/arch/mips32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ppc32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ppc32.s
     30ARCH_SOURCES := arch/$(UARCH)/ppc32.s

  • uspace/srv/loader/arch/ppc32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/sparc64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/sparc64.s
     30ARCH_SOURCES := arch/$(UARCH)/sparc64.s

  • uspace/srv/loader/arch/sparc64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/srv/ns/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    6059
    6160$(OUTPUT): $(OBJECTS) $(LIBS)
    62         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     61        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6362
    6463disasm: $(OUTPUT).disasm

  • uspace/srv/pci/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    6362$(OUTPUT): $(OBJECTS) $(LIBS)
    6463        $(MAKE) -C libpci
    65         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     64        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6665
    6766disasm:

  • uspace/srv/pci/libpci/Makefile

    r84266669 rfcd7053  
    33
    44# Modified and ported to HelenOS by Jakub Jermar
    5 
    6 -include ../../../../Makefile.config
    75
    86LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd)

  • uspace/srv/rd/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    3332
    3433LIBC_PREFIX = ../../lib/libc
    3534SOFTINT_PREFIX = ../../lib/softint
     35
    3636include $(LIBC_PREFIX)/Makefile.toolchain
    3737
    … …  
    6060
    6161$(OUTPUT): $(OBJECTS) $(LIBS)
    62         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     62        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6363
    6464disasm: $(OUTPUT).disasm

  • uspace/srv/vfs/Makefile

    r84266669 rfcd7053  
    3131#
    3232
    33 -include ../../../Makefile.config
    34 
    3533LIBC_PREFIX = ../../lib/libc
    3634SOFTINT_PREFIX = ../../lib/softint
     35
    3736include $(LIBC_PREFIX)/Makefile.toolchain
    3837
    … …  
    6665
    6766$(OUTPUT): $(OBJECTS) $(LIBS)
    68         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     67        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6968
    7069disasm: $(OUTPUT).disasm
Note: See TracChangeset for help on using the changeset viewer.