Changeset fd68aaf in mainline

Timestamp:

2018-01-08T19:24:12Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

61c9ee2 (diff), c9e09f2 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-08 19:24:12)

git-committer:

GitHub <noreply@…> (2018-01-08 19:24:12)

Message:

Merge c9e09f26171e31413438891ef35603df24ce8ac7 into 61c9ee245ce76e905057b74bba2180046d9fb85e

Files:

• .gitmodules (added)
• Makefile (modified) (1 diff)
• tools/autotool.py (modified) (1 diff)
• tools/hsct.sh (added)
• uspace/Makefile (modified) (1 diff)
• uspace/Makefile.common (modified) (2 diffs)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/arch/amd64/Makefile.common (modified) (1 diff)
• uspace/lib/posix/Makefile (modified) (3 diffs)
• uspace/lib/posix/include/posix/stdio.h (modified) (1 diff)
• uspace/ports (added)

Makefile

@@ -60 +60 @@
 uspace: common
         $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
+
+ports-%: common
+        $(MAKE) -r -C uspace $@ PRECHECK=$(PRECHECK)
 
 precheck: clean

tools/autotool.py

@@ -615 +615 @@
                                 path = "%s/%s/bin" % (cross_prefix, platform)
                 
+                common['TARGET'] = target
                 prefix = "%s-" % target
                 

uspace/Makefile

@@ -255 +255 @@
 CLEANS := $(addsuffix .clean,$(DIRS) $(LIBS) $(BASE_LIBS))
 
-.PHONY: all $(BASE_BUILDS) $(BUILDS) $(BUILDS_TESTS) $(CLEANS) clean
+PORTS_BUILD_DIR := ../build/ports
+PORT_CFLAGS := \
+        -specs $(abspath lib/posix/gcc.specs) \
+        -isystem $(abspath $(PORTS_BUILD_DIR)/include) \
+        -isystem $(abspath $(PORTS_BUILD_DIR)/include/posix) \
+        -isystem $(abspath $(PORTS_BUILD_DIR)/include/libc) \
+        -L$(abspath $(PORTS_BUILD_DIR)/lib) \
+        -Wl,-T,link.ld \
+        -Wl,--whole-archive,-lc,-lmath,--no-whole-archive
+
+.PHONY: all $(BASE_BUILDS) $(BUILDS) $(BUILDS_TESTS) $(CLEANS) clean ports_cache
 
 all: $(BUILDS) $(BUILDS_TESTS)
+
+ports_cache: lib/posix.build lib/math.build lib/clui.build
+        git submodule update --init -- ports
+        
+        # Copy libs
+        mkdir -p $(PORTS_BUILD_DIR)/lib
+        cp lib/posix/link.ld $(PORTS_BUILD_DIR)/lib/link.ld
+        cp lib/posix/libc.a $(PORTS_BUILD_DIR)/lib/libc.a
+        # We don't currently build a dedicated debug-enabled libc version.
+        cp lib/posix/libc.a $(PORTS_BUILD_DIR)/lib/libg.a
+        cp lib/math/libmath.a $(PORTS_BUILD_DIR)/lib/libmath.a
+        cp lib/clui/libclui.a $(PORTS_BUILD_DIR)/lib/libclui.a
+        
+        # Copy headers
+        mkdir -p $(PORTS_BUILD_DIR)/include
+        cp -L -R lib/posix/include/posix/ $(PORTS_BUILD_DIR)/include/
+        mkdir -p $(PORTS_BUILD_DIR)/include/libc
+        cp -L -R lib/c/include/* $(PORTS_BUILD_DIR)/include/libc
+        cp -L -R lib/c/arch/$(UARCH)/include/libarch $(PORTS_BUILD_DIR)/include/
+        cp -L -R lib/math/include/* $(PORTS_BUILD_DIR)/include/libc
+        cp -L -R lib/math/arch/$(UARCH)/include/libarch/ $(PORTS_BUILD_DIR)/include/
+        cp -L -R ../abi/include/* $(PORTS_BUILD_DIR)/include/
+        ln -s -f -n libc $(PORTS_BUILD_DIR)/include/libmath
+        
+        # FIXME: Just for temporary compatibility.
+        touch $(PORTS_BUILD_DIR)/coastline.specs
+        
+        mkdir -p $(PORTS_BUILD_DIR)/include/libclui
+        cp -L lib/clui/tinput.h $(PORTS_BUILD_DIR)/include/libclui/
+        
+        # TODO: Get rid of this.
+        find $(PORTS_BUILD_DIR)/include/libc $(PORTS_BUILD_DIR)/include/libarch -name '*.h' -exec sed \
+                -e 's:#include <:#include <libc/:' \
+                -e 's:#include <libc/libarch/:#include <libarch/:' \
+                -e 's:#include <libc/abi/:#include <abi/:' \
+                -e 's:#include <libc/_bits/:#include <_bits/:' \
+                -e 's:#include <libc/libc/:#include <libc/:' \
+                -i {} \;
+        
+        mkdir -p overlay
+
+ports-all: ports_cache
+        for x in ports/*; do if [ -d "$$x" ]; then $(MAKE) ports-install-`basename $$x` || exit 1; fi; done
+
+ports-%: ports_cache
+        $(MAKE) $(@:ports-%=ports-install-%)
+
+# This is a separate target to avoid running ports_cache multiple times.
+ports-install-%:
+        PATH="$(CROSS_PREFIX)/$(TARGET)/bin:$$PATH" \
+        HSCT_HELENOS_ROOT="$(abspath ..)" \
+        HSCT_HOME="$(abspath ports)" \
+        HSCT_HSCT="$(abspath ../tools/hsct.sh)" \
+        HSCT_SOURCES_DIR="$(abspath $(PORTS_BUILD_DIR)/sources)" \
+        HSCT_BUILD_DIR="$(abspath $(PORTS_BUILD_DIR)/build)" \
+        HSCT_INCLUDE_DIR="$(abspath $(PORTS_BUILD_DIR)/include)" \
+        HSCT_LIB_DIR="$(abspath $(PORTS_BUILD_DIR)/lib)" \
+        HSCT_CACHE_DIR="$(abspath $(PORTS_BUILD_DIR))" \
+        HSCT_CACHE_LIB="$(abspath $(PORTS_BUILD_DIR)/lib)" \
+        HSCT_DIST_DIR="$(abspath $(PORTS_BUILD_DIR)/dist)" \
+        HSCT_ARCHIVE_DIR="$(abspath $(PORTS_BUILD_DIR)/archives)" \
+        HSCT_PARALLELISM="$(JOBS)" \
+        HSCT_GNU_TARGET="$(TARGET)" \
+        HSCT_CC="$(CC) $(PORT_CFLAGS)" \
+        HSCT_CFLAGS="" \
+        HSCT_LDFLAGS_FOR_CC="" \
+        HSCT_LD="$(LD)" \
+        HSCT_AR="$(AR)" \
+        HSCT_RANLIB="$(RANLIB)" \
+        HSCT_OBJDUMP="$(OBJDUMP)" \
+        HSCT_OBJCOPY="$(OBJCOPY)" \
+        HSCT_AS="$(AS)" \
+        HSCT_STRIP="$(STRIP)" \
+        ../tools/hsct.sh install $(@:ports-install-%=%)
 
 $(BUILDS_TESTS): $(BASE_BUILDS) $(BUILDS)

uspace/Makefile.common

@@ -174 +174 @@
 endif
 
-COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -fno-builtin -nostdlib -nostdinc -fexec-charset=UTF-8 \
-        -finput-charset=UTF-8 -D__$(ENDIANESS)__ -fno-common \
+# Flags that are not necessary, and can be overriden, but are used by default.
+DEFAULT_CFLAGS = \
+        -O$(OPTIMIZATION) \
+        -ffunction-sections \
+        -pipe \
+        -Wall \
+        -Wextra \
+        -Wno-unused-parameter \
+        -Wmissing-prototypes \
+        -Wwrite-strings \
+        -Werror-implicit-function-declaration
+
+ifeq ($(CONFIG_DEBUG),y)
+        DEFAULT_CFLAGS += -Werror
+endif
+
+ifeq ($(COMPILER),clang)
+        DEFAULT_CFLAGS += \
+                -Wno-missing-field-initializers \
+                -Wno-typedef-redefinition \
+                -Wno-unused-command-line-argument
+else
+        DEFAULT_CFLAGS += \
+                -Wno-clobbered
+endif
+
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        DEFAULT_CFLAGS += -ggdb
+endif
+
+# Flags that should always be used, even for third-party software.
+COMMON_CFLAGS = \
+        -ffreestanding \
+        -fno-builtin \
+        -nostdlib \
+        -nostdinc \
+        -D__$(ENDIANESS)__
+
+# Flags that are always used for HelenOS code, but not for third-party.
+HELENOS_CFLAGS = \
+        -std=gnu99 \
+        $(INCLUDES_FLAGS) \
+        -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 \
+        -finput-charset=UTF-8 \
+        -fno-common \
         -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
 
-GCC_CFLAGS = -ffunction-sections -Wall -Wextra -Wno-clobbered \
-        -Wno-unused-parameter -Wmissing-prototypes -std=gnu99 \
-        -Werror-implicit-function-declaration \
-        -Wwrite-strings -pipe
-
-# -Wno-missing-prototypes is there because it warns about main().
-# This should be fixed elsewhere.
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-typedef-redefinition \
-        -Wno-missing-prototypes -Wno-unused-command-line-argument \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -fno-stack-protector -fno-PIC
-
-ifeq ($(CONFIG_DEBUG),y)
-        COMMON_CFLAGS += -Werror
-endif
-
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        GCC_CFLAGS += -ggdb
-        CLANG_CFLAGS += -g
-endif
+# TODO: Use a different name.
+# CFLAGS variable is traditionally used for overridable flags.
+CFLAGS = $(COMMON_CFLAGS) $(HELENOS_CFLAGS) $(DEFAULT_CFLAGS)
 
 ## Setup platform configuration
@@ -214 +240 @@
 else
         CC_JOB = $(CC) $< -o $@
-endif
-
-ifeq ($(COMPILER),clang)
-        CFLAGS += $(COMMON_CFLAGS) $(CLANG_CFLAGS)
-else
-        CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
 endif
 

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 */