Changeset ee820ff in mainline for uspace/lib

Timestamp:

2018-02-22T19:39:53Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

0539c14

Parents:

5fe3f954 (diff), df368491 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'df368491aa1c0ce3024a51c602b7d0cbe4bd84d3'

Location:

uspace/lib

Files:

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

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/c/include/macros.h

@@ -55 +55 @@
             | ((((uint64_t) (up)) & 0xffffffff) << 32))
 
-#ifndef member_to_inst
 #define member_to_inst(ptr_member, type, member_identif) \
-        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
-#endif
+        ((type *) (((void *) (ptr_member)) - \
+            ((void *) &(((type *) 0)->member_identif))))
 
+#define _paddname(line)     PADD_ ## line ## __
+#define _padd(width, line)  uint ## width ## _t _paddname(line)
+
+#define PADD32  _padd(32, __LINE__)
+#define PADD16  _padd(16, __LINE__)
+#define PADD8   _padd(8, __LINE__)
 
 #endif
 
-#define _paddname(line) PADD_ ## line ## __
-#define _padd(width, line) uint ## width ## _t _paddname(line)
-#define PADD32 _padd(32, __LINE__)
-#define PADD16 _padd(16, __LINE__)
-#define PADD8 _padd(8, __LINE__)
-
 /** @}
  */

uspace/lib/posix/Makefile

@@ -45 +45 @@
         $(LIBSOFTINT_PREFIX)/libsoftint.a
 
+SPECS = gcc.specs
+LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+LIBC_STARTUP_FILE = $(shell sed -n -e 's/^.*STARTUP(\(.*\)).*$$/\1/p' $(LIBC_LINKER_SCRIPT))
+EXPORT_LINKER_SCRIPT = link.ld
+EXPORT_STARTUP_FILE = crt0.o
+
+EXPORT_FILES = \
+        ../math/libmath.a \
+        ../clui/libclui.a \
+        $(MERGED_C_LIBRARY) \
+        $(EXPORT_STARTUP_FILE) \
+        $(EXPORT_LINKER_SCRIPT) \
+        $(SPECS)
+
 REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
 
@@ -53 +67 @@
         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) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
 
 SOURCES = \
@@ -83 +97 @@
         test/scanf.c
 
+EXPORT_CPPFLAGS = \
+        -specs $$(HELENOS_EXPORT_ROOT)/lib/gcc.specs \
+        -isystem $$(HELENOS_EXPORT_ROOT)/include
+
+EXPORT_LDFLAGS = \
+        -L$$(HELENOS_EXPORT_ROOT)/lib \
+        -T link.ld
+
+EXPORT_LDLIBS = \
+        -lmath -lc
+
+EXPORT_CFLAGS = \
+        -specs $$(HELENOS_EXPORT_ROOT)/lib/gcc.specs
+
 include $(USPACE_PREFIX)/Makefile.common
 
-$(INCLUDE_LIBC): ../c/include
-        ln -s -f -n ../$^ $@
+$(SPECS): $(CONFIG_MAKEFILE)
+        echo '*self_spec:' > $@.new
+        echo '+ $(COMMON_CFLAGS)' >> $@.new
+        echo >> $@.new
+        echo '*cpp:' >> $@.new
+        echo '+ $(COMMON_CPPFLAGS)' >> $@.new
+        echo >> $@.new
+        echo '*lib:' >> $@.new
+        echo '$(EXPORT_LDLIBS)' >> $@.new
+        mv $@.new $@
+
+$(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
+        sed 's/STARTUP(.*)/STARTUP(crt0.o)/' $< > $@
+
+$(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)
+        cp $< $@
+
+$(INCLUDE_LIBC): $(shell find ../c/include -name '*.h')
+        cp -r -L --remove-destination -T ../c/include $@
+        find ../c/include -type f -and -not -name '*.h' -delete
+
+export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
+
+$(EXPORT_DIR)/config.mk: export-libs export-includes
+        echo '# Generated file, do not modify.' >> $@.new
+        echo '# Do not forget to set HELENOS_EXPORT_ROOT.' >> $@.new
+        echo 'HELENOS_CROSS_PATH="$(shell dirname $(CC))"' >> $@.new
+        echo 'HELENOS_ARCH="$(firstword $(subst -, ,$(TARGET)))"' >> $@.new
+        echo 'HELENOS_TARGET="$(TARGET)"' >> $@.new
+        echo 'HELENOS_CPPFLAGS="$(EXPORT_CPPFLAGS)"' >> $@.new
+        echo 'HELENOS_CFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
+        echo 'HELENOS_CXXFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
+        echo 'HELENOS_LDFLAGS="$(EXPORT_LDFLAGS)"' >> $@.new
+        echo 'HELENOS_LDLIBS="$(EXPORT_LDLIBS)"' >> $@.new
+        mv $@.new $@
+
+$(EXPORT_DIR)/config.rc: $(EXPORT_DIR)/config.mk
+        sed 's:$$(HELENOS_EXPORT_ROOT):$$HELENOS_EXPORT_ROOT:g' < $< >$@
+
+export-libs: $(EXPORT_FILES) export-includes
+        mkdir -p $(EXPORT_DIR)/lib
+        cp -L $(EXPORT_FILES) $(EXPORT_DIR)/lib
+
+export-includes: $(INCLUDE_LIBC) $(shell find ./include ../c/arch/$(UARCH)/include $(ROOT_PATH)/abi/include -name '*.h')
+        mkdir -p $(EXPORT_DIR)/include
+        rm -rf $(EXPORT_DIR)/include.new
+        cp -r -L -T ./include/posix $(EXPORT_DIR)/include.new
+        cp -r -L -T ./include/libc $(EXPORT_DIR)/include.new/libc
+        cp -r -L ../c/arch/$(UARCH)/include/* $(EXPORT_DIR)/include.new/libc
+        cp -r -L $(ROOT_PATH)/abi/include/* $(EXPORT_DIR)/include.new
+        mkdir -p $(EXPORT_DIR)/include.new/libclui
+        cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
+        
+        find "$(EXPORT_DIR)/include.new/libc" "$(EXPORT_DIR)/include.new/libclui" -name '*.h' -exec sed \
+                -e 's:#include <:#include <libc/:' \
+                -e 's:#include <libc/abi/:#include <abi/:' \
+                -e 's:#include <libc/_bits/:#include <_bits/:' \
+                -e 's:#include <libc/libc/:#include <libc/:' \
+                -i {} \;
+        find "$(EXPORT_DIR)/include.new" -name '*.h' -exec sed \
+                -e 's:#include "posix/:#include ":' \
+                -e 's:#include <posix/:#include <:' \
+                -i {} \;
+        
+        rm -rf $(EXPORT_DIR)/include
+        mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include
 
 $(FIXED_C_LIBRARY): $(LIBC_FILE) $(REDEFS_HIDE_LIBC)
@@ -97 +189 @@
 $(REDEFS_HIDE_LIBC): $(SOURCES)
         sed -n -e 's/_HIDE_LIBC_SYMBOL(\(.*\))/\1 __helenos_libc_\1/p' $(SOURCES) >$@
-