[Cegcc-svn] SF.net SVN: cegcc:[1343] trunk/cegcc/src/mingw

[<dan...@us...>]

Revision: 1343
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1343&view=rev
Author:   dannybackx
Date:     2009-07-20 10:00:57 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
A forgotten commit from a month ago.
Also in the same Makefile.in : change to include atoll in libmingwex.a .

Modified Paths:
--------------
    trunk/cegcc/src/mingw/ChangeLog.mingw32ce
    trunk/cegcc/src/mingw/mingwex/Makefile.in

Modified: trunk/cegcc/src/mingw/ChangeLog.mingw32ce
===================================================================
--- trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2009-06-21 09:40:21 UTC (rev 1342)
+++ trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2009-07-20 10:00:57 UTC (rev 1343)
@@ -1,3 +1,7 @@
+2009-07-20  Danny Backx  <dan...@us...>
+
+	* mingwex/Makefile.in : Compile atoll always, it's C99.
+
 2009-06-21  Danny Backx  <dan...@us...>
 
 	* mingwex/wince/i386/setjmp.S,i386mach.h : New files, implement setjmp

Modified: trunk/cegcc/src/mingw/mingwex/Makefile.in
===================================================================
--- trunk/cegcc/src/mingw/mingwex/Makefile.in	2009-06-21 09:40:21 UTC (rev 1342)
+++ trunk/cegcc/src/mingw/mingwex/Makefile.in	2009-07-20 10:00:57 UTC (rev 1343)
@@ -39,7 +39,8 @@
 	wcrtomb.c wctob.c mbrtowc.c btowc.c mb_wc_common.h \
 	gettimeofday.c isblank.c iswblank.c \
 	basename.c dirname.c usleep.c \
-	tsearch.c twalk.c tdelete.c tfind.c
+	tsearch.c twalk.c tdelete.c tfind.c \
+	wince/i386/setjmp.S wince/i386/i386mach.h
 
 MATH_DISTFILES = \
 	acosf.c acosl.c asinf.c asinl.c atan2f.c atan2l.c \
@@ -163,7 +164,7 @@
 STDLIB_STUB_OBJS = \
 	lltoa.o ulltoa.o \
 	lltow.o ulltow.o \
-	atoll.o wtoll.o \
+	wtoll.o \
 	_Exit.o
 STDIO_OBJS = \
 	fopen64.o fseeko64.o ftello64.o lseek64.o \
@@ -201,6 +202,8 @@
 	tgammaf.o tgammal.o trunc.o truncf.o truncl.o \
 	acosh.o acoshf.o acoshl.o asinh.o asinhf.o asinhl.o \
 	atanh.o atanhf.o atanhl.o
+C99OBJS = \
+	atoll.o
 MATH_ROUND_OBJS = round.o roundf.o roundl.o
 MATH_LROUND_OBJS = lround.o lroundf.o lroundl.o
 MATH_LLROUND_OBJS = llround.o llroundf.o llroundl.o
@@ -257,7 +260,7 @@
 ifneq (,$(findstring mingw32ce,$(host_alias)))
 LIB_OBJS = $(WINCE_OBJS) $(MATHCE_OBJS) $(MATCHCE_ROUND_OBJS) \
 	$(Q8_OBJS) $(STDIO_OBJS_CE) \
-	$(POSIX_OBJS) $(GDTOA_OBJS)
+	$(POSIX_OBJS) $(GDTOA_OBJS) $(C99OBJS)
 MATHCE_FLAGS=-D_IEEE_LIBM
 MATHDIR=mathce
 else
@@ -265,10 +268,16 @@
 	$(STDIO_OBJS) $(MATH_OBJS) $(MATH_ROUND_OBJS) \
 	$(MATH_LROUND_OBJS) $(MATH_LLROUND_OBJS) $(FENV_OBJS) \
 	$(POSIX_OBJS) $(REPLACE_OBJS) $(COMPLEX_OBJS) \
-	$(GDTOA_OBJS)
+	$(GDTOA_OBJS) $(C99OBJS)
 MATHDIR=math
 endif
 
+ifeq (,$(findstring i386,$(host_alias)))
+# Do nothing, only i386 supported
+else
+	POSIX_OBJS += setjmp.o
+endif
+
 VPATH = $(srcdir):$(srcdir)/stdio:$(srcdir)/complex:$(srcdir)/wince:$(srcdir)/$(MATHDIR):$(srcdir)/gdtoa
 
 LIBS = $(LIBMINGWEX_A)
@@ -398,3 +407,10 @@
 	@for i in $(GDTOA_DISTFILES); do\
 		cp -p $(srcdir)/gdtoa/$$i $(distdir)/mingwex/gdtoa/$$i ; \
 	done
+
+ifeq (,$(findstring i386,$(host_alias)))
+# Do nothing, only i386 supported
+else
+setjmp.o:
+	$(CC) -c -I$(srcdir)/wince/i386 $(srcdir)/wince/i386/setjmp.S
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.