CVS: msp430-libc4/src Makefile,1.2,1.3

Update of /cvsroot/mspgcc/msp430-libc4/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14802/src

Modified Files:
	Makefile 
Log Message:
changes for gcc-4.0.2


Index: Makefile
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc4/src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- Makefile	29 Aug 2005 16:58:32 -0000	1.2
+++ Makefile	28 Jan 2006 10:13:32 -0000	1.3
@@ -3,11 +3,11 @@
 #
 # $Id$
 #
-VERSION = 20050829
+VERSION = 20060128
 
 # installation prefix (set this if you don't install by hand)
 
-prefix = /usr/local/msp430
+prefix = /usr/local
 
 # name of target architecture (used for conform naming)
 
@@ -20,23 +20,21 @@
 
 srcdir = .
 
-CC = ${target}-gcc
-AS = ${target}-gcc -x assembler-with-cpp
-AR = ${target}-ar
+CC = ${prefix}/bin/${target}-gcc
+AS = ${prefix}/bin/${target}-gcc -x assembler-with-cpp
+AR = ${prefix}/bin/${target}-ar
 RM = rm
 MD = mkdir -p $@
 INSTALL = install -c -m644 $^/
 
 ASFLAGS = -Wa,-gstabs -D_GNU_ASSEMBLER_
-CFLAGS = -Wall -O -g
+CFLAGS = -Wall -O2 -g
 
 # make sure we can find our header files (not the installed ones)
 
 ALL_ASFLAGS += -I$(srcdir)/../include -I$(srcdir) ${ASFLAGS}
 ALL_CFLAGS += -I$(srcdir)/../include -I$(srcdir) ${CFLAGS}
 
-opt_speed_cflags = -O
-
 # further declaration... 
 ifdef gnu
  source_dirs = gnu
@@ -213,12 +211,16 @@
 ef_exp.c ef_pow.c kf_cos.c sf_copysign.c sf_ilogb.c sf_nan.c \
 ef_fmod.c ef_rem_pio2.c kf_rem_pio2.c sf_cos.c sf_infinity.c sf_nextafter.c
 
+libm_asm_sources = sqrt.S
 
 libm_libs = msp1/libm.a msp2/libm.a msp1/libfp.a msp2/libfp.a
 
 libm_msp430_fp_objs_1 = ${basic_fp:%.c=%.o}
 libm_msp430_fp_objs_2 = ${basic_fp:%.c=%.o}
 
+libm_msp430_asmt_objs_1 = ${libm_asm_sources:%.S=%.o}
+libm_msp430_asmt_objs_2 = ${libm_asm_sources:%.S=%.o}
+
 libm_msp430_fc_objs_1 = ${fppfunc:%.c=%.o}
 libm_msp430_fc_objs_2 = ${fppfunc:%.c=%.o}
 
@@ -226,6 +228,9 @@
 libm_msp430_c_objs_1 = $(addprefix msp1/, $(libm_msp430_fp_objs_1))
 libm_msp430_c_objs_2 = $(addprefix msp2/, $(libm_msp430_fp_objs_2))
 
+libm_msp430_S_objs_1 = $(addprefix msp1/, $(libm_msp430_asmt_objs_1))
+libm_msp430_S_objs_2 = $(addprefix msp2/, $(libm_msp430_asmt_objs_2))
+
 libm_msp430_cf_objs_1 = $(addprefix msp1/, $(libm_msp430_fc_objs_1))
 libm_msp430_cf_objs_2 = $(addprefix msp2/, $(libm_msp430_fc_objs_2))
 
@@ -238,6 +243,12 @@
 ${libm_msp430_c_objs_2}: msp2/%.o: libm/%.c
 	${CC} -c ${CPPFLAGS} ${ALL_CFLAGS} -mmcu=msp2 -c $(ABSPATH)$< -o $@
 
+${libm_msp430_S_objs_1}: msp1/%.o: libm/%.S
+	${AS} -D_GNU_ASSEMBLER_ -mmcu=msp1 -c $(ABSPATH)$< -o $@
+
+${libm_msp430_S_objs_2}: msp2/%.o: libm/%.S
+	${AS} -D_GNU_ASSEMBLER_ -mmcu=msp2 -c $(ABSPATH)$< -o $@
+
 
 ${libm_msp430_cf_objs_1}: msp1/%.o: libm/%.c
 	${CC} ${CPPFLAGS} -mmcu=msp1 ${ALL_CFLAGS} -c $(ABSPATH)$< -o $@
@@ -246,8 +257,8 @@
 	${CC} ${CPPFLAGS} -mmcu=msp2 ${ALL_CFLAGS} -c $(ABSPATH)$< -o $@
 
 
-allm_objs1 = ${libm_msp430_cf_objs_1} 
-allm_objs2 = ${libm_msp430_cf_objs_2}
+allm_objs1 = ${libm_msp430_cf_objs_1} ${libm_msp430_S_objs_1}
+allm_objs2 = ${libm_msp430_cf_objs_2} ${libm_msp430_S_objs_2}
 
 msp1/libm.a: ${allm_objs1}
 	${AR} rc $@ $?



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642