PATCH: Use libm_machine_dir in libm/configure
J. Johnston
jjohnstn@redhat.com
Tue Sep 30 08:10:00 GMT 2003
Patch checked in, thanks. I regenerated configure and Makefile.in
after applying the configure.in change.
-- Jeff J.
Ian Lance Taylor wrote:
> newlib/configure.host sets libm_machine_dir for processors which have
> code in libm/machine (currently just i386). However, libm/configure
> checks the generic machine_dir, rather than libm_machine_dir. The
> effect is that LIBM_MACHINE_LIB in libm/Makefile gets set even if
> there is no machine specific libm, this gets into SUBLIBS, and thus
> this loop building libm.a in libm/Makefile applies to machine/lib.a
> even if that file does not exist.
>
> cd tmp; \
> for i in $(SUBLIBS); do \
> $(AR) x ../$$i; \
> done; \
>
> The ar fails, which introduces a meaningless but odd error message
> into the log, and also breaks the build when running with sh -e.
>
> The patch is fairly obvious. I tested this for i386-elf and
> xscale-elf.
>
> I'm not on the newlib list, so please CC me on any replies. Thanks.
>
> Ian
>
>
> 2003-09-28 Ian Lance Taylor <ian@wasabisystems.com>
>
> * libm/configure.in: Check libm_machine_dir, not machine_dir.
> * libm/configure: Regenerate.
>
>
> Index: libm/configure.in
> ===================================================================
> RCS file: /cvs/src/src/newlib/libm/configure.in,v
> retrieving revision 1.2
> diff -u -r1.2 configure.in
> --- libm/configure.in 13 Dec 2001 23:50:10 -0000 1.2
> +++ libm/configure.in 29 Sep 2003 02:30:19 -0000
> @@ -28,10 +28,10 @@
> fi
>
> LIBM_MACHINE_LIB=
> -if test -n "${machine_dir}"; then
> +if test -n "${libm_machine_dir}"; then
> AC_CONFIG_SUBDIRS(machine)
> if test "${use_libtool}" = "yes"; then
> - LIBM_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
> + LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext}
> else
> LIBM_MACHINE_LIB=machine/lib.${aext}
> fi
> Index: libm/configure
> ===================================================================
> RCS file: /cvs/src/src/newlib/libm/configure,v
> retrieving revision 1.13
> diff -u -r1.13 configure
> --- libm/configure 8 Feb 2003 04:30:22 -0000 1.13
> +++ libm/configure 29 Sep 2003 02:30:19 -0000
> @@ -3021,11 +3021,11 @@
> fi
>
> LIBM_MACHINE_LIB=
> -if test -n "${machine_dir}"; then
> +if test -n "${libm_machine_dir}"; then
> subdirs="machine"
>
> if test "${use_libtool}" = "yes"; then
> - LIBM_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
> + LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext}
> else
> LIBM_MACHINE_LIB=machine/lib.${aext}
> fi
More information about the Newlib
mailing list