[patch/5.2] (hopefully) Handle HP/UX -Ae

[patch/5.2] (hopefully) Handle HP/UX -Ae

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Hello,

(Hmm, this is looking less painful than I thought ...  Nope ...)

Per Tom Tromey's long-a-go recommendation, this patch imports the latest 
AM_PROG_CC_STDC from automake.  It tweaks things so that:

+# HP-UX 10.20 and later        -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE

are used.  I'm pretty sure that -Ae works on 10.20 and 11.00 and I'm not 
to worried about anything prior to that.
I've committed the attached to the 5.2 branch and GDB mainline.

Andrew

PS: The tally so far: gmake is needed; fix to libiberty needed; hpread.c 
doesn't compile; ...

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 1056 bytes --]

2002-04-15  Andrew Cagney  <ac131313@redhat.com>

	From mainline: 2002-03-06  Jim Blandy  <jimb@redhat.com>
	* splay-tree.c (splay_tree_xmalloc_allocate,
	splay_tree_xmalloc_deallocate): Use K&R-style definitions, not
	prototyped definitions.  Mark `data' arguments as unused.

Index: libiberty/splay-tree.c
===================================================================
RCS file: /cvs/src/src/libiberty/splay-tree.c,v
retrieving revision 1.8
diff -u -r1.8 splay-tree.c
--- libiberty/splay-tree.c	21 Feb 2002 22:19:11 -0000	1.8
+++ libiberty/splay-tree.c	15 Apr 2002 04:10:44 -0000
@@ -230,13 +230,17 @@
 
 /* An allocator and deallocator based on xmalloc.  */
 static void *
-splay_tree_xmalloc_allocate (int size, void *data)
+splay_tree_xmalloc_allocate (size, data)
+     int size;
+     void *data ATTRIBUTE_UNUSED;
 {
   return xmalloc (size);
 }
 
 static void
-splay_tree_xmalloc_deallocate (void *object, void *data)
+splay_tree_xmalloc_deallocate (object, data)
+     void *object;
+     void *data ATTRIBUTE_UNUSED;
 {
   free (object);
 }

Re: [patch/5.2] (hopefully) Handle HP/UX -Ae

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

(attach correct patch)


> PS: The tally so far: gmake is needed; fix to libiberty needed; hpread.c doesn't compile; ...

.... didn't work.

The configury works.  It carefully sets build/gdb/Makefile to ``cc 
-Ae''.  Problem is, the top level makefile sets it to just ``cc'' and 
then forces that down :-(

One guess for the CC problem is to set an explicit flag in 
gdb/Makefile.in and append that to CFLAGS.

HP/UX: 4; GDB 1

bcache.c doesn't compile.

HP/UX: 5; GDB 1

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 4204 bytes --]

2002-04-14  Andrew Cagney  <ac131313@redhat.com>

	* acinclude.m4 (AM_PROG_CC_STDC): Import from automake 1.6.
	* aclocal.m4, configure: Re-generate.
	
Index: acinclude.m4
===================================================================
RCS file: /cvs/src/src/gdb/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- acinclude.m4	12 Sep 2000 04:23:30 -0000	1.2
+++ acinclude.m4	15 Apr 2002 02:46:56 -0000
@@ -866,3 +866,113 @@
 ifelse(yes,no,[
 AC_DEFUN([CY_GNU_GETTEXT],)
 ])
+
+## ----------------------------------------- ##
+## ANSIfy the C compiler whenever possible.  ##
+## From Franc,ois Pinard                     ##
+## ----------------------------------------- ##
+
+# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program 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 2, or (at your option)
+# any later version.
+
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# @defmac AC_PROG_CC_STDC
+# @maindex PROG_CC_STDC
+# @ovindex CC
+# If the C compiler in not in ANSI C mode by default, try to add an option
+# to output variable @code{CC} to make it so.  This macro tries various
+# options that select ANSI C on some system or another.  It considers the
+# compiler to be in ANSI C mode if it handles function prototypes correctly.
+#
+# If you use this macro, you should check after calling it whether the C
+# compiler has been set to accept ANSI C; if not, the shell variable
+# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+# program @code{ansi2knr}, which comes with Ghostscript.
+# @end defmac
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_REQUIRE([AC_PROG_CC])
+AC_BEFORE([$0], [AC_C_INLINE])
+AC_BEFORE([$0], [AC_C_CONST])
+dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
+dnl a magic option to avoid problems with ANSI preprocessor commands
+dnl like #elif.
+dnl FIXME: can't do this because then AC_AIX won't work due to a
+dnl circular dependency.
+dnl AC_BEFORE([$0], [AC_PROG_CPP])
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
+AC_CACHE_VAL(am_cv_prog_cc_stdc,
+[am_cv_prog_cc_stdc=no
+ac_save_CC="$CC"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  AC_TRY_COMPILE(
+[#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+], [
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+],
+[am_cv_prog_cc_stdc="$ac_arg"; break])
+done
+CC="$ac_save_CC"
+])
+if test -z "$am_cv_prog_cc_stdc"; then
+  AC_MSG_RESULT([none needed])
+else
+  AC_MSG_RESULT([$am_cv_prog_cc_stdc])
+fi
+case "x$am_cv_prog_cc_stdc" in
+  x|xno) ;;
+  *) CC="$CC $am_cv_prog_cc_stdc" ;;
+esac
+])

Re: [patch/5.2] (hopefully) Handle HP/UX -Ae

[Andrew Cagney]

> bcache.c doesn't compile.
> 
> HP/UX: 5; GDB 1

well ..

$ TMPDIR=/var/tmp make
rm -f gdb
cc -Ae -g  -D__HP_CURSES -Dvfork=fork       -o gdb \
main.o libgdb.a cli-decode.o cli-script.o cli-cmds.o cli-setshow.o 
cli-utils.o mi-out.o mi-console.o mi-cmds.o mi-cmd-var.o mi-cmd-break.o 
mi-cmd-stack.o mi-cmd-disas.o mi-main.o mi-parse.o mi-getopt.o 
../bfd/libbfd.a ../readline/libreadline.a ../opcodes/libopcodes.a 
./../intl/libintl.a ../libiberty/libiberty.a -lHcurses     -lm 
../libiberty/libiberty.a \

/usr/ccs/bin/ld: (Warning) At least one PA 2.0 object file (main.o) was 
detected. The linked output may not run on a PA 1.x system.
pxdb: internal error. File won't be debuggable (still a valid executable)

HP/UX 10.20: 5; GDB 2!

Andrew