[PATCH 4/6] newlib: drop libtool support
Mike Frysinger
vapier@gentoo.org
Tue Feb 8 01:57:04 GMT 2022
This was only ever used for i?86-pc-linux-gnu targets, but that's been
broken for years, and has since been dropped. So clean this up too.
This also deletes the funky objectlist logic since it only existed for
the libtool libraries. Since it was the only thing left in the small
Makefile.shared file, we can punt that too.
---
newlib/Makefile.am | 60 -
newlib/Makefile.in | 310 +-
newlib/Makefile.shared | 6 -
newlib/acinclude.m4 | 2 -
newlib/aclocal.m4 | 5 -
newlib/configure | 11017 ++--------------
newlib/configure.ac | 54 -
newlib/configure.host | 3 -
newlib/libc/Makefile.am | 33 -
newlib/libc/Makefile.in | 238 +-
newlib/libc/aclocal.m4 | 5 -
newlib/libc/argz/Makefile.am | 11 -
newlib/libc/argz/Makefile.in | 125 +-
newlib/libc/configure | 8469 +-----------
newlib/libc/configure.ac | 63 +-
newlib/libc/ctype/Makefile.am | 11 -
newlib/libc/ctype/Makefile.in | 139 +-
newlib/libc/errno/Makefile.am | 11 -
newlib/libc/errno/Makefile.in | 116 +-
newlib/libc/iconv/Makefile.am | 2 -
newlib/libc/iconv/Makefile.in | 62 +-
newlib/libc/iconv/ccs/Makefile.am | 2 -
newlib/libc/iconv/ccs/Makefile.in | 79 +-
newlib/libc/iconv/ccs/binary/Makefile.am | 2 -
newlib/libc/iconv/ccs/binary/Makefile.in | 63 +-
newlib/libc/iconv/ces/Makefile.am | 3 -
newlib/libc/iconv/ces/Makefile.in | 82 +-
newlib/libc/iconv/lib/Makefile.am | 3 -
newlib/libc/iconv/lib/Makefile.in | 82 +-
newlib/libc/locale/Makefile.am | 11 -
newlib/libc/locale/Makefile.in | 122 +-
newlib/libc/machine/a29k/Makefile.in | 67 +-
newlib/libc/machine/aarch64/Makefile.in | 83 +-
newlib/libc/machine/amdgcn/Makefile.in | 68 +-
newlib/libc/machine/arc/Makefile.in | 83 +-
newlib/libc/machine/arm/Makefile.in | 83 +-
newlib/libc/machine/bfin/Makefile.in | 76 +-
newlib/libc/machine/cr16/Makefile.in | 83 +-
newlib/libc/machine/cris/Makefile.in | 71 +-
newlib/libc/machine/crx/Makefile.in | 83 +-
newlib/libc/machine/csky/Makefile.in | 76 +-
newlib/libc/machine/d10v/Makefile.in | 76 +-
newlib/libc/machine/d30v/Makefile.in | 76 +-
newlib/libc/machine/epiphany/Makefile.in | 76 +-
newlib/libc/machine/fr30/Makefile.in | 76 +-
newlib/libc/machine/frv/Makefile.in | 76 +-
newlib/libc/machine/ft32/Makefile.in | 76 +-
newlib/libc/machine/h8300/Makefile.in | 76 +-
newlib/libc/machine/h8500/Makefile.in | 83 +-
newlib/libc/machine/hppa/Makefile.in | 76 +-
newlib/libc/machine/i386/Makefile.am | 11 -
newlib/libc/machine/i386/Makefile.in | 126 +-
newlib/libc/machine/i960/Makefile.in | 67 +-
newlib/libc/machine/iq2000/Makefile.in | 76 +-
newlib/libc/machine/lm32/Makefile.in | 76 +-
newlib/libc/machine/m32c/Makefile.in | 76 +-
newlib/libc/machine/m32r/Makefile.in | 76 +-
newlib/libc/machine/m68hc11/Makefile.in | 76 +-
newlib/libc/machine/m68k/Makefile.in | 83 +-
newlib/libc/machine/m88k/Makefile.in | 76 +-
newlib/libc/machine/mep/Makefile.in | 76 +-
newlib/libc/machine/microblaze/Makefile.in | 83 +-
newlib/libc/machine/mips/Makefile.in | 79 +-
newlib/libc/machine/mn10200/Makefile.in | 76 +-
newlib/libc/machine/mn10300/Makefile.in | 76 +-
newlib/libc/machine/moxie/Makefile.in | 76 +-
newlib/libc/machine/msp430/Makefile.in | 83 +-
newlib/libc/machine/mt/Makefile.in | 76 +-
newlib/libc/machine/nds32/Makefile.in | 83 +-
newlib/libc/machine/necv70/Makefile.in | 76 +-
newlib/libc/machine/nios2/Makefile.in | 75 +-
newlib/libc/machine/nvptx/Makefile.in | 68 +-
newlib/libc/machine/or1k/Makefile.in | 76 +-
newlib/libc/machine/powerpc/Makefile.in | 83 +-
newlib/libc/machine/pru/Makefile.in | 75 +-
newlib/libc/machine/riscv/Makefile.in | 83 +-
newlib/libc/machine/rl78/Makefile.in | 76 +-
newlib/libc/machine/rx/Makefile.in | 76 +-
newlib/libc/machine/sh/Makefile.in | 76 +-
newlib/libc/machine/sparc/Makefile.in | 83 +-
newlib/libc/machine/spu/Makefile.in | 83 +-
newlib/libc/machine/tic4x/Makefile.in | 76 +-
newlib/libc/machine/tic6x/Makefile.in | 76 +-
newlib/libc/machine/tic80/Makefile.in | 76 +-
newlib/libc/machine/v850/Makefile.in | 76 +-
newlib/libc/machine/visium/Makefile.in | 83 +-
newlib/libc/machine/w65/Makefile.in | 83 +-
newlib/libc/machine/x86_64/Makefile.in | 76 +-
newlib/libc/machine/xc16x/Makefile.in | 83 +-
newlib/libc/machine/xstormy16/Makefile.in | 76 +-
newlib/libc/machine/z8k/Makefile.in | 76 +-
newlib/libc/misc/Makefile.am | 11 -
newlib/libc/misc/Makefile.in | 118 +-
newlib/libc/posix/Makefile.am | 11 -
newlib/libc/posix/Makefile.in | 132 +-
newlib/libc/reent/Makefile.am | 11 -
newlib/libc/reent/Makefile.in | 130 +-
newlib/libc/search/Makefile.am | 11 -
newlib/libc/search/Makefile.in | 124 +-
newlib/libc/signal/Makefile.am | 11 -
newlib/libc/signal/Makefile.in | 116 +-
newlib/libc/ssp/Makefile.am | 11 -
newlib/libc/ssp/Makefile.in | 126 +-
newlib/libc/stdio/Makefile.am | 14 -
newlib/libc/stdio/Makefile.in | 204 +-
newlib/libc/stdio64/Makefile.am | 12 -
newlib/libc/stdio64/Makefile.in | 125 +-
newlib/libc/stdlib/Makefile.am | 14 -
newlib/libc/stdlib/Makefile.in | 161 +-
newlib/libc/string/Makefile.am | 11 -
newlib/libc/string/Makefile.in | 152 +-
newlib/libc/sys/a29khif/Makefile.in | 83 +-
newlib/libc/sys/amdgcn/Makefile.in | 68 +-
newlib/libc/sys/arm/Makefile.in | 83 +-
newlib/libc/sys/d10v/Makefile.in | 83 +-
newlib/libc/sys/decstation/Makefile.in | 72 +-
newlib/libc/sys/epiphany/Makefile.in | 68 +-
newlib/libc/sys/h8300hms/Makefile.in | 83 +-
newlib/libc/sys/h8500hms/Makefile.in | 68 +-
newlib/libc/sys/m88kbug/Makefile.in | 68 +-
newlib/libc/sys/mmixware/Makefile.in | 83 +-
newlib/libc/sys/netware/Makefile.in | 72 +-
newlib/libc/sys/or1k/Makefile.in | 83 +-
newlib/libc/sys/phoenix/configure | 15 -
newlib/libc/sys/phoenix/machine/arm/configure | 15 -
newlib/libc/sys/phoenix/machine/configure | 15 -
newlib/libc/sys/rdos/Makefile.in | 83 +-
newlib/libc/sys/rtems/Makefile.in | 70 +-
newlib/libc/sys/sh/Makefile.in | 83 +-
newlib/libc/sys/sparc64/Makefile.in | 79 +-
newlib/libc/sys/sun4/Makefile.in | 68 +-
newlib/libc/sys/sysmec/Makefile.in | 83 +-
newlib/libc/sys/sysnec810/Makefile.in | 83 +-
newlib/libc/sys/sysnecv850/Makefile.in | 83 +-
newlib/libc/sys/sysvi386/Makefile.in | 83 +-
newlib/libc/sys/sysvnecv70/Makefile.in | 83 +-
newlib/libc/sys/tic80/Makefile.in | 72 +-
newlib/libc/sys/tirtos/Makefile.in | 68 +-
newlib/libc/sys/w65/Makefile.in | 68 +-
newlib/libc/sys/z8ksim/Makefile.in | 68 +-
newlib/libc/syscalls/Makefile.am | 11 -
newlib/libc/syscalls/Makefile.in | 124 +-
newlib/libc/time/Makefile.am | 12 -
newlib/libc/time/Makefile.in | 122 +-
newlib/libc/unix/Makefile.am | 11 -
newlib/libc/unix/Makefile.in | 126 +-
newlib/libc/xdr/Makefile.am | 11 -
newlib/libc/xdr/Makefile.in | 122 +-
newlib/libm/Makefile.am | 9 -
newlib/libm/Makefile.in | 152 +-
newlib/libm/aclocal.m4 | 5 -
newlib/libm/common/Makefile.am | 13 -
newlib/libm/common/Makefile.in | 159 +-
newlib/libm/complex/Makefile.am | 11 -
newlib/libm/complex/Makefile.in | 130 +-
newlib/libm/configure | 8449 +-----------
newlib/libm/configure.ac | 17 +-
newlib/libm/fenv/Makefile.am | 10 -
newlib/libm/fenv/Makefile.in | 120 +-
newlib/libm/machine/aarch64/Makefile.am | 3 -
newlib/libm/machine/aarch64/Makefile.in | 82 +-
newlib/libm/machine/arm/Makefile.am | 3 -
newlib/libm/machine/arm/Makefile.in | 82 +-
newlib/libm/machine/i386/Makefile.am | 11 -
newlib/libm/machine/i386/Makefile.in | 133 +-
newlib/libm/machine/mips/Makefile.am | 3 -
newlib/libm/machine/mips/Makefile.in | 82 +-
newlib/libm/machine/nds32/Makefile.am | 3 -
newlib/libm/machine/nds32/Makefile.in | 90 +-
newlib/libm/machine/powerpc/Makefile.am | 3 -
newlib/libm/machine/powerpc/Makefile.in | 82 +-
newlib/libm/machine/pru/Makefile.am | 3 -
newlib/libm/machine/pru/Makefile.in | 82 +-
newlib/libm/machine/riscv/Makefile.am | 3 -
newlib/libm/machine/riscv/Makefile.in | 82 +-
newlib/libm/machine/sparc/Makefile.am | 3 -
newlib/libm/machine/sparc/Makefile.in | 82 +-
newlib/libm/machine/spu/Makefile.am | 3 -
newlib/libm/machine/spu/Makefile.in | 82 +-
newlib/libm/machine/x86_64/Makefile.am | 11 -
newlib/libm/machine/x86_64/Makefile.in | 119 +-
newlib/libm/math/Makefile.am | 11 -
newlib/libm/math/Makefile.in | 144 +-
newlib/libm/mathfp/Makefile.am | 11 -
newlib/libm/mathfp/Makefile.in | 136 +-
newlib/newlib.hin | 37 -
186 files changed, 3680 insertions(+), 36675 deletions(-)
delete mode 100644 newlib/Makefile.shared
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index c6a2b3fe9dca..3befb2126116 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -8,9 +8,6 @@ PHONY =
SUFFIXES =
info_TEXINFOS =
noinst_DATA =
-pkglib_LTLIBRARIES =
-
-LIBTOOL_VERSION_INFO = 0:0:0
# The newlib hardware floating-point routines have been disabled due to
# inaccuracy. If you wish to work on them, you will need to edit the
@@ -71,10 +68,6 @@ AR_FLAGS = rc
noinst_DATA += stmp-targ-include
-if USE_LIBTOOL
-toollib_LTLIBRARIES = libm.la \
- libc.la
-else
toollib_LIBRARIES = libm.a \
libc.a
if HAVE_MULTISUBDIR
@@ -84,7 +77,6 @@ noinst_DATA += $(BUILD_MULTISUBDIR)/$(CRT0)
endif
noinst_DATA += $(BUILD_MULTISUBDIR)/libc.a $(BUILD_MULTISUBDIR)/libm.a
endif
-endif
toollib_DATA = $(CRT0) $(CRT1)
@@ -106,53 +98,6 @@ MATHOBJS_IN_LIBC = \
$(lpfx)s_finite.$(oext) $(lpfx)sf_finite.$(oext) \
$(lpfx)s_copysign.$(oext) $(lpfx)sf_copysign.$(oext)
-LIBC_OBJECTLISTS = \
- $(POSIX_OBJECTLIST) \
- $(SIGNAL_OBJECTLIST) \
- $(SYSCALL_OBJECTLIST) \
- $(UNIX_OBJECTLIST) \
- $(STDIO64_OBJECTLIST) \
- libc/argz/objectlist.awk.in \
- libc/stdlib/objectlist.awk.in \
- libc/time/objectlist.awk.in \
- libc/ctype/objectlist.awk.in \
- libc/search/objectlist.awk.in \
- libc/string/objectlist.awk.in \
- libc/locale/objectlist.awk.in \
- libc/misc/objectlist.awk.in \
- libc/reent/objectlist.awk.in \
- libc/errno/objectlist.awk.in \
- libc/stdio/objectlist.awk.in \
- $(MACHINE_OBJECTLIST) \
- $(SYS_OBJECTLIST) \
- $(SYS_MACH_OBJECTLIST)
-
-LIBM_OBJECTLISTS = \
- libm/$(MATHDIR)/objectlist.awk.in \
- libm/common/objectlist.awk.in \
- $(LIBM_MACHINE_OBJECTLIST)
-
-libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libm-libtool-objectlist
-
-libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libc-libtool-objectlist
-
-if USE_LIBTOOL
-libm_la_SOURCES =
-libm_la_DEPENDENCIES = libm-libtool-objectlist
-
-# objects listed later in LIBM_OBJECTLISTS will override those listed earlier
-libm-libtool-objectlist: $(LIBM_OBJECTLISTS)
- cat $(LIBM_OBJECTLISTS) | $(AWK) '{ libm[$$1] = $$2 }; END { for (x in libm) printf ("%s\n", libm[x]) }' > $@
-
-libc_la_SOURCES =
-libc_la_DEPENDENCIES = libc-libtool-objectlist
-
-# objects listed later in LIBM_OBJECTLISTS and LIBC_OBJECTLISTS will override those listed earlier
-libc-libtool-objectlist: $(LIBM_OBJECTLISTS) $(LIBC_OBJECTLISTS)
- cat $(LIBM_OBJECTLISTS) $(LIBC_OBJECTLISTS) | $(AWK) '{ libc[$$1] = $$2 }; END { for (x in libc) printf ("%s\n", libc[x]) }' > $@
-
-else
-
libc.a: libc/libc.a libm.a
rm -rf libc.a libg.a tmp
mkdir tmp
@@ -172,8 +117,6 @@ libm.a: libm/libm.a
libm/libm.a: ; @true
-endif # USE_LIBTOOL
-
if HAVE_MULTISUBDIR
$(BUILD_MULTISUBDIR):
$(MKDIR_P) $@
@@ -310,11 +253,8 @@ CLEANFILES = stmp-targ-include
## only data targets. If that ever changes, this should be removed and the
## install-exec-local in ../multilib.am will kick in.
install-data-local: install-toollibLIBRARIES install-multi
-if USE_LIBTOOL
-else
rm -f $(DESTDIR)$(toollibdir)/libg.a
ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
-endif
-if [ -z "$(MULTISUBDIR)" ]; then \
$(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
for i in $(srcdir)/libc/include/*.h; do \
diff --git a/newlib/Makefile.shared b/newlib/Makefile.shared
deleted file mode 100644
index 00ea8533581c..000000000000
--- a/newlib/Makefile.shared
+++ /dev/null
@@ -1,6 +0,0 @@
-objectlist.awk.in: $(noinst_LTLIBRARIES)
- -rm -f objectlist.awk.in
- for i in `ls *.lo` ; \
- do \
- echo $$i `pwd`/$$i >> objectlist.awk.in ; \
- done
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 888d417943e3..8ce3ee87e912 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -223,8 +223,6 @@ AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
# Emit any target-specific warnings.
if test "x${newlib_msg_warn}" != "x"; then
AC_MSG_WARN([${newlib_msg_warn}])
diff --git a/newlib/configure.ac b/newlib/configure.ac
index 0ae3e4bb28a5..95a6c50dc36a 100644
--- a/newlib/configure.ac
+++ b/newlib/configure.ac
@@ -288,15 +288,6 @@ AC_ARG_ENABLE(newlib-use-gdtoa,
AM_ENABLE_MULTILIB(, ..)
NEWLIB_CONFIGURE(.)
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-_LT_DECL_SED
-_LT_PROG_ECHO_BACKSLASH
-if test "${use_libtool}" = "yes"; then
-LT_INIT([win32-dll])
-fi
-
dnl The following is being disabled because the mathfp library is
dnl not up to standard due to inaccuracies caused by some of the
dnl floating-point algorithms used. If you wish to work on this,
@@ -365,51 +356,6 @@ fi
AC_SUBST(CRT1)
AC_SUBST(CRT1_DIR)
-if test -n "${libm_machine_dir}"; then
- LIBM_MACHINE_OBJECTLIST=libm/machine/${libm_machine_dir}/objectlist.awk.in
-fi
-AC_SUBST(LIBM_MACHINE_OBJECTLIST)
-
-if test -n "${machine_dir}"; then
- MACHINE_OBJECTLIST=libc/machine/${machine_dir}/objectlist.awk.in
-fi
-AC_SUBST(MACHINE_OBJECTLIST)
-
-if test -n "${sys_dir}"; then
- SYS_OBJECTLIST=libc/sys/${sys_dir}/objectlist.awk.in
-fi
-AC_SUBST(SYS_OBJECTLIST)
-
-if test "${have_sys_mach_dir}" = "yes"; then
- SYS_MACH_OBJECTLIST=libc/sys/${sys_dir}/machine/${machine_dir}/objectlist.awk.in
-fi
-AC_SUBST(SYS_MACH_OBJECTLIST)
-
-if test -n "${posix_dir}"; then
- POSIX_OBJECTLIST=libc/${posix_dir}/objectlist.awk.in
-fi
-AC_SUBST(POSIX_OBJECTLIST)
-
-if test -n "${signal_dir}"; then
- SIGNAL_OBJECTLIST=libc/${signal_dir}/objectlist.awk.in
-fi
-AC_SUBST(SIGNAL_OBJECTLIST)
-
-if test -n "${syscall_dir}"; then
- SYSCALL_OBJECTLIST=libc/${syscall_dir}/objectlist.awk.in
-fi
-AC_SUBST(SYSCALL_OBJECTLIST)
-
-if test -n "${unix_dir}"; then
- UNIX_OBJECTLIST=libc/${unix_dir}/objectlist.awk.in
-fi
-AC_SUBST(UNIX_OBJECTLIST)
-
-if test -n "${stdio64_dir}"; then
- STDIO64_OBJECTLIST=libc/${stdio64_dir}/objectlist.awk.in
-fi
-AC_SUBST(STDIO64_OBJECTLIST)
-
# Put a plausible default for CC_FOR_BUILD in Makefile.
if test -z "$CC_FOR_BUILD"; then
if test "x$cross_compiling" = "xno"; then
diff --git a/newlib/configure.host b/newlib/configure.host
index 4eae14063462..1507e25d8d74 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -43,7 +43,6 @@
# stdio64_dir "stdio64" to build libc/stdio64, "" otherwise
# syscall_dir "syscalls" to build libc/syscalls, "" otherwise
# unix_dir "unix" to build libc/unix, "" otherwise
-# use_libtool flag: use libtool to build newlib?
# aext library extension - needed for libtool support
# oext object file extension - needed for libtool support
# lpfx library object prefix - generated when no libtool
@@ -72,8 +71,6 @@ crt1=
crt1_dir=
have_crt0=
have_init_fini=yes
-use_libtool=no
-have_sys_mach_dir=no
default_newlib_io_c99_formats=no
default_newlib_io_long_long=no
default_newlib_io_long_double=no
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 7e41b9145d5a..005e41bc9f00 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -53,30 +53,6 @@ SUBDIRS += .
noinst_DATA = $(CRT0)
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libc.la
-SUBLIBS = \
- argz/libargz.$(aext) \
- stdlib/libstdlib.$(aext) \
- ctype/libctype.$(aext) \
- search/libsearch.$(aext) \
- $(LIBC_STDIO_LIB) \
- $(LIBC_STDIO64_LIB) \
- $(LIBC_XDR_LIB) \
- string/libstring.$(aext) \
- $(LIBC_SIGNAL_LIB) \
- time/libtime.$(aext) \
- locale/liblocale.$(aext) \
- reent/libreent.$(aext) \
- errno/liberrno.$(aext) \
- misc/libmisc.$(aext) \
- ssp/libssp.$(aext) \
- $(LIBC_UNIX_LIB) \
- $(LIBC_POSIX_LIB) \
- $(LIBC_SYSCALL_LIB) \
- $(LIBC_MACHINE_LIB) \
- $(LIBC_SYS_LIB)
-else
noinst_LIBRARIES = libc.a
SUBLIBS = \
argz/lib.$(aext) \
@@ -100,15 +76,7 @@ SUBLIBS = \
$(NEWLIB_ICONV_LIBS) \
$(LIBC_MACHINE_LIB) \
$(LIBC_SYS_LIB)
-endif
-
-libc_la_LDFLAGS = -Xcompiler -nostdlib
-if USE_LIBTOOL
-libc_la_SOURCES =
-libc_la_LIBADD = $(SUBLIBS)
-libc_la_DEPENDENCIES = $(SUBLIBS)
-else
libc.a: $(SUBLIBS)
rm -f $@
rm -rf tmp
@@ -120,7 +88,6 @@ libc.a: $(SUBLIBS)
$(AR) $(AR_FLAGS) ../$@ *.o
$(RANLIB) $@
rm -rf tmp
-endif # USE_LIBTOOL
$(SUBLIBS): ; @true
diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am
index a8351b8e20e4..7c1c1ba810bf 100644
--- a/newlib/libc/argz/Makefile.am
+++ b/newlib/libc/argz/Makefile.am
@@ -28,17 +28,6 @@ ELIX_SOURCES = \
envz_strip.c
endif
-libargz_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libargz.la
-libargz_la_SOURCES = dummy.c $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = dummy.c $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 14b6aa466cd3..06a58d3e1fff 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -51,15 +51,6 @@ AC_PROG_CPP
AM_CONDITIONAL(NEWLIB_NANO_MALLOC, test x$newlib_nano_malloc = xyes)
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-_LT_DECL_SED
-_LT_PROG_ECHO_BACKSLASH
-if test "${use_libtool}" = "yes"; then
-LT_INIT([win32-dll])
-fi
-
CRT0=
if test "x${have_crt0}" = "xyes"; then
CRT0=sys/${sys_dir}/crt0.o
@@ -72,77 +63,49 @@ dnl build the library.
LIBC_SIGNAL_LIB=
if test -n "${signal_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_SIGNAL_LIB=${signal_dir}/lib${signal_dir}.${aext}
- else
- LIBC_SIGNAL_LIB=${signal_dir}/lib.${aext}
- fi
+ LIBC_SIGNAL_LIB=${signal_dir}/lib.${aext}
fi
AC_SUBST(LIBC_SIGNAL_LIB)
AM_CONDITIONAL(HAVE_SIGNAL_DIR, test x${signal_dir} != x)
LIBC_STDIO_LIB=
if test -n "${stdio_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_STDIO_LIB=${stdio_dir}/lib${stdio_dir}.${aext}
- else
- LIBC_STDIO_LIB=${stdio_dir}/lib.${aext}
- fi
+ LIBC_STDIO_LIB=${stdio_dir}/lib.${aext}
fi
AC_SUBST(LIBC_STDIO_LIB)
AM_CONDITIONAL(HAVE_STDIO_DIR, test x${stdio_dir} != x)
LIBC_STDIO64_LIB=
if test -n "${stdio64_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_STDIO64_LIB=${stdio64_dir}/lib${stdio64_dir}.${aext}
- else
- LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext}
- fi
+ LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext}
fi
AC_SUBST(LIBC_STDIO64_LIB)
AM_CONDITIONAL(HAVE_STDIO64_DIR, test x${stdio64_dir} != x)
LIBC_POSIX_LIB=
if test -n "${posix_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext}
- else
- LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
- fi
+ LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
fi
AC_SUBST(LIBC_POSIX_LIB)
AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x)
LIBC_XDR_LIB=
if test -n "${xdr_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_XDR_LIB=${xdr_dir}/lib${xdr_dir}.${aext}
- else
- LIBC_XDR_LIB=${xdr_dir}/lib.${aext}
- fi
+ LIBC_XDR_LIB=${xdr_dir}/lib.${aext}
fi
AC_SUBST(LIBC_XDR_LIB)
AM_CONDITIONAL(HAVE_XDR_DIR, test x${xdr_dir} != x)
LIBC_SYSCALL_LIB=
if test -n "${syscall_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_SYSCALL_LIB=${syscall_dir}/lib${syscall_dir}.${aext}
- else
- LIBC_SYSCALL_LIB=${syscall_dir}/lib.${aext}
- fi
+ LIBC_SYSCALL_LIB=${syscall_dir}/lib.${aext}
fi
AC_SUBST(LIBC_SYSCALL_LIB)
AM_CONDITIONAL(HAVE_SYSCALL_DIR, test x${syscall_dir} != x)
LIBC_UNIX_LIB=
if test -n "${unix_dir}"; then
- if test "${use_libtool}" = "yes"; then
- LIBC_UNIX_LIB=${unix_dir}/lib${unix_dir}.${aext}
- else
- LIBC_UNIX_LIB=${unix_dir}/lib.${aext}
- fi
+ LIBC_UNIX_LIB=${unix_dir}/lib.${aext}
fi
AC_SUBST(LIBC_UNIX_LIB)
AM_CONDITIONAL(HAVE_UNIX_DIR, test x${unix_dir} != x)
@@ -185,11 +148,7 @@ if test -n "${sys_dir}"; then
esac
SYS_DIR=sys/${sys_dir}
- if test "${use_libtool}" = "yes"; then
- LIBC_SYS_LIB=${SYS_DIR}/lib${sys_dir}.${aext}
- else
- LIBC_SYS_LIB=${SYS_DIR}/lib.${aext}
- fi
+ LIBC_SYS_LIB=${SYS_DIR}/lib.${aext}
fi
AC_SUBST(SYS_DIR)
AM_CONDITIONAL(HAVE_SYS_DIR, test x${sys_dir} != x)
@@ -275,11 +234,7 @@ if test -n "${machine_dir}"; then
esac
LIBC_MACHINE_DIR=machine/${machine_dir}
- if test "${use_libtool}" = "yes"; then
- LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib${machine_dir}.${aext}
- else
- LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib.${aext}
- fi
+ LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib.${aext}
fi
AM_CONDITIONAL(HAVE_LIBC_MACHINE_DIR, test "x${LIBC_MACHINE_DIR}" != x)
AC_SUBST(LIBC_MACHINE_DIR)
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 4c4c36db1520..c7bdf2d7446b 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -80,19 +80,8 @@ ELIX_SOURCES = \
wctype_l.c
endif
-libctype_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libctype.la
-libctype_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
$(lpfx)ctype_.$(oext): ctype_.c ctype_iso.h ctype_cp.h
diff --git a/newlib/libc/errno/Makefile.am b/newlib/libc/errno/Makefile.am
index 3470abd0bc1c..edb21e8633d7 100644
--- a/newlib/libc/errno/Makefile.am
+++ b/newlib/libc/errno/Makefile.am
@@ -4,17 +4,6 @@ AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = errno.c
-liberrno_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = liberrno.la
-liberrno_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am
index d9c0d4077b4b..411c233ccde2 100644
--- a/newlib/libc/iconv/Makefile.am
+++ b/newlib/libc/iconv/Makefile.am
@@ -5,5 +5,3 @@ cctdir=$(datadir)/iconv_data
cct_DATA=encoding.aliases
AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index 071b75b8ef4f..3dfa9cbe88a0 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -44,5 +44,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
SUBDIRS=binary
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.am b/newlib/libc/iconv/ccs/binary/Makefile.am
index ebaad06bbe90..24656c3aabd8 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.am
+++ b/newlib/libc/iconv/ccs/binary/Makefile.am
@@ -17,6 +17,4 @@ cp775.cct cp850.cct cp852.cct cp855.cct cp866.cct \
jis_x0212_1990.cct jis_x0201_1976.cct jis_x0208_1990.cct ksx1001.cct \
cns11643_plane1.cct cns11643_plane2.cct cns11643_plane14.cct
-include $(srcdir)/../../../../Makefile.shared
-
info:
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
index 9f129c9978b8..632550be82c4 100644
--- a/newlib/libc/iconv/ces/Makefile.am
+++ b/newlib/libc/iconv/ces/Makefile.am
@@ -36,6 +36,3 @@ endif
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
index 0114b2aa3e96..6d9fc835439d 100644
--- a/newlib/libc/iconv/lib/Makefile.am
+++ b/newlib/libc/iconv/lib/Makefile.am
@@ -27,6 +27,3 @@ endif
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am
index c060496cfcdb..5972d1a9e64f 100644
--- a/newlib/libc/locale/Makefile.am
+++ b/newlib/libc/locale/Makefile.am
@@ -21,17 +21,6 @@ ELIX_SOURCES = \
uselocale.c
endif
-liblocale_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = liblocale.la
-liblocale_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 311d1b9f50a0..d4c734179209 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -14,20 +14,9 @@ LIB_SOURCES = \
memchr.S memcmp.S memcpy.S memset.S strchr.S \
memmove.S strlen.S i386mach.h
-libi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libi386.la
-libi386_la_SOURCES = $(LIB_SOURCES) $(ADDED_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES) $(ADDED_SOURCES)
## These flag settings are basically redundant, but necessary to workaround the
## automake limitation "Objects 'created with both libtool and without'".
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am
index f8f8bb15a548..d4d70a92654d 100644
--- a/newlib/libc/misc/Makefile.am
+++ b/newlib/libc/misc/Makefile.am
@@ -9,17 +9,6 @@ LIB_SOURCES += \
lock.c
endif
-libmisc_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libmisc.la
-libmisc_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am
index 4f4c12d8a3e8..bbf0a1c2d9a1 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -34,19 +34,8 @@ endif
endif
endif
-libposix_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libposix.la
-libposix_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
AM_CFLAGS = -D_GNU_SOURCE
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index bf0c8d7f6a17..10fc47393864 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -46,19 +46,8 @@ GENERAL_SOURCES = \
unlinkr.c \
writer.c
-libreent_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libreent.la
-libreent_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
$(lpfx)impure.$(oext): $(srcdir)/impure.c $(srcdir)/../include/sys/reent.h
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am
index c64f28931171..259af432c974 100644
--- a/newlib/libc/search/Makefile.am
+++ b/newlib/libc/search/Makefile.am
@@ -48,17 +48,6 @@ endif !ELIX_LEVEL_3
endif !ELIX_LEVEL_2
endif !ELIX_LEVEL_1
-libsearch_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libsearch.la
-libsearch_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am
index d631662beda1..53b3bd5b0f04 100644
--- a/newlib/libc/signal/Makefile.am
+++ b/newlib/libc/signal/Makefile.am
@@ -4,17 +4,6 @@ AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = psignal.c raise.c signal.c sig2str.c
-libsignal_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libsignal.la
-libsignal_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/ssp/Makefile.am b/newlib/libc/ssp/Makefile.am
index 2ff5fa0bf924..7814cd98c3b8 100644
--- a/newlib/libc/ssp/Makefile.am
+++ b/newlib/libc/ssp/Makefile.am
@@ -48,17 +48,6 @@ endif
endif
endif
-libssp_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libssp.la
-libssp_la_SOURCES = $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index f1fd89f364c8..40c0d89e8a04 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -220,26 +220,12 @@ LIBADD_OBJS = \
%D%/$(lpfx)vfiwscanf.$(oext) $(lpfx)vfwscanf.$(oext)
endif
-libstdio_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstdio.la
-libstdio_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
-libstdio_la_LIBADD = $(LIBADD_OBJS)
-libstdio_la_DEPENDENCIES = $(LIBADD_OBJS)
-LIB_COMPILE = $(AM_V_CC)$(LTCOMPILE)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
lib_a_LIBADD = $(LIBADD_OBJS)
lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_DEPENDENCIES = $(LIBADD_OBJS)
LIB_COMPILE = $(AM_V_CC)$(COMPILE)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# Though small footprint nano-formatted-IO implementation is used
# when NEWLIB_NANO_FORMATTED_IO is enabled, we keep all rules for
diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am
index 3d479d7faf26..c3522dd7db00 100644
--- a/newlib/libc/stdio64/Makefile.am
+++ b/newlib/libc/stdio64/Makefile.am
@@ -21,21 +21,9 @@ ELIX_SOURCES = \
tmpfile64.c
endif
-libstdio64_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstdio64.la
-libstdio64_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-LIB_COMPILE = $(AM_V_CC)$(LTCOMPILE)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
LIB_COMPILE = $(AM_V_CC)$(COMPILE)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
AM_CFLAGS = -I $(srcdir)/../stdio
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 75fb52f50d7e..9e2e42e65e25 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -201,26 +201,12 @@ LIBADD_OBJS = $(lpfx)$(FREER).$(oext) $(lpfx)$(REALLOCR).$(oext) \
$(lpfx)$(MALLINFOR).$(oext) $(lpfx)$(MALLSTATSR).$(oext) \
$(lpfx)$(MSIZER).$(oext) $(lpfx)$(MALLOCR).$(oext)
-libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstdlib.la
-libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES) $(ELIX_SOURCES)
-libstdlib_la_LIBADD = $(LIBADD_OBJS) $(ELIX_OBJS)
-libstdlib_la_DEPENDENCIES = $(LIBADD_OBJS) $(ELIX_OBJS)
-LIB_COMPILE = $(AM_V_CC)$(LTCOMPILE)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES) $(ELIX_SOURCES)
lib_a_LIBADD = $(LIBADD_OBJS) $(ELIX_OBJS)
lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(ELIX_OBJS)
LIB_COMPILE = $(AM_V_CC)$(COMPILE)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
MALLOC_COMPILE = $(LIB_COMPILE) -DINTERNAL_NEWLIB
diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index ac41665bb2dc..b35d076cf621 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -129,17 +129,6 @@ endif !ELIX_LEVEL_3
endif !ELIX_LEVEL_2
endif !ELIX_LEVEL_1
-libstring_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstring.la
-libstring_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am
index ada372a7aa1c..605db04fb095 100644
--- a/newlib/libc/syscalls/Makefile.am
+++ b/newlib/libc/syscalls/Makefile.am
@@ -35,17 +35,6 @@ ELIX_SOURCES = \
endif
endif
-libsyscalls_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libsyscalls.la
-libsyscalls_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index a2a807917e76..2f3fd49eec9e 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -26,20 +26,8 @@ LIB_SOURCES = \
tzvars.c \
wcsftime.c
-libtime_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libtime.la
-libtime_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-# This rule is needed so that wcsftime.o is rebuilt when strftime.c changes.
-include $(srcdir)/../../Makefile.shared
$(lpfx)wcsftime.$(oext): strftime.c
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index a74738d74ca0..95115e2d0945 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -35,17 +35,6 @@ endif
endif
endif
-libunix_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libunix.la
-libunix_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/xdr/Makefile.am b/newlib/libc/xdr/Makefile.am
index 8f4ac7d04a33..3bb41a1d1055 100644
--- a/newlib/libc/xdr/Makefile.am
+++ b/newlib/libc/xdr/Makefile.am
@@ -43,17 +43,6 @@ endif
EXTRA_DIST = README $(EXTRA_SRC)
-libxdr_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libxdr.la
-libxdr_la_SOURCES = dummy.c $(ELIX_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = dummy.c $(ELIX_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 6ea7ec04fb19..0399bcdbed5e 100644
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -11,14 +11,6 @@ if HAVE_LIBM_MACHINE_DIR
SUBDIRS += $(LIBM_MACHINE_DIR)
endif
-libm_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-SUBLIBS = $(MATHDIR)/lib$(MATHDIR).$(aext) common/libcommon.$(aext) complex/libcomplex.$(aext) fenv/libfenv.$(aext) $(LIBM_MACHINE_LIB)
-noinst_LTLIBRARIES = libm.la
-libm_la_SOURCES =
-libm_la_LIBADD = $(SUBLIBS)
-else
SUBLIBS = $(MATHDIR)/lib.$(aext) common/lib.$(aext) complex/lib.$(aext) fenv/lib.$(aext) $(LIBM_MACHINE_LIB)
noinst_LIBRARIES = libm.a
libm.a: $(SUBLIBS)
@@ -32,7 +24,6 @@ libm.a: $(SUBLIBS)
$(AR) $(AR_FLAGS) ../$@ *.o
$(RANLIB) $@
rm -rf tmp
-endif
$(SUBLIBS):
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index 325f4717d736..5000406fe350 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -37,27 +37,14 @@ lsrc = atanl.c cosl.c sinl.c tanl.c tanhl.c frexpl.c modfl.c ceill.c fabsl.c \
logbl.c nexttowardf.c nexttoward.c nexttowardl.c log2l.c \
sl_finite.c
-libcommon_la_LDFLAGS = -Xcompiler -nostdlib
lib_a_CFLAGS = -fbuiltin -fno-math-errno
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = $(src) $(fsrc)
-if HAVE_LONG_DOUBLE
-libcommon_la_SOURCES += $(lsrc)
-endif # HAVE_LONG_DOUBLE
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(src) $(fsrc)
if HAVE_LONG_DOUBLE
lib_a_SOURCES += $(lsrc)
endif # HAVE_LONG_DOUBLE
lib_a_CFLAGS += $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# A partial dependency list.
diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am
index aceb55e9fc7b..a92990e3edbd 100644
--- a/newlib/libm/complex/Makefile.am
+++ b/newlib/libm/complex/Makefile.am
@@ -20,20 +20,9 @@ fsrc = cabsf.c casinf.c ccosf.c cimagf.c cprojf.c \
cephes_subrf.c conjf.c csinf.c ctanhf.c \
cargf.c catanhf.c cexpf.c cpowf.c csinhf.c
-libcomplex_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libcomplex.la
-libcomplex_la_SOURCES = $(src) $(fsrc) $(lsrc)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(src) $(fsrc) $(lsrc)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# A partial dependency list.
diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index a03ea3872bd5..7b4add03f3af 100644
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -20,15 +20,6 @@ AC_NO_EXECUTABLES
NEWLIB_CONFIGURE(..)
AC_PROG_CPP
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-_LT_DECL_SED
-_LT_PROG_ECHO_BACKSLASH
-if test "${use_libtool}" = "yes"; then
-LT_INIT([win32-dll])
-fi
-
AC_TYPE_LONG_DOUBLE
AM_CONDITIONAL(HAVE_LONG_DOUBLE, test x"$ac_cv_type_long_double" = x"yes")
@@ -53,12 +44,8 @@ if test -n "${libm_machine_dir}"; then
*) AC_MSG_ERROR([unsupported libm_machine_dir "${libm_machine_dir}"]) ;;
esac
- LIBM_MACHINE_DIR=machine/${libm_machine_dir}
- if test "${use_libtool}" = "yes"; then
- LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
- else
- LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
- fi
+ LIBM_MACHINE_DIR=machine/${libm_machine_dir
+ LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
fi
AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
AC_SUBST(LIBM_MACHINE_DIR)
diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am
index d515192c0b36..50b59004c17e 100644
--- a/newlib/libm/fenv/Makefile.am
+++ b/newlib/libm/fenv/Makefile.am
@@ -6,21 +6,11 @@ src = feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
fegetround.c feholdexcept.c feraiseexcept.c fesetenv.c \
fesetexceptflag.c fesetround.c fetestexcept.c feupdateenv.c
-libcommon_la_LDFLAGS = -Xcompiler -nostdlib
lib_a_CFLAGS = -fbuiltin -fno-math-errno
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = $(src)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(src)
lib_a_CFLAGS += $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# A partial dependency list.
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am
index 7679f89ff9e5..6310f72b680d 100644
--- a/newlib/libm/machine/aarch64/Makefile.am
+++ b/newlib/libm/machine/aarch64/Makefile.am
@@ -50,6 +50,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index 01ebac9f63f0..f8a542bb3599 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -40,6 +40,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index a5e95fe4d720..d5caa4577d2a 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -15,18 +15,7 @@ LIB_SOURCES = \
fegetround.c feholdexcept.c feraiseexcept.c fesetenv.c \
fesetexceptflag.c fesetround.c fetestexcept.c feupdateenv.c
-libi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libi386.la
-libi386_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am
index d1c1edc7c942..07c2f424e5d0 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -11,9 +11,6 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
LIBADD_OBJS = \
lib_a-fenv.$(OBJEXT)
diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am
index 6e63d1aa8a36..57cfa7ee8513 100644
--- a/newlib/libm/machine/nds32/Makefile.am
+++ b/newlib/libm/machine/nds32/Makefile.am
@@ -19,6 +19,3 @@ LIB_SOURCES = $(GPR_SOURCES) $(FPU_SP_SOURCES) $(FPU_DP_SOURCES)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/powerpc/Makefile.am b/newlib/libm/machine/powerpc/Makefile.am
index 6d5571ed8b67..020a3ac7aeec 100644
--- a/newlib/libm/machine/powerpc/Makefile.am
+++ b/newlib/libm/machine/powerpc/Makefile.am
@@ -11,6 +11,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/pru/Makefile.am b/newlib/libm/machine/pru/Makefile.am
index f7e329899f5f..6e055a34b972 100644
--- a/newlib/libm/machine/pru/Makefile.am
+++ b/newlib/libm/machine/pru/Makefile.am
@@ -10,6 +10,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/riscv/Makefile.am b/newlib/libm/machine/riscv/Makefile.am
index 7a9e559eef79..0e23cd615f82 100644
--- a/newlib/libm/machine/riscv/Makefile.am
+++ b/newlib/libm/machine/riscv/Makefile.am
@@ -23,6 +23,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/sparc/Makefile.am b/newlib/libm/machine/sparc/Makefile.am
index e065fd0195c3..c0e6c510c4ce 100644
--- a/newlib/libm/machine/sparc/Makefile.am
+++ b/newlib/libm/machine/sparc/Makefile.am
@@ -12,6 +12,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am
index e5e630deea03..87be8d429576 100644
--- a/newlib/libm/machine/spu/Makefile.am
+++ b/newlib/libm/machine/spu/Makefile.am
@@ -30,6 +30,3 @@ LIB_SOURCES = \
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/machine/x86_64/Makefile.am b/newlib/libm/machine/x86_64/Makefile.am
index 58a62fbb623a..9fc16c247f1c 100644
--- a/newlib/libm/machine/x86_64/Makefile.am
+++ b/newlib/libm/machine/x86_64/Makefile.am
@@ -8,17 +8,6 @@ LIB_SOURCES = \
feholdexcept.c fenv.c feraiseexcept.c fesetenv.c fesetexceptflag.c \
fesetround.c fetestexcept.c feupdateenv.c
-libx86_64_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libx86_64.la
-libx86_64_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index 3402090aaecb..c755d464e72e 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -51,20 +51,9 @@ fsrc = kf_rem_pio2.c \
lsrc = el_hypot.c
-libmath_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libmath.la
-libmath_la_SOURCES = $(src) $(fsrc) $(lsrc)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(src) $(fsrc) $(lsrc)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# A partial dependency list.
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index 3f4bd75d32df..ada632326997 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -41,20 +41,9 @@ fsrc = sf_ceil.c \
ef_scalb.c sf_signif.c \
sf_exp2.c sf_tgamma.c
-libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libmathfp.la
-libmathfp_la_SOURCES = $(src) $(fsrc)
-noinst_DATA = objectlist.awk.in
-else
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(src) $(fsrc)
lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
# A partial dependency list.
diff --git a/newlib/newlib.hin b/newlib/newlib.hin
index feeb409bbeaf..b52bc7460693 100644
--- a/newlib/newlib.hin
+++ b/newlib/newlib.hin
@@ -8,43 +8,9 @@
/* Newlib version */
#include <_newlib_version.h>
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
/* Define to 1 if the system has the type `long double'. */
#undef HAVE_LONG_DOUBLE
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -63,9 +29,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
/* If atexit() may dynamically allocate space for cleanup functions. */
#undef _ATEXIT_DYNAMIC_ALLOC
--
2.34.1
More information about the Newlib
mailing list