Changes in / [9b642f92:0798689] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.build (modified) (1 diff)
• kernel/Makefile (modified) (1 diff)
• tools/config.py (modified) (2 diffs)
• tools/mkarray.py (modified) (6 diffs)
• uspace/Makefile.common (modified) (4 diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/riscv64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (1 diff)
• uspace/lib/pcut/Makefile (modified) (1 diff)
• uspace/lib/pcut/update-from-master.sh (modified) (1 diff)

HelenOS.config

@@ -605 +605 @@
 ! CONFIG_STRIP_BINARIES (n/y)
 
-% Strip revision information (helpful when comparing outputs)
-! CONFIG_STRIP_REVISION_INFO (n/y)
-
 % Optimization level
 @ "3" Level 3 (recommended).

boot/Makefile.build

@@ -46 +46 @@
 COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common
 
 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \

kernel/Makefile

@@ -84 +84 @@
 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common
 
 GCC_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-unused-parameter \

tools/config.py

@@ -445 +445 @@
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
-        
-        varname_strip = 'CONFIG_STRIP_REVISION_INFO'
-        strip_rev_info = (varname_strip in config) and (config[varname_strip] == 'y')
-        
-        if strip_rev_info:
-                timestamp_unix = int(0)
-        else:
-                # TODO: Use commit timestamp instead of build time.
-                timestamp_unix = int(time.time())
-        
+
+        timestamp_unix = int(time.time())
         timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
         
@@ -466 +458 @@
                 sys.stderr.write("failed\n")
         
-        if (not strip_rev_info) and (len(version) == 3):
+        if len(version) == 3:
                 revision = version[1]
                 if version[0] != 1:

tools/mkarray.py

@@ -70 +70 @@
         section = sys.argv[4]
         
-        timestamp = (1980, 1, 1, 0, 0, 0)
-        
         header_ctx = []
         desc_ctx = []
@@ -81 +79 @@
         archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
         
-        for src in sorted(sys.argv[5:]):
+        for src in sys.argv[5:]:
                 basename = os.path.basename(src)
                 plainname = os.path.splitext(basename)[0]
@@ -97 +95 @@
                         src_data = deflate(src_data)
                         src_fname = os.path.basename("%s.deflate" % src)
-                        zipinfo = zipfile.ZipInfo(src_fname, timestamp)
-                        archive.writestr(zipinfo, src_data)
+                        archive.writestr(src_fname, src_data)
                 else:
                         src_fname = src
@@ -158 +155 @@
         data += "\n\n"
         data += "#endif\n"
-        zipinfo = zipfile.ZipInfo("%s.h" % dest, timestamp)
-        archive.writestr(zipinfo, data)
+        archive.writestr("%s.h" % dest, data)
         
         data = ''
@@ -170 +166 @@
         data += "\n".join(data_ctx)
         data += "\n"
-        zipinfo = zipfile.ZipInfo("%s.s" % dest, timestamp)
-        archive.writestr(zipinfo, data)
+        archive.writestr("%s.s" % dest, data)
         
         data = ''
@@ -185 +180 @@
         data += "\n".join(size_ctx)
         data += "\n"
-        zipinfo = zipfile.ZipInfo("%s_desc.c" % dest, timestamp)
-        archive.writestr(zipinfo, data)
+        archive.writestr("%s_desc.c" % dest, data)
         
         archive.close()

uspace/Makefile.common

@@ -110 +110 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
-STARTUP = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
-
 LIBMATH_PREFIX = $(LIB_PREFIX)/math
 LIBMATH_INCLUDES_FLAGS = \
@@ -236 +234 @@
 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 \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -finput-charset=UTF-8 -D__$(ENDIANESS)__ -fno-common
 
 GCC_CFLAGS = -ffunction-sections -Wall -Wextra -Wno-clobbered \
@@ -304 +301 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(STARTUP) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)
@@ -340 +337 @@
 ifneq ($(TEST_OUTPUT),)
 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(STARTUP) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(TEST_OUTPUT)

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

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/amd64/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/arm32/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/ia32/_link.ld.in

@@ -1 +1 @@
 #ifndef SHLIB
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 #endif

uspace/lib/c/arch/ia64/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/mips32/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/ppc32/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/riscv64/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/sparc64/_link.ld.in

@@ +1 @@
+STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/pcut/Makefile

@@ -36 +36 @@
 
 test-libpcut-%: $(OUTPUT)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
 

uspace/lib/pcut/update-from-master.sh

@@ -80 +80 @@
 
 test-libpcut-%: $(OUTPUT)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
 
 EOF_MAKEFILE_TAIL