Changes in / [f55b12b:0cc32f2] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• Makefile (modified) (4 diffs)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/binutils/Makefile (added)
• uspace/app/binutils/distclean.sh (added)
• uspace/app/binutils/intrusive.sh (added)
• uspace/app/binutils/patch.awk (added)
• uspace/app/binutils/toolchain.sh (added)
• uspace/drv/bus/usb/usbhid/kbd.h (deleted)
• uspace/drv/bus/usb/usbhid/kbd/layout.h (deleted)
• uspace/drv/bus/usb/usbhid/layout.h (deleted)

HelenOS.config

@@ -563 +563 @@
 ! CONFIG_BAREBONE (n/y)
 
+% Build binutils binaries 
+! CONFIG_BINUTILS (n/y)
+
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)

Makefile

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+# Just for this Makefile. Sub-makes will run in parallel if requested.
+.NOTPARALLEL:
 
 CSCOPE = cscope
@@ -66 +69 @@
 # Autotool (detects compiler features)
 
-$(COMMON_MAKEFILE): autotool
-$(COMMON_HEADER): autotool
-
-autotool: $(CONFIG_MAKEFILE)
+autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
         $(AUTOTOOL)
         -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
@@ -75 +75 @@
 # Build-time configuration
 
-$(CONFIG_MAKEFILE): config_default
-$(CONFIG_HEADER): config_default
-
-config_default: $(CONFIG_RULES)
+config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
 ifeq ($(HANDS_OFF),y)
         $(CONFIG) $< hands-off $(PROFILE)
@@ -100 +97 @@
 distclean: clean
         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
+        cd ./uspace/app/binutils/; ./distclean.sh
 
 clean:

boot/Makefile.common

@@ -172 +172 @@
         $(USPACE_PATH)/app/websrv/websrv
 
+ifeq ($(CONFIG_BINUTILS),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/binutils/bin/as \
+        $(USPACE_PATH)/app/binutils/bin/ld
+endif
+
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \

uspace/Makefile

@@ -113 +113 @@
         drv/bus/usb/vhc
 
+ifeq ($(CONFIG_BINUTILS),y)
+DIRS += \
+        app/binutils
+endif
+
 ## Networking
 #