From 32a8894e5b88564765dc67955751f75d2c9dabcf Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 29 Mar 2010 19:47:23 -0700 Subject: [PATCH] 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. --- ChangeLog | 4 ++++ admin/CPP-DEFINES | 2 -- configure.in | 12 ++++-------- src/ChangeLog | 15 +++++++++++++++ src/Makefile.in | 7 +------ src/m/hp800.h | 2 -- src/m/iris4d.h | 2 -- src/s/aix4-2.h | 14 -------------- src/s/bsd-common.h | 2 -- src/s/darwin.h | 3 --- src/s/gnu-linux.h | 9 --------- src/s/irix6-5.h | 13 ------------- src/s/sol2-6.h | 5 ----- src/s/usg5-4.h | 4 ---- 14 files changed, 24 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26a38fedcfa..d8c440355a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-30 Dan Nicolaescu + + * configure.in: Remove all references to C_DEBUG_SWITCH. + 2010-03-27 Eli Zaretskii * config.bat : Edit out lines that begin with several # diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 7ab0c3f52a4..caf05a88ce5 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -106,7 +106,6 @@ BSD_SYSTEM 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 LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_SYSTEM_tmp LD_SWITCH_X_DEFAULT -LIBS_DEBUG LIBS_MACHINE LIBS_SYSTEM LIBS_TERMCAP diff --git a/configure.in b/configure.in index 2a3ac32fd85..fc7c0a93235 100644 --- a/configure.in +++ b/configure.in @@ -888,10 +888,6 @@ configure___ use_mmap_for_buffers=yes 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 @@ configure___ ld_switch_machine=LD_SWITCH_MACHINE /* 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 */ diff --git a/src/ChangeLog b/src/ChangeLog index 7aae2a3754f..8fd89e9fd0c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2010-03-30 Dan Nicolaescu + + 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 * process.c (Fmake_network_process): Don't apply Bug#5173 fix for diff --git a/src/Makefile.in b/src/Makefile.in index d8661bc0be6..1730158f732 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -127,11 +127,6 @@ DEPFLAGS = -MMD -MF deps/$*.d #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 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ 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) diff --git a/src/m/hp800.h b/src/m/hp800.h index 8acec110272..bf684a871a9 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -93,8 +93,6 @@ along with GNU Emacs. If not, see . */ #define UNEXEC unexhp9k800.o -#define LIBS_DEBUG - /* Include the file bsdtty.h, since this machine has job control. */ #define NEED_BSDTTY diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 06bffceb64c..794227977be 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -53,8 +53,6 @@ along with GNU Emacs. If not, see . */ #define DATA_START 0x10000000 #define DATA_SEG_BITS 0x10000000 -#define LIBS_DEBUG - /* Use terminfo instead of termcap. */ #define TERMINFO diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 93869db6bca..32bc67bfd46 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -87,10 +87,6 @@ along with GNU Emacs. If not, see . */ #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 @@ along with GNU Emacs. If not, see . */ 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 says these are correct. */ #define SIGNALS_VIA_CHARACTERS #define MAIL_USE_LOCKF diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index 2ef0883b2a7..9dad7a9b1d9 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -46,8 +46,6 @@ along with GNU Emacs. If not, see . */ #define HAVE_TERMIOS #define NO_TERMIO -#define LIBS_DEBUG - #define SYSV_SYSTEM_DIR /* POSIX-style pgrp behavior. */ diff --git a/src/s/darwin.h b/src/s/darwin.h index b9062ec8000..8813127ffce 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -189,9 +189,6 @@ along with GNU Emacs. If not, see . */ /* 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 diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 0c198de26d8..b9139435f61 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -194,19 +194,10 @@ along with GNU Emacs. If not, see . */ #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 */ diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index abd87b4aa2a..8696aa00fdd 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h @@ -101,19 +101,6 @@ char *_getpty(); #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 */ diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h index 8cd01511879..408a0a2ed02 100644 --- a/src/s/sol2-6.h +++ b/src/s/sol2-6.h @@ -48,11 +48,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 180045cb7cf..b02caf9a3da 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -103,10 +103,6 @@ along with GNU Emacs. If not, see . */ #define LIB_STANDARD -/* there are no -lg libraries on this system, and no libPW */ - -#define LIBS_DEBUG - /* Undump with ELF */ #undef COFF -- 2.11.4.GIT