diff options
-rw-r--r-- | libgloss/ChangeLog | 7 | ||||
-rw-r--r-- | libgloss/xc16x/Makefile.in | 17 | ||||
-rwxr-xr-x | libgloss/xc16x/configure | 8 | ||||
-rw-r--r-- | libgloss/xc16x/configure.in | 4 |
4 files changed, 10 insertions, 26 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index ffb60e2a0..f7f2a2ad3 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2009-12-16 Conny Marco Menebrocker <c-m-m@gmx.de> + + * xc16x/Makefile.in: Remove extraneous stuff + brought in by copy. + * xc16x/configure.in: Ditto. + * xc16x/configure: Regenerated. + 2009-12-10 Conny Marco Menebrocker <c-m-m@gmx.de> * configure.in: Add xc16x support. diff --git a/libgloss/xc16x/Makefile.in b/libgloss/xc16x/Makefile.in index 83a75ae03..885cf13a1 100644 --- a/libgloss/xc16x/Makefile.in +++ b/libgloss/xc16x/Makefile.in @@ -65,7 +65,7 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ then echo ${objroot}/../binutils/objcopy ; \ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` -CRT0 = crt0.o crt0_cygmon.o crt0_redboot.o +CRT0 = crt0.o # Generic object files common to all targets. GENOBJS_NO_TRAP = close.o create.o crt0.o fstat.o getchar1.o \ @@ -93,7 +93,7 @@ BSP = @bsp_list@ # it to link is a good test, so we ignore all the errors for now. # -all: ${CRT0} test.o ${BSP} +all: ${CRT0} ${BSP} # # here's where we build the board support packages for each target @@ -108,16 +108,6 @@ libcygmon.a: $(CYGMONOBJS) ${RANLIB} $@ -# compile a fully linked binary. The -Wl,-T*.ld is for the linker -# script. By using -Wl, the linker script is put on the proper place -# in the comand line for ld, and all the symbols will get fully -# resolved. - -test: ${CRT0} test.o - ${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \ - test.o -o $@ $(NEWLIB_LDFLAGS) -Wl,-Teval.ld - @echo Done... - doc: clean mostlyclean: @@ -142,11 +132,8 @@ info: install-info: clean-info: -test.o: ${srcdir}/test.c - # these are for the BSPs crt0.o: ${srcdir}/crt0.S -crt0_cygmon.o: ${srcdir}/crt0_cygmon.S # target specific makefile fragment comes in here. @target_makefile_frag@ diff --git a/libgloss/xc16x/configure b/libgloss/xc16x/configure index 0882037db..f333181b4 100755 --- a/libgloss/xc16x/configure +++ b/libgloss/xc16x/configure @@ -604,7 +604,6 @@ LIBOBJS bsp_list script_list part_specific_obj -target_makefile_frag_path host_makefile_frag_path CCASFLAGS CCAS @@ -675,8 +674,7 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR SHELL' -ac_subst_files='host_makefile_frag -target_makefile_frag' +ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking @@ -2640,14 +2638,10 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS host_makefile_frag=${srcdir}/../config/default.mh -target_makefile_frag=${srcdir}/../config/xc16x.mt host_makefile_frag_path=$host_makefile_frag -target_makefile_frag_path=$target_makefile_frag - - diff --git a/libgloss/xc16x/configure.in b/libgloss/xc16x/configure.in index 40ecfeac9..3527eff70 100644 --- a/libgloss/xc16x/configure.in +++ b/libgloss/xc16x/configure.in @@ -48,7 +48,6 @@ LIB_AM_PROG_AS host_makefile_frag=${srcdir}/../config/default.mh -target_makefile_frag=${srcdir}/../config/xc16x.mt dnl We have to assign the same value to other variables because autoconf dnl doesn't provide a mechanism to substitute a replacement keyword with @@ -57,9 +56,6 @@ dnl host_makefile_frag_path=$host_makefile_frag AC_SUBST(host_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) -target_makefile_frag_path=$target_makefile_frag -AC_SUBST(target_makefile_frag_path) -AC_SUBST_FILE(target_makefile_frag) AC_SUBST(part_specific_obj) AC_SUBST(script_list) AC_SUBST(bsp_list) |