libgloss/

	* m68k/Makefile.in (CFLAGS): Do not clear.  Add to all compilations.
	(ARFLAGS): Remove commented out definition.

2 files changed, 23 insertions, 20 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 9d02f5416..fbaa8d36a 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,23 +1,29 @@
 2006-11-01  Nathan Sidwell  <nathan@codesourcery.com>
 
 	libgloss/
-	* m68k/Makefile.in (IS_GCC, DO_CF, DO_M68K): New.
+	* m68k/Makefile.in (CFLAGS): Do not clear.  Add to all compilations.
+	(ARFLAGS): Remove commented out definition.
+
+	libgloss/
+	* m68k/configure.in (DO) Set to list of target cpu families.
+	* m68k/configure: Rebuilt.
+	* m68k/Makefile.in (DO): New.
 	(UNHOSTED_BSP, UNHOSTED_OBJS, HOSTED_BSP, HOSTED_OBJS): Move
 	later.
 	(m5208evb, m5213evb, m52235evb, m5235evb, m5273c3, m5275evb,
 	m5282evb, m5329evb, m5485evb): Move earlier.
-	(all): Add all_cf & all_m68k conditional dependencies.
+	(all): Add all_$DO dependencies.
 	(all_cf, all_m68k): New targets, depend on cf & m68k bsps as
 	appropriate.
 	(m%-ram.ld, m%-rom.ld, m%-ram-hosted.ld, m%-rom-hosted.ld): Add
 	'm' prefix.
-	(install): Add install_cf, install_m68k conditional dependencies.
+	(install): Add install_$DO dependencies.
 	(install_cf, install_m68k): New targets.  Perform cf and m68k
 	installs as appropriate.
 	(install_io): New, install the io libraries.
 
 2006-10-25  Vladimir Prus  <vladimir@codesourcery.com>
-	
+
 	Merge from HEAD:
 	newlib/         
 	* libc/include/math.h: (exception): Add a comment
diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in
index 3e8cfdf64..580ea2017 100644
--- a/libgloss/m68k/Makefile.in
+++ b/libgloss/m68k/Makefile.in
@@ -66,9 +66,6 @@ OBJS =  close.o fstat.o getpid.o isatty.o kill.o \
 	lseek.o open.o print.o putnum.o read.o sbrk.o stat.o \
 	unlink.o write.o
 
-CFLAGS = -g
-# ARFLAGS = rv
-
 # What targets to build for.  This is a list of {m68k,cf}
 DO = @DO@
 
@@ -213,25 +210,25 @@ ${MVME162_BSP}: $(OBJS) ${MVME162_OBJS}
 
 # build hosted library
 $(HOSTED_OBJS): hosted%.o: io%.c io.h
-	$(CC) $(CFLAGS_FOR_TARGET) -DHOSTED=1 $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) -DHOSTED=1 $(INCLUDES) -c $< -o $@
 $(HOSTED_BSP): $(HOSTED_OBJS)
 	${AR} ${ARFLAGS} $@ $^
 	${RANLIB} $@
 cf-hosted-crt0.o: cf-crt0.S
-	$(CC) $(CFLAGS_FOR_TARGET) -DHOSTED=1 $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) -DHOSTED=1 $(INCLUDES) -c $< -o $@
 
 # build unhosted library
 $(UNHOSTED_OBJS): unhosted%.o: io%.c io.h
-	$(CC) $(CFLAGS_FOR_TARGET) -DHOSTED=0 $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) -DHOSTED=0 $(INCLUDES) -c $< -o $@
 $(UNHOSTED_BSP): $(UNHOSTED_OBJS)
 	${AR} ${ARFLAGS} $@ $^
 	${RANLIB} $@
 cf-unhosted-crt0.o: cf-crt0.S
-	$(CC) $(CFLAGS_FOR_TARGET) -DHOSTED=0 $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) -DHOSTED=0 $(INCLUDES) -c $< -o $@
 
 # build coldfire library
 $(patsubst %,cf-%.o,${CF_ISRS}) : cf-isrs.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< -o $@ \
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -c $< -o $@ \
 	  -DL_$(patsubst cf-%.o,%,$@)
 $(CF_BSP): $(CF_OBJS)
 	${AR} ${ARFLAGS} $@ $^
@@ -251,19 +248,19 @@ m%-rom-hosted.ld : cf.sc Makefile
 	  ROM=$(word 3,$(m$*)) ROM_SIZE=$(word 4,$(m$*)) ${SHELL} $< >$@
 
 leds.o: ${srcdir}/leds.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -c $<
 
 idp-inbyte.o: ${srcdir}/idp-inbyte.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -c $<
 
 idp-outbyte.o: ${srcdir}/idp-outbyte.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -c $<
 
 idp-gdb-outbyte.o: ${srcdir}/idp-outbyte.c
-	$(CC) $(CFLAGS_FOR_TARGET) -DGDB_MONITOR_OUTPUT $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) -DGDB_MONITOR_OUTPUT $(INCLUDES) -c $< -o $@
 
 mc68ec.o: ${srcdir}/mc68ec.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -c $<
 
 test.o: ${srcdir}/test.c
 
@@ -282,7 +279,7 @@ test: $(OBJS) idp-test.srec mvme135-test.srec bcc-test.srec \
 # symbols will get fully resolved.
 
 idp-test.x: test.o ${CRT0} Makefile ${IDP_BSP}
-	${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \
+	${CC} $(CFLAGS_FOR_TARGET) $(CFLAGS) -L${srcdir} -L${objdir} \
 	test.o -o $@ $(LDFLAGS_FOR_TARGET) -N -Wl,-Tidp.ld
 idp-test.srec: idp-test.x
 	$(OBJCOPY) -O srec idp-test.x $@
@@ -292,7 +289,7 @@ idp-test.dis: idp-test.x
 idp-test: idp-test.srec idp-test.dis
 
 idpgdb-test.x: test.o ${CRT0} Makefile ${IDPGDB_BSP}
-	${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \
+	${CC} $(CFLAGS_FOR_TARGET) $(CFLAGS) -L${srcdir} -L${objdir} \
 	test.o -o $@ $(LDFLAGS_FOR_TARGET) -N -Wl,-Tidpgdb.ld
 idpgdb-test.srec: idpgdb-test.x
 	$(OBJCOPY) -O srec idpgdb-test.x $@
@@ -333,7 +330,7 @@ bcc-test: bcc-test.srec bcc-test.dis
 
 # a C++ test case
 dtor.o:  $(srcdir)/dtor.C
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -o $@ -c $<
+	$(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -o $@ -c $<
 dtor.dis: dtor.x
 	@rm -fr dtor.dis
 	$(OBJDUMP) -d dtor.x > $@