Index: tools/xcw/bin/helenos-bld-config
===================================================================
--- tools/xcw/bin/helenos-bld-config	(revision f98434b82c695232419821abbc90afe44dea6699)
+++ tools/xcw/bin/helenos-bld-config	(revision d92060f307b004408f9ea5290a7013f4656be94f)
@@ -47,5 +47,4 @@
 case ".$1" in
 (.--cc) extract_field "CC" "$MAKEFILE_COMMON";;
-(.--ld) extract_field "LD" "$MAKEFILE_COMMON";;
 (.--uarch) extract_field "UARCH" "$MAKEFILE_CONFIG";;
 (.--endian)
Index: tools/xcw/bin/helenos-ld
===================================================================
--- tools/xcw/bin/helenos-ld	(revision f98434b82c695232419821abbc90afe44dea6699)
+++ 	(revision )
@@ -1,43 +1,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015 Jiri Svoboda
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# - The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Link editor (ld) wrapper
-# HelenOS Cross Compiler Wrapper (XCW)
-# Facilitate cross-compiling external software to HelenOS
-#
-
-XCW="$(dirname "$0")"
-SRC_ROOT="$XCW/../../.."
-UARCH="$("$XCW"/helenos-bld-config --uarch)"
-LD="$("$XCW"/helenos-bld-config --ld)"
-
-echo helenos-ld "$@"
-"$LD" \
-    -n -T "$SRC_ROOT"/uspace/lib/c/arch/"$UARCH"/_link.ld \
-    "$@" \
-    "$SRC_ROOT"/uspace/lib/c/libc.a
Index: tools/xcw/demo/Makefile
===================================================================
--- tools/xcw/demo/Makefile	(revision f98434b82c695232419821abbc90afe44dea6699)
+++ tools/xcw/demo/Makefile	(revision d92060f307b004408f9ea5290a7013f4656be94f)
@@ -43,5 +43,4 @@
 
 CC = helenos-cc
-LD = helenos-ld
 CFLAGS = -std=gnu99 -Wall `helenos-pkg-config --cflags libgui libdraw libmath`
 LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
@@ -56,5 +55,5 @@
 
 $(output): $(objects)
-	$(LD) -o $@ $^ $(LIBS)
+	$(CC) -o $@ $^ $(LIBS)
 
 %.o: %.c