Changeset 81983e3 in mainline for uspace

Timestamp:

2010-02-17T14:11:07Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b8da2a3

Parents:

101d9f4

Message:

add the possibility to compile abs32le with any cross-compiler which generates
32bit little endian code

Location:

uspace

Files:

• lib/libc/arch/abs32le/Makefile.inc (modified) (1 diff)
• lib/libc/arch/abs32le/_link.ld.in (modified) (2 diffs)
• lib/libc/arch/abs32le/include/atomic.h (modified) (1 diff)
• lib/libc/arch/abs32le/include/tls.h (modified) (1 diff)
• lib/libc/arch/abs32le/src/tls.c (modified) (2 diffs)
• lib/libc/include/atomicdflt.h (modified) (1 diff)
• srv/loader/arch/abs32le/_link.ld.in (modified) (2 diffs)

uspace/lib/libc/arch/abs32le/Makefile.inc

@@ -31 +31 @@
 
 ifeq ($(COMPILER),gcc_cross)
-        TARGET = i686-pc-linux-gnu
-        TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32/bin
-        GCC_CFLAGS += -march=pentium
+        TOOLCHAIN_DIR = $(CROSS_PREFIX)/$(CROSS_TARGET)/bin
+        
+        ifeq ($(CROSS_TARGET),arm32)
+                TARGET = arm-linux-gnu
+        endif
+        
+        ifeq ($(CROSS_TARGET),ia32)
+                TARGET = i686-pc-linux-gnu
+        endif
+        
+        ifeq ($(CROSS_TARGET),mips32)
+                TARGET = mipsel-linux-gnu
+        endif
 endif
 

uspace/lib/libc/arch/abs32le/_link.ld.in

@@ -19 +19 @@
         .data : {
                 *(.data);
+                *(.data.rel*);
         } :data
         
@@ -33 +34 @@
         _tls_alignment = ALIGNOF(.tdata);
         
+        .sbss : {
+                *(.scommon);
+                *(.sbss);
+        }
+        
         .bss : {
                 *(COMMON);

uspace/lib/libc/arch/abs32le/include/atomic.h

@@ -36 +36 @@
 #define LIBC_abs32le_ATOMIC_H_
 
+#include <bool.h>
+
 #define LIBC_ARCH_ATOMIC_H_
+#define CAS
 
 #include <atomicdflt.h>
+
+static inline bool cas(atomic_t *val, long ov, long nv)
+{
+        if (val->count == ov) {
+                val->count = nv;
+                return true;
+        }
+        
+        return false;
+}
 
 static inline void atomic_inc(atomic_t *val) {

uspace/lib/libc/arch/abs32le/include/tls.h

@@ -55 +55 @@
 }
 
+extern uintptr_t __aeabi_read_tp(void);
+
 #endif
 

uspace/lib/libc/arch/abs32le/src/tls.c

@@ -32 +32 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -43 +44 @@
 }
 
+uintptr_t __aeabi_read_tp(void)
+{
+        return NULL;
+}
+
 /** @}
  */

uspace/lib/libc/include/atomicdflt.h

@@ -56 +56 @@
 }
 
-#ifndef CAS 
+#ifndef CAS
 static inline bool cas(atomic_t *val, long ov, long nv)
 {

uspace/srv/loader/arch/abs32le/_link.ld.in

@@ -26 +26 @@
         .data ALIGN(0x1000) : SUBALIGN(0x1000) {
                 *(.data);
+                *(.data.rel*);
         } :data
         
@@ -43 +44 @@
         _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
         
+        .sbss : {
+                *(.scommon);
+                *(.sbss);
+        }
+        
         .bss : {
                 *(COMMON);