Changeset 86aad6f in mainline

Timestamp:

2018-11-10T19:54:04Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

cc01214

Parents:

c88d91e8 (diff), 279188c (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:

Vojtech Horky <vojtech.horky@…> (2018-11-10 19:54:04)

git-committer:

GitHub <noreply@…> (2018-11-10 19:54:04)

Message:

Add missing libs to image.iso (PR #55)

Add crt*.o files and libgcc.a to the generated image when CONFIG_DEVEL_FILES is set so we can compile again inside HelenOS.

The change is rather big because it has to find libgcc.a which is somewhere in $CROSS_PREFIX.

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/"
-        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
+        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/"
 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"
@@ -576 +600 @@
                 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)
 
@@ -601 +628 @@
                         if (config['INTEGRATED_AS'] == "no"):
                                 common['CC'] += " -no-integrated-as"
+
+                # Find full path to libgcc
+                check_libgcc(common)
 
                 # Platform-specific utilities