From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id B3EEF3858C60 for ; Fri, 21 Jan 2022 12:06:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3EEF3858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 534E234349A; Fri, 21 Jan 2022 12:06:42 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] newlib: punt unused LIBC_EXTRA_LIB settings Date: Fri, 21 Jan 2022 07:05:57 -0500 Message-Id: <20220121120557.22761-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2022 12:06:46 -0000 This was added decades ago, but the commit message lacks any explanation, and it was unused when it was merged. It's still unused today. So punt it all. --- newlib/libc/Makefile.am | 26 ++++---------- newlib/libc/Makefile.in | 44 +++++++----------------- newlib/libc/argz/Makefile.in | 3 -- newlib/libc/configure | 15 ++------ newlib/libc/configure.ac | 8 ----- newlib/libc/ctype/Makefile.in | 3 -- newlib/libc/errno/Makefile.in | 3 -- newlib/libc/iconv/Makefile.in | 3 -- newlib/libc/iconv/ccs/Makefile.in | 3 -- newlib/libc/iconv/ccs/binary/Makefile.in | 3 -- newlib/libc/iconv/ces/Makefile.in | 3 -- newlib/libc/iconv/lib/Makefile.in | 3 -- newlib/libc/libc.texi | 1 - newlib/libc/locale/Makefile.in | 3 -- newlib/libc/misc/Makefile.in | 3 -- newlib/libc/posix/Makefile.in | 3 -- newlib/libc/reent/Makefile.in | 3 -- newlib/libc/search/Makefile.in | 3 -- newlib/libc/signal/Makefile.in | 3 -- newlib/libc/ssp/Makefile.in | 3 -- newlib/libc/stdio/Makefile.in | 3 -- newlib/libc/stdio64/Makefile.in | 3 -- newlib/libc/stdlib/Makefile.in | 3 -- newlib/libc/string/Makefile.in | 3 -- newlib/libc/syscalls/Makefile.in | 3 -- newlib/libc/time/Makefile.in | 3 -- newlib/libc/unix/Makefile.in | 3 -- newlib/libc/xdr/Makefile.in | 3 -- 28 files changed, 21 insertions(+), 142 deletions(-) diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index d1540c8ef9c0..cdeaf84c4e21 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -39,7 +39,7 @@ endif # The order of SUBDIRS is important for the integrated documentation. # Do not change the order without considering the doc impact. SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \ - $(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \ + errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \ $(XDR_SUBDIR) ssp . noinst_DATA = $(CRT0) @@ -59,7 +59,6 @@ SUBLIBS = \ time/libtime.$(aext) \ locale/liblocale.$(aext) \ reent/libreent.$(aext) \ - $(LIBC_EXTRA_LIB) \ errno/liberrno.$(aext) \ misc/libmisc.$(aext) \ ssp/libssp.$(aext) \ @@ -83,7 +82,6 @@ SUBLIBS = \ time/lib.$(aext) \ locale/lib.$(aext) \ reent/lib.$(aext) \ - $(LIBC_EXTRA_LIB) \ errno/lib.$(aext) \ misc/lib.$(aext) \ ssp/lib.$(aext) \ @@ -139,16 +137,15 @@ SUBDEFS = \ time/stmp-def \ locale/stmp-def \ reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ misc/stmp-def # ditto for stmp-xml files in each subdirectory which builds .xml files SUBXMLS = $(SUBDEFS:stmp-def=stmp-xml) -libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ +libc.info: sigset.texi stdio64.texi posix.texi iconvset.texi \ targetdep.tex $(SUBDEFS) -libc.dvi: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ +libc.dvi: sigset.texi stdio64.texi posix.texi iconvset.texi \ targetdep.tex $(SUBDEFS) stmp-sigset: config.status @@ -173,17 +170,6 @@ stmp-iconvset: config.status iconvset.texi: stmp-iconvset ; @true -stmp-extra: config.status - if test -n "$(LIBC_EXTRA_LIB)"; then \ - echo "@set EXTRA" >tmp-extra.texi; \ - else \ - echo "@clear EXTRA" >tmp-extra.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp-extra.texi extra.texi - touch $@ - -extra.texi: stmp-extra ; @true - stmp-stdio64: config.status if test -n "$(LIBC_STDIO64_LIB)"; then \ echo "@set STDIO64" >tmp-stdio64.texi; \ @@ -224,7 +210,7 @@ $(SUBDEFS): stmp-targetdep ; @true TEXINFO_TEX = ../../texinfo/texinfo.tex info_TEXINFOS = libc.texi -libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \ +libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \ targetdep.tex $(SUBDEFS) docbook-recursive: force @@ -248,9 +234,9 @@ install-man: man force: CLEANFILES = $(CRT0) \ - sigset.texi stmp-sigset extra.texi stmp-extra \ + sigset.texi stmp-sigset \ stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ - tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \ + tmp-sigset.texi tmp-iconvset.texi \ tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi \ *.xml *.3 diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac index 29a839623f6f..4f7948fb87fc 100644 --- a/newlib/libc/configure.ac +++ b/newlib/libc/configure.ac @@ -162,14 +162,6 @@ fi AC_SUBST(LIBC_UNIX_LIB) AM_CONDITIONAL(HAVE_UNIX_DIR, test x${unix_dir} != x) -LIBC_EXTRA_LIB= -LIBC_EXTRA_DEF= -extra_dir= - -AC_SUBST(LIBC_EXTRA_LIB) -AC_SUBST(LIBC_EXTRA_DEF) -AC_SUBST(extra_dir) - dnl We always recur into sys and machine, and let them decide what to dnl do. However, we do need to know whether they will produce a library. diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in index add0dab2e2f5..a6bd94360c77 100644 --- a/newlib/libc/iconv/ccs/binary/Makefile.in +++ b/newlib/libc/iconv/ccs/binary/Makefile.in @@ -192,8 +192,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@ -LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@ LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@ LIBC_POSIX_DEF = @LIBC_POSIX_DEF@ LIBC_POSIX_LIB = @LIBC_POSIX_LIB@ @@ -264,7 +262,6 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -extra_dir = @extra_dir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/newlib/libc/libc.texi b/newlib/libc/libc.texi index f8c820baf0ef..0cab22036dee 100644 --- a/newlib/libc/libc.texi +++ b/newlib/libc/libc.texi @@ -138,7 +138,6 @@ into another language, under the above conditions for modified versions. @c switch to set SIGNALS on or off, according to whether config picks up @c signal subdirectory: @include sigset.texi -@include extra.texi @include posix.texi @include stdio64.texi @include iconvset.texi -- 2.34.1