Changeset dfeb4e2 in mainline for uspace/lib

Timestamp:

2018-01-06T02:37:59Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

c9e09f2

Parents:

3d95c9d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-02 18:06:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-06 02:37:59)

Message:

Integrate ports into the main tree as a submodule.

A stripped down version of hsct.sh is added to tools, and Makefiles
gain new targets that implement part of hsct's prior functionality.

This arrangement improves usability and maintainability of ports,
reduces the likelihood of ports being broken by mainline changes,
and partially solves the issue with build logic being duplicated
in multiple places.

It is newly possible to build individual ports using make ports-NAME,
and all ports using make ports-all. This also installs the outputs to
uspace/dist, so ideally, simple make ports-all && make would create
an image with all ports included. This currently doesn't work only
because some ports fail to build.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/arch/amd64/Makefile.common (modified) (1 diff)
• posix/Makefile (modified) (3 diffs)
• posix/include/posix/stdio.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -44 +44 @@
 LIBRARY = libc
 SOVERSION = 0.0
+
+EXTRA_CFLAGS = -fno-builtin
 
 -include $(CONFIG_MAKEFILE)

uspace/lib/c/arch/amd64/Makefile.common

@@ -31 +31 @@
 # XXX: clang doesn't support this flag, but the optimization is OS-specific,
 #      so it isn't used for amd64-unknown-elf target.
-GCC_CFLAGS += -mno-tls-direct-seg-refs
+
+ifneq ($(COMPILER),clang)
+        COMMON_CFLAGS += -mno-tls-direct-seg-refs
+endif
 
 LFLAGS += --gc-sections

uspace/lib/posix/Makefile

@@ -46 +46 @@
         $(LIBSOFTINT_PREFIX)/libsoftint.a
 
+SPECS = gcc.specs
+LINKER_SCRIPT = link.ld
+STARTUP_FILE = crt0.o
+LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+LIBC_STARTUP_FILE = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
+
 REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
 REDEFS_SHOW_LIBPOSIX = redefs-show-posix-symbols.list
@@ -58 +64 @@
         libc.o
 
-EXTRA_OUTPUT = $(FIXED_C_LIBRARY) $(FIXED_POSIX_LIBRARY) $(MERGED_C_LIBRARY)
+EXTRA_OUTPUT = $(FIXED_C_LIBRARY) $(FIXED_POSIX_LIBRARY) $(MERGED_C_LIBRARY) $(SPECS) $(LINKER_SCRIPT) $(STARTUP_FILE)
 
 SOURCES = \
@@ -92 +98 @@
 include $(USPACE_PREFIX)/Makefile.common
 
+$(SPECS): $(CONFIG_MAKEFILE)
+        echo '*self_spec:' > $@.new
+        echo '+ $(COMMON_CFLAGS)' >> $@.new
+        echo >> $@.new
+        echo '*lib:' >> $@.new
+        echo '--whole-archive -lc -lm --no-whole-archive' >> $@.new
+        echo >> $@.new
+        mv $@.new $@
+
+$(LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
+        cp $< $@
+
+$(STARTUP_FILE): $(LIBC_STARTUP_FILE)
+        cp $< $@
+
 $(INCLUDE_LIBC): ../c/include
         ln -s -f -n ../$^ $@

uspace/lib/posix/include/posix/stdio.h

@@ -72 +72 @@
 typedef struct _IO_FILE FILE;
 
-#ifndef LIBPOSIX_INTERNAL
+#if !defined(LIBPOSIX_INTERNAL) && !defined(LIBC_STDIO_H_)
         enum _buffer_type {
                 /** No buffering */