[Emacs-diffs] /srv/bzr/emacs/trunk r100750: Remove src/prefix-args.c.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100750
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-07 20:31:04 -0700
message:
  Remove src/prefix-args.c.
  
  * configure.in (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove.
  
  * msdos/sed1v2.inp: Remove reference to prefix-args.
  
  * prefix-args.c: Remove file.
  * src/autodeps.mk (ALLOBJS): Remove reference to prefix-args.
  * src/Makefile.in (temacs${EXEEXT}): Remove references to
  PRE_EDIT_LDFLAGS and POST_EDIT_LDFLAGS.
  (mostlyclean): Remove reference to prefix-args.
  (prefix-args): Remove.
removed:
  src/prefix-args.c
modified:
  ChangeLog
  configure
  configure.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  src/ChangeLog
  src/Makefile.in
  src/autodeps.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-07-08 02:37:32 +0000
+++ b/ChangeLog 2010-07-08 03:31:04 +0000
@@ -1,5 +1,7 @@
 2010-07-08  Dan Nicolaescu  <address@hidden>
 
+       * configure.in (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove.
+
        * configure.in (UNEXEC_OBJ): Add comment about values for MSDOS
        and MSWindows.
 

=== modified file 'configure'
--- a/configure 2010-07-08 02:37:32 +0000
+++ b/configure 2010-07-08 03:31:04 +0000
@@ -600,8 +600,6 @@
 MOUSE_SUPPORT
 LIB_GCC
 LINKER
-POST_EDIT_LDFLAGS
-PRE_EDIT_LDFLAGS
 LD_SWITCH_SYSTEM_TEMACS
 POST_ALLOC_OBJ
 PRE_ALLOC_OBJ
@@ -14163,8 +14161,6 @@
 esac
 
 
-PRE_EDIT_LDFLAGS=
-POST_EDIT_LDFLAGS=
 if test "x$ORDINARY_LINK" = "xyes"; then
 
   LINKER="\$(CC)"
@@ -14185,18 +14181,8 @@
   ## searching for libraries in its internal directories, so we have to
   ## ask GCC explicitly where to find libgcc.a (LIB_GCC below).
   LINKER="\$(CC) -nostdlib"
-  ## GCC passes any argument prefixed with -Xlinker directly to the linker.
-  ## See prefix-args.c for an explanation of why we do not do this with the
-  ## shell''s ``for'' construct.  Note that sane people do not have '.' in
-  ## their paths, so we must use ./prefix-args.
-  ## TODO either make prefix-args check ORDINARY_LINK internally,
-  ## or remove it altogether (bug#6184), removing the need for this hack.
-  PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
-  POST_EDIT_LDFLAGS='`'
 fi
 
-
-
 test "x$LINKER" = "x" && LINKER=ld
 ## FIXME? What setting of EDIT_LDFLAGS should this have?
 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"

=== modified file 'configure.in'
--- a/configure.in      2010-07-08 02:37:32 +0000
+++ b/configure.in      2010-07-08 03:31:04 +0000
@@ -3360,8 +3360,6 @@
 esac
 
 
-PRE_EDIT_LDFLAGS=
-POST_EDIT_LDFLAGS=
 if test "x$ORDINARY_LINK" = "xyes"; then
 
   LINKER="\$(CC)"
@@ -3380,17 +3378,7 @@
   ## searching for libraries in its internal directories, so we have to
   ## ask GCC explicitly where to find libgcc.a (LIB_GCC below).
   LINKER="\$(CC) -nostdlib"
-  ## GCC passes any argument prefixed with -Xlinker directly to the linker.
-  ## See prefix-args.c for an explanation of why we do not do this with the
-  ## shell''s ``for'' construct.  Note that sane people do not have '.' in
-  ## their paths, so we must use ./prefix-args.
-  ## TODO either make prefix-args check ORDINARY_LINK internally,
-  ## or remove it altogether (bug#6184), removing the need for this hack.
-  PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
-  POST_EDIT_LDFLAGS='`'
 fi
-AC_SUBST(PRE_EDIT_LDFLAGS)
-AC_SUBST(POST_EDIT_LDFLAGS)
 
 test "x$LINKER" = "x" && LINKER=ld
 ## FIXME? What setting of EDIT_LDFLAGS should this have?

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-07-07 22:18:28 +0000
+++ b/msdos/ChangeLog   2010-07-08 03:31:04 +0000
@@ -1,3 +1,7 @@
+2010-07-08  Dan Nicolaescu  <address@hidden>
+
+       * sed1v2.inp: Remove reference to prefix-args.
+
 2010-07-07  Andreas Schwab  <address@hidden>
 
        * sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-07-02 12:43:15 +0000
+++ b/msdos/sed1v2.inp  2010-07-08 03:31:04 +0000
@@ -128,7 +128,6 @@
 /^[   ]*$/d
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
-/^temacs:/s/prefix-args//
 /^temacs:/s/stamp-oldxmenu//
 /^     if test "\${CANNOT_DUMP}" =/,/^ else /d
 /^     fi/d

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-08 03:03:52 +0000
+++ b/src/ChangeLog     2010-07-08 03:31:04 +0000
@@ -1,5 +1,13 @@
 2010-07-08  Dan Nicolaescu  <address@hidden>
 
+       Remove prefix-args.c
+       * prefix-args.c: Remove file.
+       * autodeps.mk (ALLOBJS): Remove reference to prefix-args.
+       * Makefile.in (temacs${EXEEXT}): Remove references to
+       PRE_EDIT_LDFLAGS and POST_EDIT_LDFLAGS.
+       (mostlyclean): Remove reference to prefix-args.
+       (prefix-args): Remove.
+
        Simplify cstart_of_data, start_of_code and related code.
        * mem-limits.h: Remove !emacs and _LIBC conditional code.
        (start_of_data): Merge into start_of_data function.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-06-30 02:48:54 +0000
+++ b/src/Makefile.in   2010-07-08 03:31:04 +0000
@@ -628,20 +628,10 @@
        echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
 
-## We cannot define variables for PRE_EDIT and POST_EDIT.
-## If !ORDINARY_LINK && !LINKER && GCC, they add a
-## `./prefix-args -Xlinker ... ` wrapper, otherwise they are empty.
-## One alternative to this approach would be to always call prefix-args, 
-## and have it DTRT in all cases, by testing the above defines.
-temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} 
prefix-args${EXEEXT}
-       $(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \
-         ${TEMACS_LDFLAGS2} \
+temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj}
+       $(LD) ${TEMACS_LDFLAGS} ${TEMACS_LDFLAGS2} \
          -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 
-prefix-args${EXEEXT}: prefix-args.o $(config_h)
-       $(CC) $(LDFLAGS) prefix-args.o -o prefix-args
-
-
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them
 ## (provided we take a little care that OLDXMENU is never empty).
@@ -688,7 +678,7 @@
 
 
 mostlyclean:
-       rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o 
libXMenu11.a liblw.a
+       rm -f temacs${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
        rm -f ../etc/DOC
        rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT}
        rm -f buildobj.h

=== modified file 'src/autodeps.mk'
--- a/src/autodeps.mk   2010-05-27 05:43:27 +0000
+++ b/src/autodeps.mk   2010-07-08 03:31:04 +0000
@@ -2,5 +2,5 @@
 
 ## This is inserted in src/Makefile if AUTO_DEPEND=yes.
 
-ALLOBJS=$(START_FILES) ${obj} ${otherobj} prefix-args.o
+ALLOBJS=$(START_FILES) ${obj} ${otherobj}
 -include $(ALLOBJS:%.o=${DEPDIR}/%.d)

=== removed file 'src/prefix-args.c'
--- a/src/prefix-args.c 2010-07-04 07:50:25 +0000
+++ b/src/prefix-args.c 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/* prefix-args.c - echo each argument, prefixed by a string.
-   Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Jim Blandy <address@hidden> - September 1992
-
-   When using GCC 2 as the linker in the build process, options
-   intended for the linker need to be prefixed with the "-Xlinker"
-   option.  If an option takes an argument, we need to use -Xlinker
-   twice - once for the option and once for its argument.  For
-   example, to run the linker with the options "-Bstatic" "-e"
-   "_start", you'd need to pass the following options to GCC:
-
-   -Xlinker -Bstatic -Xlinker -e -Xlinker _start.
-
-   The Emacs makefile used to use a Bourne Shell `for' loop to prefix
-   each linker option with "-Xlinker", but 1) the for loop was hairier
-   than one might hope because it had to work when there were no
-   arguments to pass to the linker - the shell barfs on a loop like
-   this:
-
-       for arg in ; do echo -Xlinker "$arg"; done
-
-   and 2) the whole compilation command containing this loop seems to
-   exit with a non-zero status and halt the build under Ultrix.
-
-   If I can't write a completely portable program to do this in C,
-   I'm quitting and taking up gardening.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if STDC_HEADERS
-# include <stdlib.h>           /* for proper declaration of `exit' */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-  char *progname;
-  char *prefix;
-
-  progname = argv[0];
-  argc--, argv++;
-
-  if (argc < 1)
-    {
-      fprintf (stderr, "Usage: %s PREFIX ARGS...\n\
-Echo each ARG preceded by PREFIX and a space.\n", progname);
-      exit (2);
-    }
-
-  prefix = argv[0];
-  argc--, argv++;
-
-  for (; argc > 0; argc--, argv++)
-    printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n');
-
-  exit (0);
-}
-
-/* arch-tag: 08136d70-e5c0-49c7-bcd8-b4850233977a
-   (do not change this comment) */