(C_DEBUG_SWITCH): Use -g -O.

2 files changed, 10 insertions, 5 deletions

diff --git a/src/s/aix3-2-5.h b/src/s/aix3-2-5.h
index 7490b27abd9..04c8ccf44ad 100644
--- a/src/s/aix3-2-5.h
+++ b/src/s/aix3-2-5.h
@@ -5,12 +5,13 @@
 /* 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 */
-#ifndef __GNUC__
+/* 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.  */
 #undef C_DEBUG_SWITCH
-#undef C_OPTIMIZE_SWITCH
-#define C_DEBUG_SWITCH -O
-#define C_OPTIMIZE_SWITCH -O
-#endif
+#define C_DEBUG_SWITCH -g -O
 
 /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
 #define SIGNALS_VIA_CHARACTERS
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index ce9bf026df5..c365bc7d102 100644
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -17,11 +17,15 @@
 /* David Edelsohn <dje@watson.ibm.com> says that this actually depends
    on the version of XLC, which can't be predicted from the system version.
    What a mess!  */
+/* No more of a mess than other systems, GNU+GCC included.  See
+   comments in aix3-2-5.h.  -- fx */
+#if 0
 #ifndef __GNUC__
 #undef C_DEBUG_SWITCH
 #undef C_OPTIMIZE_SWITCH
 #define C_DEBUG_SWITCH -g
 #endif
+#endif
 
 /* The X internationalization stuff is still broken in AIX 4.1, so
    don't #undef X11R5_INHIBIT_I18N