Changeset 54146a0 in mainline
- Timestamp:
- 2011-05-01T11:45:50Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- d2a6a04b
- Parents:
- 5d4763b
- Location:
- uspace
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r5d4763b r54146a0 47 47 # STATIC_NEEDED set to 'y' for init binaries, will build statically 48 48 # linked version 49 # STATIC_ONLY set to 'y' if binary cannot be linked dynamically 50 # (e.g. uses thread-local variables) 49 51 # 50 52 # Optionally, for a libary: … … 113 115 STATIC_BUILD = y 114 116 else 115 ifeq ($( CONFIG_USE_SHARED_LIBS),y)116 STATIC_BUILD = n117 ifeq ($(STATIC_ONLY),y) 118 STATIC_BUILD = y 117 119 else 118 STATIC_BUILD = y 120 ifeq ($(CONFIG_USE_SHARED_LIBS), y) 121 STATIC_BUILD = n 122 else 123 STATIC_BUILD = y 124 endif 119 125 endif 120 126 endif -
uspace/lib/c/arch/ia32/_link.ld.in
r5d4763b r54146a0 5 5 6 6 PHDRS { 7 #if defined(LOADER) 7 #if defined(LOADER) || defined(DLEXE) 8 8 interp PT_INTERP; 9 9 text PT_LOAD FILEHDR PHDRS FLAGS(5); 10 #elif defined(DLEXE)11 interp PT_INTERP;12 text PT_LOAD FLAGS(5);13 10 #else 14 11 text PT_LOAD FLAGS(5); … … 64 61 *(.dynstr); 65 62 } :text 63 64 .hash : { 65 *(.hash); 66 } :text 66 67 #endif 67 68 . = . + 0x1000; … … 79 80 #if defined(SHLIB) || defined(DLEXE) 80 81 .data.rel : { 81 *(.data.rel );82 *(.data.rel .data.rel.*); 82 83 } :data 83 84 … … 105 106 106 107 .bss : { 108 *(.dynbss); 107 109 *(COMMON); 108 110 *(.bss); … … 122 124 #endif 123 125 124 #if defined(SHLIB)125 #elif defined(DLEXE)126 /DISCARD/ : {127 *(.comment);128 }129 #else130 126 /DISCARD/ : { 131 127 *(*); 132 128 } 133 #endif134 129 } -
uspace/srv/net/tl/icmp/Makefile
r5d4763b r54146a0 32 32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include 33 33 BINARY = icmp 34 STATIC_ONLY = y 34 35 35 36 SOURCES = \
Note:
See TracChangeset
for help on using the changeset viewer.