Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3805 → Rev 3806

/programs/develop/libraries/newlib/Makefile
13,14 → 13,6
 
INCLUDES:= -I $(LIBC_INCLUDES)
 
AMZ_SRCS:= \
crt/crt_amz.S \
crt/chkstk.S \
crt/exit.S \
crt/pseudo-reloc.c \
crt/dllstart.c \
crt/setjmp.S
 
STATIC_SRCS:= \
crt/start.S \
crt/crt1.c \
30,7 → 22,8
pe/crtloader.c
 
DLL_SRCS:= \
crt/crtdll.c \
crt/crtbegin.c \
crt/pseudo-reloc.c \
crt/chkstk.S \
crt/exit.S
 
46,6 → 39,7
crt/start.S \
crt/chkstk.S \
crt/crt3.c \
crt/crtbegin.o \
pe/crtloader.c
 
CORE_SRCS:= \
308,8 → 302,6
f_log10.S f_log10f.S f_logf.S f_tan.S f_tanf.S
 
 
AMZ_OBJS = $(patsubst %.S, %.o, $(patsubst %.c, %.o, $(AMZ_SRCS)))
 
STATIC_OBJS = $(patsubst %.S, %.o, $(patsubst %.c, %.o, $(STATIC_SRCS)))
 
LIBCRT_OBJS = $(patsubst %.S, %.o, $(patsubst %.c, %.o, $(LIBCRT_SRCS)))
372,18 → 364,18
 
 
 
shared: $(NAME).dll libcrt.a
shared: $(NAME).dll libcrt.a libdll.a
 
 
$(NAME).dll: $(LIB_OBJS) $(SRC_DEP) Makefile
ld $(LDFLAGS) -L. -o $@ $(LIB_OBJS) -lgcc
ld $(LDFLAGS) -Map libcmap -L. -o $@ $(LIB_OBJS) -lgcc
 
 
libcrt.a: $(LIBCRT_OBJS) Makefile
ar rc libcrt.a $(LIBCRT_OBJS)
 
libamz.a: $(AMZ_OBJS) Makefile
ar rc libamz.a $(AMZ_OBJS)
libdll.a: $(DLL_OBJS) Makefile
ar rc libdll.a $(DLL_OBJS)
 
libc.obj: $(NAME).dll
fasm pe/libc.asm ./libc.obj
/programs/develop/libraries/newlib/crt/dllstart.c
File deleted
/programs/develop/libraries/newlib/crt/crtbegin.c
0,0 → 1,18
 
extern void _pei386_runtime_relocator (void);
 
int DllStartup(void *module, int reason);// __attribute__ ((dllexport));
 
 
int DllStartup(void *module, int reason)
{
_pei386_runtime_relocator();
return 1;
};
 
void ___dll_start ()
 
{
_pei386_runtime_relocator();
 
}
/programs/develop/libraries/newlib/dll.lds
1,18 → 1,20
 
OUTPUT_FORMAT(pei-i386)
 
ENTRY("____dll_start")
 
SECTIONS
{
 
. = SIZEOF_HEADERS;
. = ALIGN(__section_alignment__);
 
.text __image_base__ + . :
{
 
*(.init)
*(.text)
*(SORT(.text$*))
*(.text.*)
*(.gnu.linkonce.t.*)
*(.glue_7t)
*(.glue_7)
___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
20,24 → 22,8
___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
LONG (-1); *(.dtors); *(.dtor); *(SORT(.dtors.*)); LONG (0);
*(.fini)
/* ??? Why is .gcc_exc here? */
*(.gcc_exc)
PROVIDE (etext = .);
*(.gcc_except_table)
}
 
.rdata ALIGN(__section_alignment__):
{
*(.rdata)
*(SORT(.rdata$*))
___RUNTIME_PSEUDO_RELOC_LIST__ = .;
__RUNTIME_PSEUDO_RELOC_LIST__ = .;
*(.rdata_runtime_pseudo_reloc)
___RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
__RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
}
.CRT ALIGN(__section_alignment__):
{
. = ALIGN(16) ;
___crt_xc_start__ = . ;
*(SORT(.CRT$XC*)) /* C initialization */
___crt_xc_end__ = . ;
53,7 → 39,20
___crt_xt_start__ = . ;
*(SORT(.CRT$XT*)) /* Termination */
___crt_xt_end__ = . ;
 
. = ALIGN(16) ;
 
*(.rdata)
*(SORT(.rdata$*))
__rt_psrelocs_start = .;
*(.rdata_runtime_pseudo_reloc)
__rt_psrelocs_end = .;
}
__rt_psrelocs_size = __rt_psrelocs_end - __rt_psrelocs_start;
___RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
__RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
___RUNTIME_PSEUDO_RELOC_LIST__ = . - __rt_psrelocs_size;
__RUNTIME_PSEUDO_RELOC_LIST__ = . - __rt_psrelocs_size;
 
.data ALIGN(__section_alignment__):
{
68,16 → 67,12
*(.data_cygwin_nocopy)
}
 
.eh_frame ALIGN(__section_alignment__):
{
*(.eh_frame)
___iend = . ;
}
 
.bss ALIGN(__section_alignment__):
{
__bss_start__ = . ;
*(.bss)
*(COMMON)
__bss_end__ = . ;
}
 
.edata ALIGN(__section_alignment__):
92,6 → 87,7
*(.debug$F)
*(.drectve)
*(.note.GNU-stack)
*(.eh_frame)
*(.comment)
*(.debug_abbrev)
*(.debug_info)