Changes in / [86aad6f:c88d91e8] in mainline

Files:

• boot/Makefile (modified) (1 diff)
• tools/autotool.py (modified) (3 diffs)

boot/Makefile

@@ -65 +65 @@
         cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"
         cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"
-        cp -L "$(USPACE_PATH)/lib/c/crt0.o" "$(DIST_PATH)/lib/"
-        cp -L "$(USPACE_PATH)/lib/c/crt1.o" "$(DIST_PATH)/lib/"
-        cp -L "$(LIBGCC_PATH)" "$(DIST_PATH)/lib/"
+        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
 endif
 

tools/autotool.py

@@ -320 +320 @@
         check_app([common['GCC'], "--version"], "GNU GCC", details)
 
-def check_libgcc(common):
-        sys.stderr.write("Checking for libgcc.a ... ")
-        libgcc_path = None
-        proc = subprocess.Popen([ common['GCC'], "-print-search-dirs" ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        for line in proc.stdout:
-                line = line.decode('utf-8').strip('\n')
-                parts = line.split()
-                if parts[0] == "install:":
-                        p = parts[1] + "libgcc.a"
-                        if os.path.isfile(p):
-                                libgcc_path = p
-        proc.wait()
-
-        if libgcc_path is None:
-                sys.stderr.write("failed\n")
-                print_error(["Unable to find gcc library (libgcc.a).",
-                                        "",
-                                        "Please ensure that you have installed the",
-                                        "toolchain properly."])
-
-        sys.stderr.write("ok\n")
-        common['LIBGCC_PATH'] = libgcc_path
-
-
 def check_binutils(path, prefix, common, details):
         "Check for binutils toolchain"
@@ -600 +576 @@
                 cc_autogen = None
 
-                # We always need to check for GCC as we
-                # need libgcc
-                check_gcc(path, prefix, common, PACKAGE_CROSS)
-
                 # Compiler
                 if (config['COMPILER'] == "gcc_cross"):
+                        check_gcc(path, prefix, common, PACKAGE_CROSS)
                         check_binutils(path, prefix, common, PACKAGE_CROSS)
 
@@ -628 +601 @@
                         if (config['INTEGRATED_AS'] == "no"):
                                 common['CC'] += " -no-integrated-as"
-
-                # Find full path to libgcc
-                check_libgcc(common)
 
                 # Platform-specific utilities