Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset e478cebf in mainline


Ignore:
Timestamp:
2011-07-23T20:26:50Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
18b5228b
Parents:
c62f2d0 (diff), eccd20e6 (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.
Message:

Merge binutils changes.

Files:
5 added
4 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    rc62f2d0 re478cebf  
    562562! CONFIG_BAREBONE (n/y)
    563563
     564% Build binutils binaries
     565! CONFIG_BINUTILS (n/y)
     566
    564567% Line debugging information
    565568! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
  • Makefile

    rc62f2d0 re478cebf  
    100100distclean: clean
    101101        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
     102        cd ./uspace/app/binutils/; ./distclean.sh
    102103
    103104clean:
  • boot/Makefile.common

    rc62f2d0 re478cebf  
    170170        $(USPACE_PATH)/app/websrv/websrv
    171171
     172ifeq ($(CONFIG_BINUTILS),y)
     173RD_APPS_NON_ESSENTIAL += \
     174        $(USPACE_PATH)/app/binutils/bin/as \
     175        $(USPACE_PATH)/app/binutils/bin/ld
     176endif
     177
    172178ifneq ($(CONFIG_BAREBONE),y)
    173179NET_CFG = \
  • uspace/Makefile

    rc62f2d0 re478cebf  
    115115        drv/bus/usb/vhc
    116116
     117ifeq ($(CONFIG_BINUTILS),y)
     118DIRS += \
     119        app/binutils
     120endif
     121
    117122## Networking
    118123#
Note: See TracChangeset for help on using the changeset viewer.