WebSVN – HelenOS – Path Comparison – / – /branches/dynload/ Rev 3555 and /branches/dynload/ Rev 3556

Ignore whitespace Rev 3555 → Rev 3556

 /branches/dynload/uspace/app/dltest/Makefile
 ,7 → 33,7
 #
 LIBC_PREFIX = ../../lib/libc
-LIBCS_PREFIX = ../../lib/libc-shared
+LIBCS_PREFIX = ../../lib/libc/shared
 SOFTINT_PREFIX = ../../lib/softint
 RTLD_PREFIX = ../../lib/rtld
 include $(LIBC_PREFIX)/Makefile.toolchain
 ,18 → 41,8
 CFLAGS += -I../../lib/libc -O0
 LFLAGS := -Bdynamic -I/lib/rtld -rpath-link $(RTLD_PREFIX)
-# LIBS = $(LIBC_PREFIX)/libc.a
-LIBS = ../../lib/libc-shared/libc.so.0
-DEFS += -DRELEASE=\"$(RELEASE)\"
+LIBS = ../../lib/libc/shared/libc.so.0
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,9 → 70,6
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-#arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
-#   $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S
     $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@

/branches/dynload/uspace/lib/libc-shared/arch/ppc32/_link.ld.in
File deleted

Property changes:
Deleted: svn:mergeinfo

/branches/dynload/uspace/lib/libc-shared/arch/ppc32/_lib.ld.in
File deleted

Property changes:
Deleted: svn:mergeinfo

/branches/dynload/uspace/lib/libc-shared/arch/ia32/_lib.ld.in
File deleted

Property changes:
Deleted: svn:mergeinfo

/branches/dynload/uspace/lib/libc-shared/arch/ia32/_link.ld.in
File deleted

Property changes:
Deleted: svn:mergeinfo

/branches/dynload/uspace/lib/libc-shared/Makefile
File deleted

 /branches/dynload/uspace/lib/libc/shared/Makefile
 ,0 → 1,81
+#
+# Copyright (c) 2005 Martin Decky
+# 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.
+#
+include ../../../version
+include ../../Makefile.config
+## Setup toolchain
+#
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+RTLD_PREFIX = ../../lib/rtld
+include $(LIBC_PREFIX)/Makefile.toolchain
+#include arch/$(ARCH)/Makefile.inc
+ARCH_SOURCES :=
+LFLAGS = -shared -soname libc.so.0 --whole-archive
+LIBS = $(LIBC_PREFIX)/libc.pic.a $(SOFTINT_PREFIX)/libsoftint.a
+# $(RTLD_PREFIX)/rtld.so
+DEFS += -DRELEASE=\"$(RELEASE)\"
+ifdef REVISION
+    DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+ifdef TIMESTAMP
+    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
+## Sources
+#
+OUTPUT = libc.so.0
+.PHONY: all clean
+all: $(OUTPUT) arch/$(ARCH)/_link.ld
+inc:
+    ln -sfn ../arch/$(ARCH)/include include/arch
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(OUTPUT).sections Makefile.depend *.o arch/$(ARCH)/_lib.ld include/arch
+    find arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+$(OUTPUT): $(LIBS) arch/$(ARCH)/_lib.ld
+    $(LD) -T arch/$(ARCH)/_lib.ld $(LFLAGS) $(LIBS) -o $@ -Map $(OUTPUT).map
+arch/$(ARCH)/_lib.ld: arch/$(ARCH)/_lib.ld.in
+    $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+    $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

 /branches/dynload/uspace/lib/libc/shared/arch/ppc32/_link.ld.in
 ,0 → 1,89
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+ENTRY(__entry)
+PHDRS {
+    interp PT_INTERP;
+    text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    .interp : {
+        *(.interp);
+    } :interp
+    . = 0x1000;
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.text.*);
+        *(.rodata*);
+    } :text
+    .rel.plt ALIGN(0x1000) : {
+        *(.rel.plt);
+    } :text
+    /*
+     *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt
+     * without alignment gap or DT_REL will be broken
+     */
+    .rel.dyn : {
+        *(.rel.*);
+    } :text
+    .dynamic ALIGN(0x1000) : {
+        *(.dynamic);
+    } :text
+    .dynsym ALIGN(0x1000) : {
+        *(.dynsym);
+    } :text
+    .dynstr ALIGN(0x1000) : {
+        *(.dynstr);
+    } :text
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.data);
+        *(.sdata);
+    } :data
+    .data.rel ALIGN(0x1000) : {
+                *(.data.rel);
+    } :data
+    .got ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got);
+    } :data
+    .got.plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got.plt);
+    } :data
+/*  .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/
+    .bss : {
+        *(.sbss);
+        *(COMMON);
+        *(.bss);
+    } :data
+    .plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.plt);
+    } :data
+    . = ALIGN(0x1000);
+    _heap = .;
+}
 Property changes:
 Added: svn:mergeinfo

 /branches/dynload/uspace/lib/libc/shared/arch/ppc32/_lib.ld.in
 ,0 → 1,82
+ENTRY(__entry)
+PHDRS {
+    text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    . = 0x1000;
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.text.*);
+        *(.rodata*);
+    } :text
+    .rel.plt ALIGN(0x1000) : {
+        *(.rel.plt);
+    }
+    /*
+     *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt
+     * without alignment gap or DT_REL will be broken
+     */
+    .rel.dyn : {
+        *(.rel.*);
+    } :text
+    .dynamic ALIGN(0x1000) : {
+        *(.dynamic);
+    } :text
+    .dynsym ALIGN(0x1000) : {
+        *(.dynsym);
+    } :text
+    .dynstr ALIGN(0x1000) : {
+        *(.dynstr);
+    } :text
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.data);
+        *(.sdata);
+    } :data
+    .data.rel ALIGN(0x1000) : {
+                *(.data.rel);
+    } :data
+    .got ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got);
+    } :data
+    .got.plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got.plt);
+    } :data
+    .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    .bss : {
+        *(.sbss);
+        *(COMMON);
+        *(.bss);
+    } :data
+    .plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.plt);
+    } :data
+    . = ALIGN(0x1000);
+    _heap = .;
+}
 Property changes:
 Added: svn:mergeinfo

 /branches/dynload/uspace/lib/libc/shared/arch/ia32/_link.ld.in
 ,0 → 1,89
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+ENTRY(__entry)
+PHDRS {
+    interp PT_INTERP;
+        text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    .interp : {
+        *(.interp);
+    } :interp
+    . = 0x1000;
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.text.*);
+        *(.rodata*);
+    } :text
+    .rel.plt ALIGN(0x1000) : {
+        *(.rel.plt);
+    }
+    /*
+     *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt
+     * without alignment gap or DT_REL will be broken
+     */
+    .rel.dyn : {
+        *(.rel.*);
+    } :text
+    .plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.plt);
+    } :text
+    .dynamic ALIGN(0x1000) : {
+        *(.dynamic);
+    } :text
+    .dynsym ALIGN(0x1000) : {
+        *(.dynsym);
+    } :text
+    .dynstr ALIGN(0x1000) : {
+        *(.dynstr);
+    } :text
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.data);
+    } :data
+    .data.rel ALIGN(0x1000) : {
+                *(.data.rel);
+    } :data
+    .got ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got);
+    } :data
+    .got.plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got.plt);
+    } :data
+    .bss : {
+                *(COMMON);
+                *(.bss);
+    } :data
+/*  .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+*/
+    . = ALIGN(0x1000);
+    _heap = .;
+}
 Property changes:
 Added: svn:mergeinfo

 /branches/dynload/uspace/lib/libc/shared/arch/ia32/_lib.ld.in
 ,0 → 1,81
+ENTRY(__entry)
+PHDRS {
+        text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    . = 0x1000;
+    .init ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.text.*);
+        *(.rodata*);
+    } :text
+    .rel.plt ALIGN(0x1000) : {
+        *(.rel.plt);
+    }
+    /*
+     *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt
+     * without alignment gap or DT_REL will be broken
+     */
+    .rel.dyn : {
+        *(.rel.*);
+    } :text
+    .plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.plt);
+    } :text
+    .dynamic ALIGN(0x1000) : {
+        *(.dynamic);
+    } :text
+    .dynsym ALIGN(0x1000) : {
+        *(.dynsym);
+    } :text
+    .dynstr ALIGN(0x1000) : {
+        *(.dynstr);
+    } :text
+    .data ALIGN(0x1000) : SUBALIGN(0x1000) {
+        *(.data);
+    } :data
+    .data.rel ALIGN(0x1000) : {
+                *(.data.rel);
+    } :data
+    .got ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got);
+    } :data
+    .got.plt ALIGN(0x1000) : SUBALIGN(0x1000) {
+                *(.got.plt);
+    } :data
+    .bss : {
+                *(COMMON);
+                *(.bss);
+    } :data
+    .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    . = ALIGN(0x1000);
+    _heap = .;
+}
 Property changes:
 Added: svn:mergeinfo

/branches/dynload/uspace/lib/libc/shared
Property changes:
Added: svn:mergeinfo

 /branches/dynload/uspace/Makefile
 ,7 → 38,7
     lib/softint \
     lib/softfloat \
     lib/rtld \
-    lib/libc-shared \
+    lib/libc/shared \
     srv/ns \
     srv/loader \
     srv/fb \

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3555 → Rev 3556