Changeset 042fbe0 in mainline

Timestamp:

2011-05-01T19:00:40Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

53d9ee9, 694ca93f, 750636a

Parents:

e175d69

Message:

mkfat.py - check for 8+3 filename limit violations.
Work around FAT 8+3 limit vs. library filenames by using .so0 extension

Files:

• boot/Makefile.common (modified) (1 diff)
• tools/mkfat.py (modified) (2 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/softint/Makefile (modified) (1 diff)

boot/Makefile.common

@@ -122 +122 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         RD_LIBS += \
-                $(USPACE_PATH)/lib/test/libtest.so.0 \
-                $(USPACE_PATH)/lib/c/libc.so.0 \
-                $(USPACE_PATH)/lib/softint/libsoftint.so.0
+                $(USPACE_PATH)/lib/c/libc.so0 \
+                $(USPACE_PATH)/lib/softint/libsofti.so0
         RD_APPS += \
                 $(USPACE_PATH)/app/dltest/dltest

tools/mkfat.py

@@ -190 +190 @@
         parts = name.split('.')
         
-        if (len(parts) > 0):
+        if len(parts) > 0:
                 fname = parts[0]
         else:
                 fname = ''
-                
+        
+        if len(fname) > 8:
+                sys.stdout.write("mkfat.py: error: Directory entry " + name +
+                    " base name is longer than 8 characters\n")
+                sys.exit(1);
+        
         return (fname + '          ').upper()[0:8]
 
@@ -201 +206 @@
         parts = name.split('.')
         
-        if (len(parts) > 1):
+        if len(parts) > 1:
                 ext = parts[1]
         else:
                 ext = ''
+        
+        if len(parts) > 2:
+                sys.stdout.write("mkfat.py: error: Directory entry " + name +
+                    " has more than one extension\n")
+                sys.exit(1);
+        
+        if len(ext) > 3:
+                sys.stdout.write("mkfat.py: error: Directory entry " + name +
+                    " extension is longer than 3 characters\n")
+                sys.exit(1);
         
         return (ext + '   ').upper()[0:3]

uspace/Makefile.common

@@ -130 +130 @@
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 else
-BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
+BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
 LFLAGS = -Bdynamic
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld

uspace/lib/c/Makefile

@@ -52 +52 @@
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
-LSONAME = libc.so.0
+LSONAME = libc.so0
 
 

uspace/lib/softint/Makefile

@@ -32 +32 @@
 LIBRARY = libsoftint
 SLIBRARY = libsoftint.so.0.0
-LSONAME = libsoftint.so.0
+LSONAME = libsofti.so0
 
 SOURCES = \
-        generic/division.c\
+        generic/division.c \
         generic/multiplication.c