Mercurial > emacs
changeset 107575:dbd787c249c5
Remove all uses of C_DEBUG_SWITCH and LIBS_DEBUG.
* s/usg5-4.h (LIBS_DEBUG):
* s/irix6-5.h (C_DEBUG_SWITCH):
* s/gnu-linux.h (LIBS_DEBUG):
* s/darwin.h (LIBS_DEBUG):
* s/bsd-common.h (LIBS_DEBUG):
* s/aix4-2.h (LIBS_DEBUG, C_DEBUG_SWITCH):
* m/iris4d.h (LIBS_DEBUG):
* m/hp800.h (LIBS_DEBUG): Remove definitions.
* Makefile.in (LIBES): Remove reference to LIBS_DEBUG.
(LIBS_DEBUG): Remove definition.
* configure.in: Remove all references to C_DEBUG_SWITCH.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 29 Mar 2010 19:47:23 -0700 |
| parents | 2628198e4d2a |
| children | df4f6d6be3b3 52cc880eaf3a |
| files | ChangeLog admin/CPP-DEFINES configure.in src/ChangeLog src/Makefile.in src/m/hp800.h src/m/iris4d.h src/s/aix4-2.h src/s/bsd-common.h src/s/darwin.h src/s/gnu-linux.h src/s/irix6-5.h src/s/sol2-6.h src/s/usg5-4.h |
| diffstat | 14 files changed, 24 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 30 13:22:34 2010 +1300 +++ b/ChangeLog Mon Mar 29 19:47:23 2010 -0700 @@ -1,3 +1,7 @@ +2010-03-30 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in: Remove all references to C_DEBUG_SWITCH. + 2010-03-27 Eli Zaretskii <eliz@gnu.org> * config.bat <lib-src>: Edit out lines that begin with several #
--- a/admin/CPP-DEFINES Tue Mar 30 13:22:34 2010 +1300 +++ b/admin/CPP-DEFINES Mon Mar 29 19:47:23 2010 -0700 @@ -106,7 +106,6 @@ CLASH_DETECTION COFF_BSD_SYMBOLS CRT0_DUMMIES -C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SYSTEM_TEMACS @@ -234,7 +233,6 @@ LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_SYSTEM_tmp LD_SWITCH_X_DEFAULT -LIBS_DEBUG LIBS_MACHINE LIBS_SYSTEM LIBS_TERMCAP
--- a/configure.in Tue Mar 30 13:22:34 2010 +1300 +++ b/configure.in Mon Mar 29 19:47:23 2010 -0700 @@ -888,10 +888,6 @@ configure___ use_mmap_for_buffers=no #endif -#ifndef C_DEBUG_SWITCH -#define C_DEBUG_SWITCH -g -#endif - #ifndef C_OPTIMIZE_SWITCH #ifdef __GNUC__ #define C_OPTIMIZE_SWITCH -O2 @@ -923,18 +919,18 @@ /* Get the CFLAGS for tests in configure. */ #ifdef __GNUC__ -configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' +configure___ CFLAGS=C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}' #else -configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' +configure___ CFLAGS='${SPECIFIED_CFLAGS}' #endif #else /* not THIS_IS_CONFIGURE */ /* Get the CFLAGS for real compilation. */ #ifdef __GNUC__ -configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}' +configure___ REAL_CFLAGS=C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}' #else -configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}' +configure___ REAL_CFLAGS='${SPECIFIED_CFLAGS}' #endif #endif /* not THIS_IS_CONFIGURE */
--- a/src/ChangeLog Tue Mar 30 13:22:34 2010 +1300 +++ b/src/ChangeLog Mon Mar 29 19:47:23 2010 -0700 @@ -1,3 +1,18 @@ +2010-03-30 Dan Nicolaescu <dann@ics.uci.edu> + + Remove all uses of C_DEBUG_SWITCH and LIBS_DEBUG. + * s/usg5-4.h (LIBS_DEBUG): + * s/irix6-5.h (C_DEBUG_SWITCH): + * s/gnu-linux.h (LIBS_DEBUG): + * s/darwin.h (LIBS_DEBUG): + * s/bsd-common.h (LIBS_DEBUG): + * s/aix4-2.h (LIBS_DEBUG, C_DEBUG_SWITCH): + * m/iris4d.h (LIBS_DEBUG): + * m/hp800.h (LIBS_DEBUG): Remove definitions. + + * Makefile.in (LIBES): Remove reference to LIBS_DEBUG. + (LIBS_DEBUG): Remove definition. + 2010-03-27 Chong Yidong <cyd@stupidchicken.com> * process.c (Fmake_network_process): Don't apply Bug#5173 fix for
--- a/src/Makefile.in Tue Mar 30 13:22:34 2010 +1300 +++ b/src/Makefile.in Mon Mar 29 19:47:23 2010 -0700 @@ -127,11 +127,6 @@ #define LIB_STANDARD #endif -/* Unless inhibited or changed, use -lg to link for debugging. */ -#ifndef LIBS_DEBUG -#define LIBS_DEBUG -lg -#endif - /* Some s/SYSTEM.h files define this to request special libraries. */ #ifndef LIBS_SYSTEM #define LIBS_SYSTEM @@ -850,7 +845,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ - LIBS_DEBUG $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ + $(GETLOADAVG_LIBS) ${GCONF_LIBS} \ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
--- a/src/m/hp800.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/m/hp800.h Mon Mar 29 19:47:23 2010 -0700 @@ -93,8 +93,6 @@ #define UNEXEC unexhp9k800.o -#define LIBS_DEBUG - /* Include the file bsdtty.h, since this machine has job control. */ #define NEED_BSDTTY
--- a/src/m/iris4d.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/m/iris4d.h Mon Mar 29 19:47:23 2010 -0700 @@ -53,8 +53,6 @@ #define DATA_START 0x10000000 #define DATA_SEG_BITS 0x10000000 -#define LIBS_DEBUG - /* Use terminfo instead of termcap. */ #define TERMINFO
--- a/src/s/aix4-2.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/aix4-2.h Mon Mar 29 19:47:23 2010 -0700 @@ -87,10 +87,6 @@ #define LINKER cc #endif -/* Prevent -lg from being used for debugging. Not needed. */ - -#define LIBS_DEBUG - /* No need to specify -lc when linking. */ #define LIB_STANDARD @@ -130,16 +126,6 @@ It is just a guess which versions of AIX need this definition. */ #undef HAVE_STRING_H -/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g" - because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because - "cc -g" crashes. Go figure. --floppy@merlin.mit.edu */ -/* The above isn't generally true. If it occurs with some compiler - release, seek a fixed version, be it XLC or GCC. The XLC version - isn't tied to the OS version on AIX any more than elsewhere. XLC - (the IBM compiler) can use -g with -O. (-O3 is also a possibility - for the optimization level.) -- fx, after David Edelsohn. */ -#define C_DEBUG_SWITCH -g -O - /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ #define SIGNALS_VIA_CHARACTERS #define MAIL_USE_LOCKF
--- a/src/s/bsd-common.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/bsd-common.h Mon Mar 29 19:47:23 2010 -0700 @@ -46,8 +46,6 @@ #define HAVE_TERMIOS #define NO_TERMIO -#define LIBS_DEBUG - #define SYSV_SYSTEM_DIR /* POSIX-style pgrp behavior. */
--- a/src/s/darwin.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/darwin.h Mon Mar 29 19:47:23 2010 -0700 @@ -189,9 +189,6 @@ /* Link this program just by running cc. */ #define ORDINARY_LINK -/* We don't have a g library, so override the -lg LIBS_DEBUG switch. */ -#define LIBS_DEBUG - /* Adding -lm confuses the dynamic linker, so omit it. */ #define LIB_MATH
--- a/src/s/gnu-linux.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/gnu-linux.h Mon Mar 29 19:47:23 2010 -0700 @@ -194,19 +194,10 @@ #define POSIX /* affects getpagesize.h and systty.h */ #define POSIX_SIGNALS -/* Best not to include -lg, unless it is last on the command line */ -#define LIBS_DEBUG #undef LIB_GCC #define LIB_GCC #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o -/* Don't use -g in test compiles in configure. - This is so we will use the same shared libs for that linking - that are used when linking temacs. */ -#ifdef THIS_IS_CONFIGURE -#define C_DEBUG_SWITCH -#endif - /* _BSD_SOURCE is redundant, at least in glibc2, since we define _GNU_SOURCE. Left in in case it's relevant to libc5 systems and anyone's still using Emacs on those. --fx 2002-12-14 */
--- a/src/s/irix6-5.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/irix6-5.h Mon Mar 29 19:47:23 2010 -0700 @@ -101,19 +101,6 @@ #define _LP64 /* lisp.h takes care of the rest */ #endif /* _MIPS_SZLONG */ -/* The only supported 32-bit configuration of GCC under IRIX6.x produces - n32 MIPS ABI binaries and also supports -g. */ -#ifdef __GNUC__ -#define C_DEBUG_SWITCH -g -#else -/* Optimize, inaccurate debugging, increase limit on size of what's - optimized. - - This should also be applicable other than on Irix 6.5, but I don't - know for which compiler versions. -- fx */ -#define C_DEBUG_SWITCH -g3 -O -OPT:Olimit=3500 -#endif - #undef SA_RESTART #undef TIOCSIGSEND /* defined in usg5-4.h */
--- a/src/s/sol2-6.h Tue Mar 30 13:22:34 2010 +1300 +++ b/src/s/sol2-6.h Mon Mar 29 19:47:23 2010 -0700 @@ -48,11 +48,6 @@ #define LIBS_TERMCAP -ltermcap #endif -#ifndef __GNUC__ -/* eggert thinks all versions of SunPro C allowed this. */ -#define C_DEBUG_SWITCH -g -O -#endif /* GCC */ - /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x