Changes in / [402a18f:ff62c6d] in mainline


Ignore:
Files:
1 added
9 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/arm32/loader/Makefile

    r402a18f rff62c6d  
    4040BFD_ARCH = arm
    4141TARGET = arm-linux-gnu
    42 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
     42TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    4343
    4444ifeq ($(COMPILER),gcc_native)
  • boot/arch/mips32/loader/Makefile

    r402a18f rff62c6d  
    3939BFD_ARCH = mips
    4040TARGET = mipsel-linux-gnu
    41 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
     41TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    4242
    4343ifeq ($(MACHINE),lgxemul)
     
    4848        BFD_NAME = elf32-tradbigmips
    4949        BFD = ecoff-bigmips
    50         TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
     50        TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    5151        TARGET = mips-linux-gnu
    5252endif
  • boot/arch/ppc32/loader/Makefile

    r402a18f rff62c6d  
    4040BFD_ARCH = powerpc:common
    4141TARGET = ppc-linux-gnu
    42 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
     42TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    4343
    4444ifeq ($(COMPILER),gcc_native)
  • kernel/arch/arm32/Makefile.inc

    r402a18f rff62c6d  
    3434BFD = binary
    3535TARGET = arm-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm
     36TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32
    3737
    3838ATSIGN = %
  • kernel/arch/ia32/Makefile.inc

    r402a18f rff62c6d  
    3434BFD = binary
    3535TARGET = i686-pc-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
     36TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32
    3737
    3838BITS = 32
  • kernel/arch/ia32/include/asm.h

    r402a18f rff62c6d  
    392392        asm volatile (
    393393                "sgdtl %[gdtr_reg]\n"
    394                 :: [gdtr_reg] "m" (*gdtr_reg)
     394                : [gdtr_reg] "=m" (*gdtr_reg)
    395395        );
    396396}
  • kernel/arch/ia64/include/faddr.h

    r402a18f rff62c6d  
    2727 */
    2828
    29 /** @addtogroup ia64   
     29/** @addtogroup ia64
    3030 * @{
    3131 */
     
    3838#include <arch/types.h>
    3939
    40 /** 
     40/**
    4141 *
    4242 * Calculate absolute address of function
    4343 * referenced by fptr pointer.
    4444 *
    45  * @param f Function pointer.
     45 * @param fptr Function pointer.
    4646 *
    4747 */
    48 #define FADDR(f)         (*((uintptr_t *)(f)));
     48#define FADDR(fptr)  (((fncptr_t *) (fptr))->fnc)
    4949
    5050#endif
  • kernel/arch/ia64/include/types.h

    r402a18f rff62c6d  
    6767        unative_t fnc;
    6868        unative_t gp;
    69 } fncptr_t;
     69} __attribute__((may_alias)) fncptr_t;
    7070
    7171#define PRIp "lx"       /**< Format for uintptr_t. */
  • kernel/arch/ia64/src/cpu/cpu.c

    r402a18f rff62c6d  
    5454        char vendor[2 * sizeof(uint64_t) + 1];
    5555       
    56         *((uint64_t *) &vendor[0 * sizeof(uint64_t)]) = CPU->arch.cpuid0;
    57         *((uint64_t *) &vendor[1 * sizeof(uint64_t)]) = CPU->arch.cpuid1;
     56        memcpy(vendor, &CPU->arch.cpuid0, 8);
     57        memcpy(vendor + 8, &CPU->arch.cpuid1, 8);
    5858        vendor[sizeof(vendor) - 1] = 0;
    5959       
    60         switch(m->arch.cpuid3.family) {
     60        switch (m->arch.cpuid3.family) {
    6161        case FAMILY_ITANIUM:
    6262                family_str = "Itanium";
  • kernel/arch/mips32/Makefile.inc

    r402a18f rff62c6d  
    3333BFD = binary
    3434TARGET = mipsel-linux-gnu
    35 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel
     35TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32
    3636
    3737GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
     
    4848ifeq ($(MACHINE),bgxemul)
    4949        BFD_NAME = elf32-tradbigmips
    50         TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
     50        TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb
    5151        TARGET = mips-linux-gnu
    5252        ENDIANESS = BE
  • kernel/arch/ppc32/Makefile.inc

    r402a18f rff62c6d  
    3434BFD = binary
    3535TARGET = ppc-linux-gnu
    36 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc
     36TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32
    3737
    3838GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32
  • kernel/genarch/src/acpi/acpi.c

    r402a18f rff62c6d  
    4646#define RSDP_REVISION_OFFS      15
    4747
     48#define CMP_SIGNATURE(left, right) \
     49        (((left)[0] == (right)[0]) && \
     50        ((left)[1] == (right)[1]) && \
     51        ((left)[2] == (right)[2]) && \
     52        ((left)[3] == (right)[3]))
     53
    4854struct acpi_rsdp *acpi_rsdp = NULL;
    4955struct acpi_rsdt *acpi_rsdt = NULL;
     
    105111                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i];
    106112               
    107                         map_sdt(h);     
    108                         if (*((uint32_t *) &h->signature[0]) == *((uint32_t *) &signature_map[j].signature[0])) {
     113                        map_sdt(h);
     114                        if (CMP_SIGNATURE(h->signature, signature_map[j].signature)) {
    109115                                if (!acpi_sdt_check((uint8_t *) h))
    110116                                        goto next;
     
    127133
    128134                        map_sdt(h);
    129                         if (*((uint32_t *) &h->signature[0]) == *((uint32_t *) &signature_map[j].signature[0])) {
     135                        if (CMP_SIGNATURE(h->signature, signature_map[j].signature)) {
    130136                                if (!acpi_sdt_check((uint8_t *) h))
    131137                                        goto next;
  • kernel/generic/src/ddi/ddi.c

    r402a18f rff62c6d  
    276276unative_t sys_preempt_control(int enable)
    277277{
    278         if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
     278        if (!(cap_get(TASK) & CAP_PREEMPT_CONTROL))
    279279                return EPERM;
    280280       
  • uspace/lib/libc/arch/arm32/Makefile.inc

    r402a18f rff62c6d  
    3232
    3333TARGET = arm-linux-gnu
    34 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
     34TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    3535
    3636ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
  • uspace/lib/libc/arch/ia32/Makefile.inc

    r402a18f rff62c6d  
    3131
    3232TARGET = i686-pc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
     33TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32/bin
    3434
    3535ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
  • uspace/lib/libc/arch/mips32/Makefile.inc

    r402a18f rff62c6d  
    3131
    3232TARGET = mipsel-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
     33TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
    3434
    3535ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
  • uspace/lib/libc/arch/mips32eb/Makefile.inc

    r402a18f rff62c6d  
    3131
    3232TARGET = mips-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
     33TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
    3434
    3535ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
  • uspace/lib/libc/arch/ppc32/Makefile.inc

    r402a18f rff62c6d  
    3131
    3232TARGET = ppc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
     33TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    3434
    3535ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
Note: See TracChangeset for help on using the changeset viewer.