diff -urN mig-1.3/aclocal.m4 mig-1.3.1/aclocal.m4 --- mig-1.3/aclocal.m4 2002-03-06 19:47:45.000000000 -0500 +++ mig-1.3.1/aclocal.m4 2002-08-30 09:12:40.000000000 -0400 @@ -1,6 +1,6 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,8 +19,9 @@ dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -36,18 +37,47 @@ AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) +# Copyright 2002 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 + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.4-p6])]) + # # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 @@ -88,7 +118,7 @@ dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, +AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. @@ -105,7 +135,7 @@ dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT -AC_DEFUN(AM_PROG_LEX, +AC_DEFUN([AM_PROG_LEX], [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") AC_PROG_LEX diff -urN mig-1.3/ChangeLog mig-1.3.1/ChangeLog --- mig-1.3/ChangeLog 2002-03-06 19:48:09.000000000 -0500 +++ mig-1.3.1/ChangeLog 2002-08-29 23:23:27.000000000 -0400 @@ -1,3 +1,31 @@ +2002-08-29 Jeff Bailey + + * configure.in: Bump version to 1.3.1 + * configure: Regenerated. + + * NEWS: Updated for 1.3.1 release. + +2002-07-31 Marcus Brinkmann + + * routine.c (rtFindSize): Always add sizeof_mach_msg_type_t to + SIZE for args not in long form, irregardless of the itSize. + +2002-05-07 Roland McGrath + + * type.c (itMakeNaturalType): New function. + (init_type): Use that instead of itMakeIntType for itWaitTimeType and + itMsgOptionType--give them each their special typedef names. + * routine.c (rtCheckArgTypes): Use itCheckNaturalType for rtMsgOption. + +2002-04-05 Roland McGrath + + * Makefile.am (cpu.symc): Depend on gensym.awk. + * Makefile.in: Regenerated. + + * gensym.awk: Generate code with no unescaped newlines inside strings. + + * vprint.c: Fix obsolete #endif syntax. + 2002-03-06 Roland McGrath * configure.in: Bump version to 1.3. diff -urN mig-1.3/configure mig-1.3.1/configure --- mig-1.3/configure 2002-03-06 19:47:48.000000000 -0500 +++ mig-1.3.1/configure 2002-08-30 09:12:41.000000000 -0400 @@ -650,6 +650,7 @@ # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," +am__api_version="1.4" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -662,7 +663,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:666: checking for a BSD compatible install" >&5 +echo "configure:667: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -715,7 +716,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:719: checking whether build environment is sane" >&5 +echo "configure:720: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -753,7 +754,7 @@ rm -f conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:757: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:758: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -782,7 +783,7 @@ PACKAGE=mig -VERSION=1.3 +VERSION=1.3.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -798,21 +799,21 @@ missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:803: checking for working aclocal" >&5 +echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 +echo "configure:804: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal-${am__api_version} echo "$ac_t""found" 1>&6 else - ACLOCAL="$missing_dir/missing aclocal" + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:816: checking for working autoconf" >&5 +echo "configure:817: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -824,21 +825,21 @@ echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:829: checking for working automake" >&5 +echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 +echo "configure:830: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-${am__api_version} echo "$ac_t""found" 1>&6 else - AUTOMAKE="$missing_dir/missing automake" + AUTOMAKE="$missing_dir/missing automake-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:842: checking for working autoheader" >&5 +echo "configure:843: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -851,7 +852,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:855: checking for working makeinfo" >&5 +echo "configure:856: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -868,7 +869,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:872: checking for $ac_word" >&5 +echo "configure:873: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -898,7 +899,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:902: checking for $ac_word" >&5 +echo "configure:903: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -949,7 +950,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:953: checking for $ac_word" >&5 +echo "configure:954: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -981,7 +982,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:985: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -992,12 +993,12 @@ cat > conftest.$ac_ext << EOF -#line 996 "configure" +#line 997 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1023,12 +1024,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1028: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1032: checking whether we are using GNU C" >&5 +echo "configure:1033: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1037,7 +1038,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1056,7 +1057,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1061: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1088,7 +1089,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1092: checking how to run the C preprocessor" >&5 +echo "configure:1093: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1103,13 +1104,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1120,13 +1121,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1137,13 +1138,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1172,7 +1173,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1176: checking for $ac_word" >&5 +echo "configure:1177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1208,7 +1209,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1212: checking for $ac_word" >&5 +echo "configure:1213: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1241,7 +1242,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1245: checking for $ac_word" >&5 +echo "configure:1246: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1276,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1279: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1280: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1283,7 +1284,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1317,7 +1318,7 @@ fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1321: checking lex output file root" >&5 +echo "configure:1322: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1338,7 +1339,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:1342: checking whether yytext is a pointer" >&5 +echo "configure:1343: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1350,14 +1351,14 @@ ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1378,12 +1379,12 @@ fi -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1387: checking for $ac_word" >&5 +echo "configure:1388: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1424,7 +1425,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1428: checking for a BSD compatible install" >&5 +echo "configure:1429: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1478,12 +1479,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1482: checking for ANSI C header files" >&5 +echo "configure:1483: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1491,7 +1492,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1508,7 +1509,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1526,7 +1527,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1547,7 +1548,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1558,7 +1559,7 @@ exit (0); } EOF -if { (eval echo configure:1562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1585,19 +1586,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1589: checking for working alloca.h" >&5 +echo "configure:1590: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1618,12 +1619,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1622: checking for alloca" >&5 +echo "configure:1623: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1683,12 +1684,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1687: checking whether alloca needs Cray hooks" >&5 +echo "configure:1688: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1717: checking for $ac_func" >&5 +echo "configure:1718: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1768,7 +1769,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1772: checking stack direction for C alloca" >&5 +echo "configure:1773: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1776,7 +1777,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1819,12 +1820,12 @@ for ac_func in vprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1823: checking for $ac_func" >&5 +echo "configure:1824: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1873,7 +1874,7 @@ echo $ac_n "checking for target compiler""... $ac_c" 1>&6 -echo "configure:1877: checking for target compiler" >&5 +echo "configure:1878: checking for target compiler" >&5 if test "x$TARGET_CC" != x; then # User set it. echo "$ac_t""$TARGET_CC" 1>&6 diff -urN mig-1.3/configure.in mig-1.3.1/configure.in --- mig-1.3/configure.in 2002-03-06 19:47:17.000000000 -0500 +++ mig-1.3.1/configure.in 2002-08-29 23:16:46.000000000 -0400 @@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM dnl needs SYSTEM, not just HOST and TARGET -AM_INIT_AUTOMAKE(mig, 1.3) +AM_INIT_AUTOMAKE(mig, 1.3.1) dnl Checks for programs. AC_PROG_CC diff -urN mig-1.3/debian/changelog mig-1.3.1/debian/changelog --- mig-1.3/debian/changelog 2002-03-08 07:27:08.000000000 -0500 +++ mig-1.3.1/debian/changelog 2002-08-29 23:14:08.000000000 -0400 @@ -1,3 +1,13 @@ + + * debian/control: Add Build-Depends. + +mig (1.3-2) unstable; urgency=low + + * New CVS snapshot. + * debian/control: Add Uploaders. + + -- Marcus Brinkmann Mon, 5 Aug 2002 00:13:00 +0200 + mig (1.3-1) unstable; urgency=low * New upstream release. diff -urN mig-1.3/debian/control mig-1.3.1/debian/control --- mig-1.3/debian/control 2002-03-08 07:27:08.000000000 -0500 +++ mig-1.3.1/debian/control 2002-08-29 23:13:48.000000000 -0400 @@ -3,6 +3,8 @@ Priority: standard Maintainer: GNU Hurd Maintainers Standards-Version: 3.5.6.0 +Build-Depends: flex +Uploaders: Marcus Brinkmann Package: mig Section: devel diff -urN mig-1.3/gensym.awk mig-1.3.1/gensym.awk --- mig-1.3/gensym.awk 1998-07-19 00:50:04.000000000 -0400 +++ mig-1.3.1/gensym.awk 2002-06-10 00:42:54.000000000 -0400 @@ -34,7 +34,7 @@ # Take an arbitrarily complex C symbol or expression and constantize it. /^expr/ { - print "__asm (\""; + print "__asm (\"\\n\\"; if ($3 == "") printf "* %s mAgIc%%0\" : : \"i\" (%s));\n", $2, $2; else @@ -43,7 +43,7 @@ # Output a symbol defining the size of a C structure. /^size/ { - print "__asm (\""; + print "__asm (\"\\n\\"; if ($4 == "") printf "* %s_SIZE mAgIc%%0\" : : \"i\" (sizeof(struct %s)));\n", toupper($3), $2; @@ -54,7 +54,7 @@ # Output a symbol defining the byte offset of an element of a C structure. /^offset/ { - print "__asm (\""; + print "__asm (\"\\n\\"; if ($5 == "") { printf "* %s_%s mAgIc%%0\" : : \"i\" (&((struct %s*)0)->%s));\n", @@ -75,4 +75,3 @@ END { print "}" } - diff -urN mig-1.3/Makefile.am mig-1.3.1/Makefile.am --- mig-1.3/Makefile.am 2001-06-09 17:45:49.000000000 -0400 +++ mig-1.3.1/Makefile.am 2002-06-10 00:42:54.000000000 -0400 @@ -25,5 +25,6 @@ .symo.h: sed -e '/^[^*].*$$/d' -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' \ $< > $@ +cpu.symc: $(srcdir)/gensym.awk $(migcom_OBJECTS): cpu.h diff -urN mig-1.3/Makefile.in mig-1.3.1/Makefile.in --- mig-1.3/Makefile.in 2002-03-08 07:33:14.000000000 -0500 +++ mig-1.3.1/Makefile.in 2002-08-30 09:14:55.000000000 -0400 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -119,7 +119,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(migcom_SOURCES) OBJECTS = $(migcom_OBJECTS) @@ -238,7 +238,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) mostlyclean-tags: @@ -298,30 +298,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -error.o: error.c global.h boolean.h mig_string.h error.h lexxer.h -global.o: global.c error.h global.h boolean.h mig_string.h -header.o: header.c write.h statement.h routine.h boolean.h type.h \ - mig_string.h utils.h global.h error.h -lexxer.o: lexxer.c mig_string.h boolean.h type.h statement.h routine.h \ - global.h parser.h lexxer.h cpu.h -migcom.o: migcom.c error.h lexxer.h global.h boolean.h mig_string.h \ - write.h statement.h routine.h type.h -parser.o: parser.c error.h lexxer.h global.h boolean.h mig_string.h \ - type.h routine.h statement.h -routine.o: routine.c error.h global.h boolean.h mig_string.h routine.h \ - type.h message.h cpu.h -server.o: server.c write.h statement.h routine.h boolean.h type.h \ - mig_string.h utils.h global.h error.h cpu.h -statement.o: statement.c global.h boolean.h mig_string.h error.h \ - statement.h routine.h type.h -string.o: string.c boolean.h error.h mig_string.h -type.o: type.c error.h global.h boolean.h mig_string.h type.h message.h \ - cpu.h -user.o: user.c write.h statement.h routine.h boolean.h type.h \ - mig_string.h error.h utils.h global.h cpu.h -utils.o: utils.c write.h statement.h routine.h boolean.h type.h \ - mig_string.h utils.h global.h -vprint.o: vprint.c info-am: info: info-am @@ -360,7 +336,7 @@ -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - -test -z "lexxerlparserhparserc" || rm -f lexxerl parserh parserc + -test -z "lexxercparserhparserc" || rm -f lexxerc parserh parserc mostlyclean-am: mostlyclean-libexecPROGRAMS mostlyclean-compile \ mostlyclean-tags mostlyclean-generic @@ -406,6 +382,7 @@ .symo.h: sed -e '/^[^*].*$$/d' -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' \ $< > $@ +cpu.symc: $(srcdir)/gensym.awk $(migcom_OBJECTS): cpu.h diff -urN mig-1.3/NEWS mig-1.3.1/NEWS --- mig-1.3/NEWS 2002-03-08 07:32:35.000000000 -0500 +++ mig-1.3.1/NEWS 2002-08-30 09:03:44.000000000 -0400 @@ -1,5 +1,15 @@ -*- Text -*- +29 August 2002 +Version 1.3.1 + +* Fix warnings when compiling generated files with GCC 3.x + +* Fix alignment issues for greater than 32 bit types on 32 bit + machines. + +* Alpha fixes. + 8 March 2002 Version 1.3 diff -urN mig-1.3/routine.c mig-1.3.1/routine.c --- mig-1.3/routine.c 1998-07-18 19:59:26.000000000 -0400 +++ mig-1.3.1/routine.c 2002-08-29 23:13:48.000000000 -0400 @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -377,8 +377,7 @@ size = (size + word_size-1) & ~(word_size-1); size += sizeof_mach_msg_type_long_t; } else { - register bs = (it->itSize / 8); /* in bytes */ - size += (bs > sizeof_mach_msg_type_t) ? bs : sizeof_mach_msg_type_t; + size += sizeof_mach_msg_type_t; } size += it->itMinTypeSize; @@ -957,13 +956,13 @@ if ((rt->rtWaitTime != argNULL) && (rt->rtWaitTime->argType != itNULL)) - itCheckIntType(rt->rtWaitTime->argName, - rt->rtWaitTime->argType); + itCheckNaturalType(rt->rtWaitTime->argName, + rt->rtWaitTime->argType); if ((rt->rtMsgOption != argNULL) && (rt->rtMsgOption->argType != itNULL)) - itCheckIntType(rt->rtMsgOption->argName, - rt->rtMsgOption->argType); + itCheckNaturalType(rt->rtMsgOption->argName, + rt->rtMsgOption->argType); if ((rt->rtMsgSeqno != argNULL) && (rt->rtMsgSeqno->argType != itNULL)) diff -urN mig-1.3/type.c mig-1.3.1/type.c --- mig-1.3/type.c 1998-07-18 19:59:26.000000000 -0400 +++ mig-1.3.1/type.c 2002-06-10 00:42:54.000000000 -0400 @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -718,6 +718,23 @@ return it; } +static ipc_type_t * +itMakeNaturalType(const char *name) +{ + ipc_type_t *it = itAlloc(); + + it->itName = name; + it->itInName = word_size_name; + it->itInNameStr = word_size_name_string; + it->itOutName = word_size_name; + it->itOutNameStr = word_size_name_string; + it->itSize = word_size_in_bits; + + itCalculateSizeInfo(it); + itCalculateNameInfo(it); + return it; +} + extern ipc_type_t * itMakeIntType() { @@ -825,8 +842,8 @@ itCalculateSizeInfo(itRealReplyPortType); itCalculateNameInfo(itRealReplyPortType); - itWaitTimeType = itMakeIntType(); - itMsgOptionType = itMakeIntType(); + itWaitTimeType = itMakeNaturalType("mach_msg_timeout_t"); + itMsgOptionType = itMakeNaturalType("mach_msg_option_t"); } /****************************************************** diff -urN mig-1.3/vprint.c mig-1.3.1/vprint.c --- mig-1.3/vprint.c 1998-07-18 19:59:27.000000000 -0400 +++ mig-1.3.1/vprint.c 2002-06-10 00:42:54.000000000 -0400 @@ -1,7 +1,7 @@ /* * Copyright (c) 1990,1992,1993 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the @@ -332,7 +332,7 @@ case 'X': base = 16; goto print_unsigned; - + case 'p': base = 16; altfmt = TRUE; @@ -430,4 +430,4 @@ } } -#endif !HAVE_VPRINTF +#endif /* !HAVE_VPRINTF */