From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by sourceware.org (Postfix) with ESMTPS id C87BE3858D37 for ; Sat, 26 Aug 2023 01:26:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C87BE3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-56d8bc0d909so882829eaf.3 for ; Fri, 25 Aug 2023 18:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693013193; x=1693617993; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=YRyfBUXzcOJv+J/TdRyX1Vf3yjTYNAyjJqAwoduCAkM=; b=Ar7Ruqm98C3ZTDdBC8u+x8IlBUM94ESIzOJGOWgV2cPOKW5sCe6/gSBVj0IMaJQCNW WqySkW7SSwMJUZcC956lyRZwmg2t04gA8U2tb3LVISzoK4WbGetuWXdEA2ulx8LrMD7+ JMzi7HPHEhcbxOvfuXrUDQJ4DCj4U6gnl5a1/B6Od85Q31hY4RfEg7Hu1+e54dhDOqnv TARy/eAz5j7dsd5E1tf+wyn8B9bXUwfVP0AfSGcMV4lxRurVq/Johqe0Hw/X07L1uy5s 8bjEatTQ5csyw/2jvN6FWvUb+0+dGyNc3N2oivfYe54C8DxMEvED22zzyMLQDFbG51uN 0rPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693013193; x=1693617993; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YRyfBUXzcOJv+J/TdRyX1Vf3yjTYNAyjJqAwoduCAkM=; b=DR7C3snI2bO4PPMCoxBItibtNj4G5eZkNg2aL9qAkHwCb0n6qPoEFgDDZCwafBGTDG /GIIs6L/2iqHdMCGU+bAjEOewKES+ZrOSlwg5tLPmcTB8cC1L+tYi5EO9uXwlWJzDcyg rPulGZ8dz/np428UfwkYFVUX7OStGimRxyQ4nI6u8SZSXwH/iXrqCaCGnWJScqeHOygx I1PV41w9bCW3+h32m0uYnOio2ytRuvwEVsehWmRNc+xa0AdHooHSUukQwWUP+i93mQur WiDjZaMX0VtVhlc0HPfSTN/iB5ISb5LdnnJZca2RpU/UkbIl9GkIe46Jtzk0PpHBoznN HikQ== X-Gm-Message-State: AOJu0YyVG2K92JaVC/w052nMbE2AkP4HK8T8isT6J09TlYO1UY4LIGG2 ZzW4YGapfvSAeDkk+Mu6reEe1+rZ6uzeMQ== X-Google-Smtp-Source: AGHT+IHZP4W2A483uHQJoppFP2mJx0lr0KSshOx8Q6jVGEmb8yUQXUYykhMVX/BHa4+YHOkAXFHfIw== X-Received: by 2002:a05:6358:2920:b0:134:d559:2590 with SMTP id y32-20020a056358292000b00134d5592590mr20306232rwb.14.1693013193498; Fri, 25 Aug 2023 18:26:33 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:4d61:bb19:1341:c221]) by smtp.gmail.com with ESMTPSA id v17-20020aa78091000000b00678cb337353sm2179971pff.208.2023.08.25.18.26.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 18:26:32 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 1362F1142930; Sat, 26 Aug 2023 10:56:30 +0930 (ACST) Date: Sat, 26 Aug 2023 10:56:30 +0930 From: Alan Modra To: binutils@sourceware.org Subject: ld STRINGIFY Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3033.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Delete support for old compilers that don't support string concatentation. * Makefile.am (stringify.sed): Delete rule. (GEN_DEPENDS, DISTCLEANFILES): Adjust. * configure.ac (STRINGIFY): Delete. * emultempl/beos.em: Use stringify.sed from srcdir. * emultempl/elf.em: Likewise. * emultempl/generic.em: Likewise. * emultempl/msp430.em: Likewise. * emultempl/pdp11.em: Likewise. * emultempl/pe.em: Likewise. * emultempl/pep.em: Likewise. * emultempl/stringify.sed: Renamed from.. * emultempl/astring.sed: ..this. * emultempl/ostring.sed: Delete. * Makefile.in: Regenerate. * configure: Regenerate. diff --git a/ld/Makefile.am b/ld/Makefile.am index da885b68370..49dd3b5056e 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -623,16 +623,13 @@ ldemul-list.h: Makefile ldscripts/stamp: $(AM_V_GEN)test -d $(@D) || mkdir $(@D); touch $@ -stringify.sed: ${srcdir}/emultempl/$(STRINGIFY) - $(AM_V_GEN)cp ${srcdir}/emultempl/$(STRINGIFY) stringify.sed - if AMDEP GENDEPDIR=$(DEPDIR) else GENDEPDIR= endif GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "$(GENDEPDIR)" "${LIB_PATH}" "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ -GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed ldscripts/stamp +GEN_DEPENDS = $(srcdir)/genscripts.sh ldscripts/stamp @TDIRS@ @@ -826,7 +823,7 @@ doc/ld/index.html: ld.texi $(ld_TEXINFOS) $(AM_V_GEN)$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \ --split=node -I$(srcdir) $(srcdir)/ld.texi -o doc/ld -DISTCLEANFILES = site.exp development.exp enablings.exp site.bak stringify.sed +DISTCLEANFILES = site.exp development.exp enablings.exp site.bak distclean-local: rm -rf ldscripts diff --git a/ld/configure.ac b/ld/configure.ac index 14628e5dcef..c3ebd3ec7e4 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -392,25 +392,6 @@ fi AM_ZLIB AC_ZSTD -# When converting linker scripts into strings for use in emulation -# files, use astring.sed if the compiler supports ANSI string -# concatenation, or ostring.sed otherwise. This is to support the -# broken Microsoft MSVC compiler, which limits the length of string -# constants, while still supporting pre-ANSI compilers which do not -# support string concatenation. -AC_MSG_CHECKING([whether ANSI C string concatenation works]) -AC_CACHE_VAL(ld_cv_string_concatenation, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [char *a = "a" "a";])], - ld_cv_string_concatenation=yes, - ld_cv_string_concatenation=no)]) -AC_MSG_RESULT($ld_cv_string_concatenation) -if test "$ld_cv_string_concatenation" = "yes"; then - STRINGIFY=astring.sed -else - STRINGIFY=ostring.sed -fi -AC_SUBST(STRINGIFY) - # target-specific stuff: all_targets= diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em index 521d92797ec..e597f34ae57 100644 --- a/ld/emultempl/beos.em +++ b/ld/emultempl/beos.em @@ -718,7 +718,7 @@ then # Scripts compiled in. # sed commands to quote an ld script as a C string. -sc="-f stringify.sed" +sc="-f ${srcdir}/emultempl/stringify.sed" fragment <