Changeset a5c468e in mainline for tools

Timestamp:

2018-11-11T20:21:08Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4640416

Parents:

5c03bd30

Message:

Build XCW demo as part of default target. Need to get real CFLAGS to fix some ARM targets, use export target. Make export as part of default target into uspace/export. Update gitignore.

Location:

tools/xcw/bin

Files:

• helenos-bld-config (modified) (4 diffs)
• helenos-cc (modified) (3 diffs)
• helenos-ld (modified) (2 diffs)

tools/xcw/bin/helenos-bld-config

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -35 +35 @@
 MAKEFILE_COMMON="$SRC_ROOT"/Makefile.common
 MAKEFILE_CONFIG="$SRC_ROOT"/Makefile.config
+CONFIG_MK="$SRC_ROOT"/uspace/export/config.mk
 
 # Extract simple 'name = value' variable definition from Makefile
@@ -42 +43 @@
         file_name="$2"
 
-        sed -n "s/^$field_name = \\(.*\\)$/\\1/p" "$file_name"
+        sed -n "s/^$field_name \\{0,1\\}= \\{0,1\\}\\(.*\\)$/\\1/p" "$file_name" | \
+            sed "s/^\"//" | sed "s/\"$//"
 }
 
@@ -54 +56 @@
         echo "__${ENDIAN}__"
         ;;
+*.--cflags) extract_field "HELENOS_CFLAGS" "$CONFIG_MK";;
+*.--ldflags) extract_field "HELENOS_LDFLAGS" "$CONFIG_MK";;
 (*)
         echo "Unknown option $1" >&2

tools/xcw/bin/helenos-cc

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -36 +36 @@
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CC="$("$XCW"/helenos-bld-config --cc)"
+CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
 ENDIAN="$("$XCW"/helenos-bld-config --endian)"
 
@@ -41 +42 @@
 "$CC" \
     -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
-    -nostdlib \
+    $CFLAGS \
     -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
     -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \

tools/xcw/bin/helenos-ld

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -35 +35 @@
 SRC_ROOT="$XCW/../../.."
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
+CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
+LDFLAGS="$("$XCW"/helenos-bld-config --ldflags)"
 CC="$("$XCW"/helenos-bld-config --cc)"
 
 echo helenos-ld "$@"
 "$CC" \
+    $CFLAGS \
     "$@" \
     "$SRC_ROOT"/uspace/lib/c/crt0.o \
     "$SRC_ROOT"/uspace/lib/c/crt1.o \
-    "$SRC_ROOT"/uspace/lib/c/libc.a
+    "$SRC_ROOT"/uspace/lib/c/libc.a \
+    -lgcc