From 91029a29533bcffecafb8991eb0d033403cce3d8 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 24 Apr 2000 21:20:14 +0000 Subject: [PATCH] aclocal.m4 (gcc_AC_HEADER_STRING, [...]): Use the three argument form of AC_DEFINE. * aclocal.m4 (gcc_AC_HEADER_STRING, gcc_AC_FUNC_PRINTF_PTR, gcc_AC_C_VOLATILE, gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG): Use the three argument form of AC_DEFINE. * configure.in (DEFAULT_LINKER, DEFAULT_ASSEMBLER, HAVE_INTTYPES_H, PACKAGE, VERSION, ENABLE_WIN32_REGISTRY, WIN32_REGISTRY_KEY, HAVE_GAS_SUBSECTION_ORDERING, HAVE_GAS_WEAK, HAVE_GAS_HIDDEN, HAVE_AS_REGISTER_PSEUDO_OP, AS_SPARC64_FLAG, HAVE_AS_OFFSETABLE_LO10, ENABLE_NEW_GXX_ABI): Likewise. * acconfig.h: Delete stubs made redundant by 3-arg AC_DEFINE. From-SVN: r33389 --- gcc/ChangeLog | 14 ++++++ gcc/acconfig.h | 55 ----------------------- gcc/aclocal.m4 | 8 ++-- gcc/config.in | 111 ++++++++++++++++++++++++----------------------- gcc/configure.in | 30 +++++++------ 5 files changed, 90 insertions(+), 128 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9fdf5048fac..f33367358b1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2000-04-24 Kaveh R. Ghazi + + * aclocal.m4 (gcc_AC_HEADER_STRING, gcc_AC_FUNC_PRINTF_PTR, + gcc_AC_C_VOLATILE, gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG): Use the three + argument form of AC_DEFINE. + + * configure.in (DEFAULT_LINKER, DEFAULT_ASSEMBLER, + HAVE_INTTYPES_H, PACKAGE, VERSION, ENABLE_WIN32_REGISTRY, + WIN32_REGISTRY_KEY, HAVE_GAS_SUBSECTION_ORDERING, HAVE_GAS_WEAK, + HAVE_GAS_HIDDEN, HAVE_AS_REGISTER_PSEUDO_OP, AS_SPARC64_FLAG, + HAVE_AS_OFFSETABLE_LO10, ENABLE_NEW_GXX_ABI): Likewise. + + * acconfig.h: Delete stubs made redundant by 3-arg AC_DEFINE. + 2000-04-24 Kaveh R. Ghazi * Makefile.in (GCC_FOR_TARGET, GCC_CFLAGS, LIBGCC2_INCLUDES, diff --git a/gcc/acconfig.h b/gcc/acconfig.h index cfa12f4ed37..958843e480b 100644 --- a/gcc/acconfig.h +++ b/gcc/acconfig.h @@ -1,18 +1,9 @@ -/* Define if you can safely include both and . */ -#undef STRING_WITH_STRINGS - -/* Define if printf supports "%p". */ -#undef HAVE_PRINTF_PTR - /* Define if you want to enable namespaces (-fhonor-std) by default. */ #undef ENABLE_STD_NAMESPACE #if !defined(ENABLE_STD_NAMESPACE) # define ENABLE_STD_NAMESPACE 0 #endif -/* Define if you want to always select the new-abi for g++. */ -#undef ENABLE_NEW_GXX_ABI - /* Define if you want more run-time sanity checks. This one gets a grab bag of miscellaneous but relatively cheap checks. */ #undef ENABLE_CHECKING @@ -39,22 +30,12 @@ /* Define to 1 if NLS is requested. */ #undef ENABLE_NLS -/* Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts. */ -#undef ENABLE_WIN32_REGISTRY - -/* Define to be the last portion of registry key on windows hosts. */ -#undef WIN32_REGISTRY_KEY - /* Define as 1 if you have catgets and don't want to use GNU gettext. */ #undef HAVE_CATGETS /* Define as 1 if you have gettext and don't want to use GNU gettext. */ #undef HAVE_GETTEXT -/* Define if your compiler understands volatile. */ -#undef HAVE_VOLATILE - /* Define if your assembler supports specifying the maximum number of bytes to skip when using the GAS .p2align command. */ #undef HAVE_GAS_MAX_SKIP_P2ALIGN @@ -62,31 +43,9 @@ /* Define if your assembler supports .balign and .p2align. */ #undef HAVE_GAS_BALIGN_AND_P2ALIGN -/* Define if the assembler supports 64bit sparc. */ -#undef AS_SPARC64_FLAG - -/* Define if your assembler supports offsetable %lo(). */ -#undef HAVE_AS_OFFSETABLE_LO10 - -/* Define if your assembler supports .register. */ -#undef HAVE_AS_REGISTER_PSEUDO_OP - -/* Define if your assembler supports .subsection and .subsection -1 starts - emitting at the beginning of your section */ -#undef HAVE_GAS_SUBSECTION_ORDERING - -/* Define if your assembler supports .weak. */ -#undef HAVE_GAS_WEAK - -/* Define if your assembler supports .hidden. */ -#undef HAVE_GAS_HIDDEN - /* Define if your assembler uses the old HImode fild and fist notation. */ #undef HAVE_GAS_FILDS_FISTS -/* Define if you have a working header file. */ -#undef HAVE_INTTYPES_H - /* Define if your locale.h file contains LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -165,18 +124,4 @@ /* Whether environ must be declared. */ #undef NEED_DECLARATION_ENVIRON -/* Define to enable the use of a default assembler. */ -#undef DEFAULT_ASSEMBLER - -/* Define to enable the use of a default linker. */ -#undef DEFAULT_LINKER - -/* Define if host mkdir takes a single argument. */ -#undef MKDIR_TAKES_ONE_ARG - -/* Define to the name of the distribution. */ -#undef PACKAGE - -/* Define to the version of the distribution. */ -#undef VERSION @TOP@ diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 259317170b7..9ef6b64855c 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -5,7 +5,7 @@ AC_DEFUN(gcc_AC_HEADER_STRING, [AC_TRY_COMPILE([#include #include ], , gcc_cv_header_string=yes, gcc_cv_header_string=no)]) if test $gcc_cv_header_string = yes; then - AC_DEFINE(STRING_WITH_STRINGS) + AC_DEFINE(STRING_WITH_STRINGS, 1, [Define if you can safely include both and .]) fi ]) @@ -98,7 +98,7 @@ main() gcc_cv_func_printf_ptr=no) rm -f core core.* *.core]) if test $gcc_cv_func_printf_ptr = yes ; then - AC_DEFINE(HAVE_PRINTF_PTR) + AC_DEFINE(HAVE_PRINTF_PTR, 1, [Define if printf supports "%p".]) fi ]) @@ -172,7 +172,7 @@ AC_DEFUN(gcc_AC_C_VOLATILE, [AC_TRY_COMPILE(, [volatile int foo;], gcc_cv_c_volatile=yes, gcc_cv_c_volatile=no)]) if test $gcc_cv_c_volatile = yes ; then - AC_DEFINE(HAVE_VOLATILE) + AC_DEFINE(HAVE_VOLATILE, 1, [Define if your compiler understands volatile.]) fi ]) @@ -212,7 +212,7 @@ AC_DEFUN(gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG, #endif], [mkdir ("foo", 0);], gcc_cv_mkdir_takes_one_arg=no, gcc_cv_mkdir_takes_one_arg=yes)]) if test $gcc_cv_mkdir_takes_one_arg = yes ; then - AC_DEFINE(MKDIR_TAKES_ONE_ARG) + AC_DEFINE(MKDIR_TAKES_ONE_ARG, 1, [Define if host mkdir takes a single argument.]) fi ]) diff --git a/gcc/config.in b/gcc/config.in index 9a178dbd6c1..17fb30c753d 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1,19 +1,10 @@ /* config.in. Generated automatically from configure.in by autoheader. */ -/* Define if you can safely include both and . */ -#undef STRING_WITH_STRINGS - -/* Define if printf supports "%p". */ -#undef HAVE_PRINTF_PTR - /* Define if you want to enable namespaces (-fhonor-std) by default. */ #undef ENABLE_STD_NAMESPACE #if !defined(ENABLE_STD_NAMESPACE) # define ENABLE_STD_NAMESPACE 0 #endif -/* Define if you want to always select the new-abi for g++. */ -#undef ENABLE_NEW_GXX_ABI - /* Define if you want more run-time sanity checks. This one gets a grab bag of miscellaneous but relatively cheap checks. */ #undef ENABLE_CHECKING @@ -40,22 +31,12 @@ /* Define to 1 if NLS is requested. */ #undef ENABLE_NLS -/* Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts. */ -#undef ENABLE_WIN32_REGISTRY - -/* Define to be the last portion of registry key on windows hosts. */ -#undef WIN32_REGISTRY_KEY - /* Define as 1 if you have catgets and don't want to use GNU gettext. */ #undef HAVE_CATGETS /* Define as 1 if you have gettext and don't want to use GNU gettext. */ #undef HAVE_GETTEXT -/* Define if your compiler understands volatile. */ -#undef HAVE_VOLATILE - /* Define if your assembler supports specifying the maximum number of bytes to skip when using the GAS .p2align command. */ #undef HAVE_GAS_MAX_SKIP_P2ALIGN @@ -63,31 +44,9 @@ /* Define if your assembler supports .balign and .p2align. */ #undef HAVE_GAS_BALIGN_AND_P2ALIGN -/* Define if the assembler supports 64bit sparc. */ -#undef AS_SPARC64_FLAG - -/* Define if your assembler supports offsetable %lo(). */ -#undef HAVE_AS_OFFSETABLE_LO10 - -/* Define if your assembler supports .register. */ -#undef HAVE_AS_REGISTER_PSEUDO_OP - -/* Define if your assembler supports .subsection and .subsection -1 starts - emitting at the beginning of your section */ -#undef HAVE_GAS_SUBSECTION_ORDERING - -/* Define if your assembler supports .weak. */ -#undef HAVE_GAS_WEAK - -/* Define if your assembler supports .hidden. */ -#undef HAVE_GAS_HIDDEN - /* Define if your assembler uses the old HImode fild and fist notation. */ #undef HAVE_GAS_FILDS_FISTS -/* Define if you have a working header file. */ -#undef HAVE_INTTYPES_H - /* Define if your locale.h file contains LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -166,20 +125,6 @@ /* Whether environ must be declared. */ #undef NEED_DECLARATION_ENVIRON -/* Define to enable the use of a default assembler. */ -#undef DEFAULT_ASSEMBLER - -/* Define to enable the use of a default linker. */ -#undef DEFAULT_LINKER - -/* Define if host mkdir takes a single argument. */ -#undef MKDIR_TAKES_ONE_ARG - -/* Define to the name of the distribution. */ -#undef PACKAGE - -/* Define to the version of the distribution. */ -#undef VERSION /* Define if using alloca.c. */ #undef C_ALLOCA @@ -419,12 +364,68 @@ /* Define if you have the i library (-li). */ #undef HAVE_LIBI +/* Define to enable the use of a default linker. */ +#undef DEFAULT_LINKER + +/* Define to enable the use of a default assembler. */ +#undef DEFAULT_ASSEMBLER + +/* Define if your compiler understands volatile. */ +#undef HAVE_VOLATILE + +/* Define if you can safely include both and . */ +#undef STRING_WITH_STRINGS + +/* Define if you have a working header file. */ +#undef HAVE_INTTYPES_H + /* Define if enumerated bitfields are treated as unsigned values. */ #undef ENUM_BITFIELDS_ARE_UNSIGNED +/* Define if printf supports %p. */ +#undef HAVE_PRINTF_PTR + /* Define if mmap can get us zeroed pages from /dev/zero. */ #undef HAVE_MMAP_ANYWHERE /* Define if read-only mmap of a plain file works. */ #undef HAVE_MMAP_FILE +/* Define if host mkdir takes a single argument. */ +#undef MKDIR_TAKES_ONE_ARG + +/* Define to the name of the distribution. */ +#undef PACKAGE + +/* Define to the version of the distribution. */ +#undef VERSION + +/* Define to 1 if installation paths should be looked up in Windows32 + Registry. Ignored on non windows32 hosts. */ +#undef ENABLE_WIN32_REGISTRY + +/* Define to be the last portion of registry key on windows hosts. */ +#undef WIN32_REGISTRY_KEY + +/* Define if your assembler supports .subsection and .subsection -1 starts + emitting at the beginning of your section. */ +#undef HAVE_GAS_SUBSECTION_ORDERING + +/* Define if your assembler supports .weak. */ +#undef HAVE_GAS_WEAK + +/* Define if your assembler supports .hidden. */ +#undef HAVE_GAS_HIDDEN + +/* Define if your assembler supports .register. */ +#undef HAVE_AS_REGISTER_PSEUDO_OP + +/* Define if the assembler supports 64bit sparc. */ +#undef AS_SPARC64_FLAG + +/* Define if your assembler supports offsetable %lo(). */ +#undef HAVE_AS_OFFSETABLE_LO10 + +/* Define if you want to always select the new-abi for g++. */ +#undef ENABLE_NEW_GXX_ABI + diff --git a/gcc/configure.in b/gcc/configure.in index ccb9d9f512a..aad3105e3a3 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -101,7 +101,7 @@ if test x"${DEFAULT_LINKER+set}" = x"set"; then elif $DEFAULT_LINKER -v < /dev/null 2>&1 | grep GNU > /dev/null; then gnu_ld_flag=yes fi - AC_DEFINE_UNQUOTED(DEFAULT_LINKER,"$DEFAULT_LINKER") + AC_DEFINE_UNQUOTED(DEFAULT_LINKER,"$DEFAULT_LINKER", [Define to enable the use of a default linker.]) fi # With GNU as @@ -119,7 +119,7 @@ if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then elif $DEFAULT_ASSEMBLER -v < /dev/null 2>&1 | grep GNU > /dev/null; then gas_flag=yes fi - AC_DEFINE_UNQUOTED(DEFAULT_ASSEMBLER,"$DEFAULT_ASSEMBLER") + AC_DEFINE_UNQUOTED(DEFAULT_ASSEMBLER,"$DEFAULT_ASSEMBLER", [Define to enable the use of a default assembler.]) fi # With stabs @@ -365,7 +365,7 @@ AC_CACHE_VAL(gcc_cv_header_inttypes_h, gcc_cv_header_inttypes_h=no)]) AC_MSG_RESULT($gcc_cv_header_inttypes_h) if test $gcc_cv_header_inttypes_h = yes; then - AC_DEFINE(HAVE_INTTYPES_H) + AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if you have a working header file.]) fi # @@ -3974,8 +3974,8 @@ changequote([,])dnl # Internationalization PACKAGE=gcc VERSION="$gcc_version" -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define to the name of the distribution.]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define to the version of the distribution.]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -4001,7 +4001,8 @@ AC_ARG_ENABLE(win32-registry, AC_MSG_CHECKING(whether windows registry support is requested) if test x$enable_win32_registry != xno; then - AC_DEFINE(ENABLE_WIN32_REGISTRY) + AC_DEFINE(ENABLE_WIN32_REGISTRY, 1, [Define to 1 if installation paths should be looked up in Windows32 + Registry. Ignored on non windows32 hosts.]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -4025,7 +4026,7 @@ esac if test x$enable_win32_registry != xno; then AC_MSG_CHECKING(registry key on windows hosts) - AC_DEFINE_UNQUOTED(WIN32_REGISTRY_KEY, "$gcc_cv_win32_registry_key") + AC_DEFINE_UNQUOTED(WIN32_REGISTRY_KEY, "$gcc_cv_win32_registry_key", [Define to be the last portion of registry key on windows hosts.]) AC_MSG_RESULT($gcc_cv_win32_registry_key) fi @@ -4335,7 +4336,8 @@ EOF : else gcc_cv_as_subsections="working .subsection -1" - AC_DEFINE(HAVE_GAS_SUBSECTION_ORDERING) + AC_DEFINE(HAVE_GAS_SUBSECTION_ORDERING, 1, [Define if your assembler supports .subsection and .subsection -1 starts + emitting at the beginning of your section.]) fi fi fi @@ -4350,7 +4352,7 @@ if test x$gcc_cv_as != x; then # Check if we have .weak echo " .weak foobar" > conftest.s if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then - AC_DEFINE(HAVE_GAS_WEAK) + AC_DEFINE(HAVE_GAS_WEAK, 1, [Define if your assembler supports .weak.]) gcc_cv_as_weak="yes" fi rm -f conftest.s conftest.o conftest.nm1 conftest.nm2 @@ -4364,7 +4366,7 @@ if test x$gcc_cv_as != x; then echo " .hidden foobar" > conftest.s echo "foobar:" >> conftest.s if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then - AC_DEFINE(HAVE_GAS_HIDDEN) + AC_DEFINE(HAVE_GAS_HIDDEN, 1, [Define if your assembler supports .hidden.]) gcc_cv_as_hidden="yes" fi rm -f conftest.s conftest.o conftest.nm1 conftest.nm2 @@ -4388,7 +4390,7 @@ case "$target" in fi ]) if test "x$gcc_cv_as_register_pseudo_op" = xyes; then - AC_DEFINE(HAVE_AS_REGISTER_PSEUDO_OP) + AC_DEFINE(HAVE_AS_REGISTER_PSEUDO_OP, 1, [Define if your assembler supports .register.]) fi case "$tm_file" in @@ -4420,7 +4422,7 @@ changequote(, ) dep_tmake_file=`echo " $dep_tmake_file " | sed -e 's, [^ ]*/config/sparc/t-sol2-64 , ,' -e 's,^ ,,' -e 's, $,,'` changequote([, ]) else - AC_DEFINE_UNQUOTED(AS_SPARC64_FLAG, "$gcc_cv_as_flags64") + AC_DEFINE_UNQUOTED(AS_SPARC64_FLAG, "$gcc_cv_as_flags64", [Define if the assembler supports 64bit sparc.]) fi ;; *) gcc_cv_as_flags64=${gcc_cv_as_flags64-no} @@ -4451,7 +4453,7 @@ changequote([, ]) fi ]) if test "x$gcc_cv_as_offsetable_lo10" = xyes; then - AC_DEFINE(HAVE_AS_OFFSETABLE_LO10) + AC_DEFINE(HAVE_AS_OFFSETABLE_LO10, 1, [Define if your assembler supports offsetable %lo().]) fi fi ;; @@ -4570,7 +4572,7 @@ AC_ARG_ENABLE(new-gxx-abi, select the new abi for g++. You must select an ABI at configuration time, so that the correct runtime support is built. You cannot mix ABIs.], -[AC_DEFINE(ENABLE_NEW_GXX_ABI) +[AC_DEFINE(ENABLE_NEW_GXX_ABI, 1, [Define if you want to always select the new-abi for g++.]) GXX_ABI_FLAG='-fnew-abi' echo "Building a new-abi g++ compiler." ]) -- 2.30.2