From 80bd01ef831fbbb08f883a76576eba128ca1c385 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 24 Mar 2021 10:32:50 +0100 Subject: Add build mechanism to share common header files between machines So far the build mechanism in newlib only allowed to either define machine-specific headers, or headers shared between all machines. In some cases, architectures are sufficiently alike to share header files between them, but not with other architectures. A good example is ix86 vs. x86_64, which share certain traits with each other, but not with other architectures. Introduce a new configure variable called "shared_machine_dir". This dir can then be used for headers shared between architectures. Signed-off-by: Corinna Vinschen --- newlib/Makefile.am | 36 +++++++++++++++++++++++++++++++ newlib/Makefile.in | 37 ++++++++++++++++++++++++++++++++ newlib/acinclude.m4 | 1 + newlib/configure | 6 ++++-- newlib/configure.host | 3 +++ newlib/libc/Makefile.in | 1 + newlib/libc/argz/Makefile.in | 1 + newlib/libc/configure | 7 ++++-- newlib/libc/configure.in | 1 + newlib/libc/ctype/Makefile.in | 1 + newlib/libc/errno/Makefile.in | 1 + newlib/libc/iconv/Makefile.in | 1 + newlib/libc/iconv/ccs/Makefile.in | 1 + newlib/libc/iconv/ccs/binary/Makefile.in | 1 + newlib/libc/iconv/ces/Makefile.in | 1 + newlib/libc/iconv/lib/Makefile.in | 1 + newlib/libc/locale/Makefile.in | 1 + newlib/libc/misc/Makefile.in | 1 + newlib/libc/posix/Makefile.in | 1 + newlib/libc/reent/Makefile.in | 1 + newlib/libc/search/Makefile.in | 1 + newlib/libc/signal/Makefile.in | 1 + newlib/libc/ssp/Makefile.in | 1 + newlib/libc/stdio/Makefile.in | 1 + newlib/libc/stdio64/Makefile.in | 1 + newlib/libc/stdlib/Makefile.in | 1 + newlib/libc/string/Makefile.in | 1 + newlib/libc/syscalls/Makefile.in | 1 + newlib/libc/time/Makefile.in | 1 + newlib/libc/unix/Makefile.in | 1 + newlib/libc/xdr/Makefile.in | 1 + newlib/libm/Makefile.in | 1 + newlib/libm/common/Makefile.in | 1 + newlib/libm/complex/Makefile.in | 1 + newlib/libm/configure | 6 ++++-- newlib/libm/fenv/Makefile.in | 7 +++--- newlib/libm/math/Makefile.in | 1 + newlib/libm/mathfp/Makefile.in | 1 + 38 files changed, 124 insertions(+), 9 deletions(-) (limited to 'newlib') diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 809d492..03390cd 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -237,6 +237,23 @@ stmp-targ-include: config.status $(MAKE) targ-include/sys \ targ-include/machine \ targ-include/bits + -if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/machine/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/machine/`basename $$i`; \ + else true; fi ; \ + done; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/sys/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/sys/`basename $$i`; \ + else true; fi ; \ + done; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/include/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/`basename $$i`; \ + else true; fi ; \ + done; \ + fi -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ cp $$i targ-include/machine/`basename $$i`; \ @@ -315,6 +332,13 @@ endif for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ + if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/machine/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + else true; fi ; \ + done; \ + fi ; \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ @@ -332,6 +356,18 @@ endif for i in $(srcdir)/libc/include/sys/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \ + if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/sys/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + else true; fi ; \ + done ; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/include/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + else true; fi ; \ + done ; \ + fi ; \ for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \ if [ -f $$i ]; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index c3ee290..fdaf345 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -307,6 +307,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ @@ -989,6 +990,23 @@ stmp-targ-include: config.status $(MAKE) targ-include/sys \ targ-include/machine \ targ-include/bits + -if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/machine/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/machine/`basename $$i`; \ + else true; fi ; \ + done; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/sys/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/sys/`basename $$i`; \ + else true; fi ; \ + done; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/include/*.h; do \ + if [ -f $$i ]; then \ + cp $$i targ-include/`basename $$i`; \ + else true; fi ; \ + done; \ + fi -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ cp $$i targ-include/machine/`basename $$i`; \ @@ -1062,6 +1080,13 @@ install-data-local: install-toollibLIBRARIES for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ + if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/machine/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + else true; fi ; \ + done; \ + fi ; \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ @@ -1079,6 +1104,18 @@ install-data-local: install-toollibLIBRARIES for i in $(srcdir)/libc/include/sys/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \ + if [ -n "$(shared_machine_dir)" ]; then \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/sys/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + else true; fi ; \ + done ; \ + for i in $(srcdir)/libc/machine/$(shared_machine_dir)/include/*.h; do \ + if [ -f $$i ]; then \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + else true; fi ; \ + done ; \ + fi ; \ for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \ if [ -f $$i ]; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index 2b5c26f..05e545c 100644 --- a/newlib/acinclude.m4 +++ b/newlib/acinclude.m4 @@ -245,5 +245,6 @@ AC_SUBST(lpfx) AC_SUBST(libm_machine_dir) AC_SUBST(machine_dir) +AC_SUBST(shared_machine_dir) AC_SUBST(sys_dir) ]) diff --git a/newlib/configure b/newlib/configure index 6b3684b..2771fa2 100755 --- a/newlib/configure +++ b/newlib/configure @@ -666,6 +666,7 @@ OBJDUMP DLLTOOL SED sys_dir +shared_machine_dir machine_dir libm_machine_dir lpfx @@ -4122,6 +4123,7 @@ OBJEXT=${oext} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -11853,7 +11855,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11856 "configure" +#line 11858 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11959,7 +11961,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11962 "configure" +#line 11964 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/newlib/configure.host b/newlib/configure.host index 1ddbb6c..aae09bf 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -34,6 +34,8 @@ # It sets the following shell variables: # newlib_cflags Special CFLAGS to use when building # machine_dir Subdirectory of libc/machine to configure +# shared_machine_dir Subdirectory of libc/machine for files shared +# between specific architectures, optional # sys_dir Subdirectory of libc/sys to configure # have_sys_mach_dir Is there a machine subdirectory in sys subdirectory # posix_dir "posix" to build libc/posix, "" otherwise @@ -55,6 +57,7 @@ newlib_cflags= libm_machine_dir= machine_dir= +shared_machine_dir= sys_dir= posix_dir= signal_dir=signal diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index c3de3f6..b0160f8 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -328,6 +328,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in index e18a2d1..5179690 100644 --- a/newlib/libc/argz/Makefile.in +++ b/newlib/libc/argz/Makefile.in @@ -267,6 +267,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/configure b/newlib/libc/configure index dd9b3c8..7367964 100755 --- a/newlib/libc/configure +++ b/newlib/libc/configure @@ -676,6 +676,7 @@ SED NEWLIB_NANO_MALLOC_FALSE NEWLIB_NANO_MALLOC_TRUE sys_dir +shared_machine_dir machine_dir libm_machine_dir lpfx @@ -3869,6 +3870,7 @@ OBJEXT=${oext} + if test x$newlib_nano_malloc = xyes; then NEWLIB_NANO_MALLOC_TRUE= NEWLIB_NANO_MALLOC_FALSE='#' @@ -11567,7 +11569,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11570 "configure" +#line 11572 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11673,7 +11675,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11676 "configure" +#line 11678 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12139,6 +12141,7 @@ fi + ac_config_files="$ac_config_files Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile ssp/Makefile xdr/Makefile" cat >confcache <<\_ACEOF diff --git a/newlib/libc/configure.in b/newlib/libc/configure.in index d3b10a5..9b07a79 100644 --- a/newlib/libc/configure.in +++ b/newlib/libc/configure.in @@ -218,6 +218,7 @@ if test -n "${machine_dir}"; then fi AC_SUBST(LIBC_MACHINE_LIB) AC_SUBST(machine_dir) +AC_SUBST(shared_machine_dir) AC_CONFIG_FILES([Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile ssp/Makefile xdr/Makefile]) AC_OUTPUT diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in index 5ad351d..1ed7c85 100644 --- a/newlib/libc/ctype/Makefile.in +++ b/newlib/libc/ctype/Makefile.in @@ -325,6 +325,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in index 724def2..bd6e28f 100644 --- a/newlib/libc/errno/Makefile.in +++ b/newlib/libc/errno/Makefile.in @@ -240,6 +240,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in index 3bc64c5..e7dc9a0 100644 --- a/newlib/libc/iconv/Makefile.in +++ b/newlib/libc/iconv/Makefile.in @@ -252,6 +252,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in index ff849d5..074f965 100644 --- a/newlib/libc/iconv/ccs/Makefile.in +++ b/newlib/libc/iconv/ccs/Makefile.in @@ -302,6 +302,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in index 0748e79..8e48c45 100644 --- a/newlib/libc/iconv/ccs/binary/Makefile.in +++ b/newlib/libc/iconv/ccs/binary/Makefile.in @@ -238,6 +238,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in index ab38360..2770a55 100644 --- a/newlib/libc/iconv/ces/Makefile.in +++ b/newlib/libc/iconv/ces/Makefile.in @@ -245,6 +245,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in index ee4510a..715959c 100644 --- a/newlib/libc/iconv/lib/Makefile.in +++ b/newlib/libc/iconv/lib/Makefile.in @@ -238,6 +238,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in index c939fa3..5d2c01b 100644 --- a/newlib/libc/locale/Makefile.in +++ b/newlib/libc/locale/Makefile.in @@ -256,6 +256,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in index 803db8d..285e072 100644 --- a/newlib/libc/misc/Makefile.in +++ b/newlib/libc/misc/Makefile.in @@ -249,6 +249,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in index c3e125a..0e2824a 100644 --- a/newlib/libc/posix/Makefile.in +++ b/newlib/libc/posix/Makefile.in @@ -279,6 +279,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in index 4b323f2..2552448 100644 --- a/newlib/libc/reent/Makefile.in +++ b/newlib/libc/reent/Makefile.in @@ -275,6 +275,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in index 4330472..46539d7 100644 --- a/newlib/libc/search/Makefile.in +++ b/newlib/libc/search/Makefile.in @@ -264,6 +264,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in index 2f89f73..4c74cd6 100644 --- a/newlib/libc/signal/Makefile.in +++ b/newlib/libc/signal/Makefile.in @@ -241,6 +241,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/ssp/Makefile.in b/newlib/libc/ssp/Makefile.in index 8de2d36..1771949 100644 --- a/newlib/libc/ssp/Makefile.in +++ b/newlib/libc/ssp/Makefile.in @@ -264,6 +264,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in index aa22a0e..21b4c52 100644 --- a/newlib/libc/stdio/Makefile.in +++ b/newlib/libc/stdio/Makefile.in @@ -431,6 +431,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in index d002af6..85a15b6 100644 --- a/newlib/libc/stdio64/Makefile.in +++ b/newlib/libc/stdio64/Makefile.in @@ -255,6 +255,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in index 699831f..c0f219c 100644 --- a/newlib/libc/stdlib/Makefile.in +++ b/newlib/libc/stdlib/Makefile.in @@ -355,6 +355,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in index eb8fafc..0a45c13 100644 --- a/newlib/libc/string/Makefile.in +++ b/newlib/libc/string/Makefile.in @@ -342,6 +342,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in index 5c1cc3a..393eca0 100644 --- a/newlib/libc/syscalls/Makefile.in +++ b/newlib/libc/syscalls/Makefile.in @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in index a323332..ce6b6c1 100644 --- a/newlib/libc/time/Makefile.in +++ b/newlib/libc/time/Makefile.in @@ -254,6 +254,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in index 9d7da14..f868aa8 100644 --- a/newlib/libc/unix/Makefile.in +++ b/newlib/libc/unix/Makefile.in @@ -260,6 +260,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libc/xdr/Makefile.in b/newlib/libc/xdr/Makefile.in index 7495c117..90f194d 100644 --- a/newlib/libc/xdr/Makefile.in +++ b/newlib/libc/xdr/Makefile.in @@ -253,6 +253,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 20fc290..aa374d8 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -287,6 +287,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index 8968438..511ae2f 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -339,6 +339,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libm/complex/Makefile.in b/newlib/libm/complex/Makefile.in index 20b3b17..cc477fe 100644 --- a/newlib/libm/complex/Makefile.in +++ b/newlib/libm/complex/Makefile.in @@ -272,6 +272,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libm/configure b/newlib/libm/configure index 9b06c69..0c79bb2 100755 --- a/newlib/libm/configure +++ b/newlib/libm/configure @@ -639,6 +639,7 @@ OBJDUMP DLLTOOL SED sys_dir +shared_machine_dir machine_dir libm_machine_dir lpfx @@ -3818,6 +3819,7 @@ OBJEXT=${oext} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -11507,7 +11509,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11510 "configure" +#line 11512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11613,7 +11615,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11616 "configure" +#line 11618 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/newlib/libm/fenv/Makefile.in b/newlib/libm/fenv/Makefile.in index b2adb82..8811bb8 100644 --- a/newlib/libm/fenv/Makefile.in +++ b/newlib/libm/fenv/Makefile.in @@ -233,6 +233,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ @@ -252,7 +253,7 @@ libcommon_la_LDFLAGS = -Xcompiler -nostdlib lib_a_CFLAGS = -fbuiltin -fno-math-errno $(am__append_1) @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libcommon.la @USE_LIBTOOL_TRUE@libcommon_la_SOURCES = $(src) -@USE_LIBTOOL_FALSE@noinst_DATA = +@USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) @@ -310,7 +311,7 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) $(EXTRA_lib_a_DEPENDENCIES) +lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) $(EXTRA_lib_a_DEPENDENCIES) -rm -f lib.a $(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD) $(RANLIB) lib.a @@ -323,7 +324,7 @@ clean-noinstLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) +libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) $(libcommon_la_LINK) $(am_libcommon_la_rpath) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) mostlyclean-compile: diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index 7170bf5..7df02c6 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -318,6 +318,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index 383121b..006c198 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -290,6 +290,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ +shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ -- cgit v1.1