From 3e52379a33d9e86099f0a6b5de7917d91756a7bd Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Sun, 6 May 2007 14:04:29 +0000 Subject: [PATCH] revert changes from autoheader that were not intended [r13669] --- Makefile.in | 7 +- config.h.in | 103 +++++++++++++++--------------- configure.in | 36 +++++++---- ir/be/test/queens-handoptimized.c | 19 ++++++ 4 files changed, 101 insertions(+), 64 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8c1b41a3..a8ad6ffe6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,8 @@ enable_statistics := @enable_statistics@ enable_external_effects := @enable_external_effects@ # do we want to use the libcore for debug and ADT support enable_libcore := @enable_libcore@ +enable_backend := @enable_backend@ +backends := @BACKENDS@ LIBCORE_CFLAGS = @LIBCORE_CFLAGS@ LIBCORE_LIBS = @LIBCORE_LFLAGS@ @@ -40,9 +42,12 @@ build_subdirs := ir/adt ir/net ir/debug ir/tv ir/common ir/ident ir/ir \ ir/opt ir/tr ir/ana ir/stat ir/ana2 ir/arch ir/lower \ $(plugin_subdirs) -ifeq (@enable_external_effects@,yes) +ifeq ($(enable_external_effects),yes) build_subdirs += ir/external endif +ifeq ($(enable_backend),yes) +build_subdirs += ir/be $(addprefix ir/be/, $(backends)) +endif build_add_lib := libfirm_xmalloc.a diff --git a/config.h.in b/config.h.in index 803916327..1478e95e0 100644 --- a/config.h.in +++ b/config.h.in @@ -1,21 +1,14 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - - - -/* define to enable debugging stuff */ -#undef DEBUG_libfirm - -/* enable heap analysis */ -#undef DO_HEAPANALYSIS - -/* enable firm hooks */ -#undef FIRM_ENABLE_HOOKS - -/* enable wchar_t support for identifiers */ -#undef FIRM_ENABLE_WCHAR - -/* enable statistics code */ -#undef FIRM_STATISTICS +/* + * Project: libFIRM + * File name: acconfig.h + * Purpose: + * Author: Till Riedel + * Modified by: + * Created: + * CVS-ID: $Id$ + * Copyright: (c) 2002-2003 Universität Karlsruhe + * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + */ /* Define to 1 if you have the header file. */ #undef HAVE_ALLOCA_H @@ -26,17 +19,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_JNI_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBXML_PARSER_H - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#undef HAVE_LONG_DOUBLE - -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ -#undef HAVE_LONG_DOUBLE_WIDER - /* Define to 1 if you have the header file. */ #undef HAVE_MATH_H @@ -67,9 +49,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* define to disable asserts */ -#undef NDEBUG - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -88,35 +67,57 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* use inlining */ -#undef USE_INLINING - -/* compile with ilp solver support */ -#undef WITH_ILP - -/* compile with jvm support */ -#undef WITH_JVM +/* ---------------snip, snip ---------------------- */ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN -/* we use gnu extensions */ -#undef _GNU_SOURCE +/* Define to 1 if long double works and has more range or precision than + double. */ +#undef HAVE_LONG_DOUBLE -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const +/* Define to 1 for heap analysis support */ +#undef DO_HEAPANALYSIS + +/* Define the right volatile token */ +#undef volatile -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus +/* Define the right inline token */ #undef inline -#endif -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#undef volatile +/* Define the right const token */ +#undef const + +/* define to 1 to enable debugging stuff. */ +#undef DEBUG_libfirm + +/* define to 1 to use the libcore */ +#undef WITH_LIBCORE + +/* define to 1 to use the ILP solver */ +#undef WITH_ILP +/* define to 1 to enable Firm to call the JVM */ +#undef WITH_JVM + +/* define to 1 if we use gnu extensions */ +#undef _GNU_SOURCE + +/* define to 1 to have wchar_t support for identifiers */ +#define FIRM_ENABLE_WCHAR + +/* Define to disable assertion checking. */ +#undef NDEBUG + +/* undef to disable inlining */ +#undef USE_INLINING + +/* Define to 1 if Firm hooks are activated */ +#undef FIRM_ENABLE_HOOKS + +/* Define to 1 if Firm statistics are activated */ +#undef FIRM_STATISTICS #ifdef USE_INLINING #define INLINE inline diff --git a/configure.in b/configure.in index cd25b449f..8fe2a6272 100644 --- a/configure.in +++ b/configure.in @@ -161,18 +161,6 @@ AC_ARG_ENABLE([libcore], [AS_HELP_STRING([--disable-libcore], [disable libcore support])], [enable_libcore="$enableval"],[enable_libcore="yes"]) -#if test "$enable_libcore" = yes; then -# AC_MSG_CHECKING([for libcore]) -# PKG_CHECK_MODULES([libcore], -# LIBS="$LIBS -lcore" -# AC_LINK_IFELSE( -# AC_LANG_PROGRAM([#include ], -# [lc_opts_init("", 0, "", 1, 0)]), -# [], -# [AC_MSG_ERROR( -# [Couldn't build libcore testprogramm. Check config.log for details])]) -# AC_DEFINE([WITH_LIBCORE], [], [compile with libcore support]) -#fi AC_SUBST([enable_libcore]) dnl enable ILP solver support @@ -216,6 +204,14 @@ AC_ARG_ENABLE([external-effects], AC_SUBST(enable_external_effects) +dnl disable backend +dnl --------------- +AC_ARG_ENABLE([backend], +[AS_HELP_STRING([--disable-backend], [disable backends])], +[enable_backend="$enableval"], [enable_backend="yes"]) + +AC_SUBST(enable_backend) + dnl Checks for programs. dnl ==================== @@ -408,6 +404,7 @@ dnl Error messaging dnl =============== +dnl Output results AC_CONFIG_FILES([ Makefile MakeRules @@ -438,11 +435,26 @@ AC_CONFIG_COMMANDS([stamp-h], [touch stamp-h]) dnl snip the lower part of config.h and put it to ir/config/firm_config.h AC_CONFIG_COMMANDS([firm_config.h], [awk -f ${ac_top_srcdir}/filter.awk < ${ac_top_builddir}config.h > ${ac_top_builddir}ir/config/firm_config.h]) + +BACKENDS="" +if test "$enable_backend" == yes; then + BACKENDS="arm ia32 mips ppc32" +fi +AC_SUBST([BACKENDS]) + +if test "$BACKENDS"; then + AC_CONFIG_FILES([ir/be/Makefile]) + for backend in $BACKENDS; do + AC_CONFIG_FILES([ir/be/$backend/Makefile]) + done +fi + AC_OUTPUT dnl output summary of firm configuration echo "" echo "firm configuration summary:" +echo " backends $BACKENDS" echo " profiling $enable_profile_libfirm" echo " debug/verifiers $enable_debug_libfirm" echo " assertions $enable_assert" diff --git a/ir/be/test/queens-handoptimized.c b/ir/be/test/queens-handoptimized.c index fe7b4ed4f..095dd150a 100644 --- a/ir/be/test/queens-handoptimized.c +++ b/ir/be/test/queens-handoptimized.c @@ -23,6 +23,8 @@ typedef int boolean; #define true 1 #define false 0 +#define static + //static int *row; // queen in column c is at row[c] @@ -38,6 +40,22 @@ static inline boolean place_ok (int i, const int *r, int ri) { int j = 0; boolean res; +#if 0 + if(0 >= i) + return true; + + do { + int rj = r[j]; + if ((rj == ri) || ((myabs(ri-rj)) == (i-j))) { + res = false; + return(res); + } + j = j+1; + } while(j < i); + + res = true; + return(res); +#else while (j < i) { int rj = r[j]; if ((rj == ri) || ((myabs(ri-rj)) == (i-j))) { @@ -49,6 +67,7 @@ static inline boolean place_ok (int i, const int *r, int ri) { res = true; return(res); +#endif } int solve (int n) { -- 2.20.1