Changeset: dd94de13cf35 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd94de13cf35
Modified Files:
NT/rules.msc
configure.ag
gdk/Makefile.ag
Branch: Aug2011
Log Message:
clean-up: get rid of (hopefully) obsolete NO_INLINE_CFLAGS
diffs (81 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -196,10 +196,8 @@
ZI = -ZI
!ENDIF
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG
-RTC1 $(ZI)
-NO_INLINE_CFLAGS =
!ELSE
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
-NO_INLINE_CFLAGS = -Od -Ob0gysi-
!ENDIF
CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -524,7 +524,6 @@
dnl i.e., at the end of this configure[.ag] script.
dnl Only GNU (gcc) and Intel ([ie]cc/[ie]cpc on Linux) are done so far.
: ${X_CFLAGS=} # initialize to empty if not set
-NO_INLINE_CFLAGS=""
GCC_SWIG_CFLAGS=""
ICC_SWIG_CFLAGS=""
if test "x$enable_strict" = xyes; then
@@ -732,9 +731,6 @@
CFLAGS="$CFLAGS -fno-strict-aliasing"
;;
esac
-
-
- NO_INLINE_CFLAGS="-fno-inline -fno-inline-functions"
;;
-*icc*-linux*|-*ecc*-linux*)
dnl Intel ([ie]cc/[ie]cpc on Linux)
@@ -807,8 +803,6 @@
dnl as locally as possbile via "-wd869 -wd177 -wd310"
dnl (see also clients/perl/Cimpl/Makefile.ag).
ICC_SWIG_CFLAGS="$ICC_SWIG_CFLAGS -wd869 -wd177 -wd310"
-
- NO_INLINE_CFLAGS="-fno-inline -fno-inline-functions"
;;
-*pgcc*-linux*)
dnl Portland Group (PGI) (pgcc/pgCC on Linux)
@@ -1223,7 +1217,6 @@
LDFLAGS="$LDFLAGS -IPA"
;;
*aix*-) CFLAGS="$CFLAGS -O3"
- NO_INLINE_CFLAGS="$NO_INLINE_CFLAGS -qnooptimize"
;;
*-*-*-) CFLAGS="$CFLAGS -O2"
;;
@@ -1273,7 +1266,6 @@
# ia64-*-*-10.*) CFLAGS="$CFLAGS -restrict
"
# ia64-*-*-10.*) CFLAGS="$CFLAGS -unroll
"
# ia64-*-*-10.*) CFLAGS="$CFLAGS
-mcpu=itanium2"
- NO_INLINE_CFLAGS="$NO_INLINE_CFLAGS -O0"
;;
i*86-*-*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -ipo
-ipo_obj -tpp6 -axiMKW";;
@@ -1307,7 +1299,6 @@
else
AC_MSG_RESULT([no])
fi
-AC_SUBST(NO_INLINE_CFLAGS)
AC_SUBST(GCC_SWIG_CFLAGS)
AC_SUBST(ICC_SWIG_CFLAGS)
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -19,9 +19,6 @@
INCLUDES = ../common/options ../common/stream ../common/utils
$(valgrind_CFLAGS)
-gdk_scanselect_CFLAGS = $(NO_INLINE_CFLAGS)
-# gdk_relop.mx
-
EXTRA_DIST = gdk_scanselect_defs.mx gdk_private.h gdk_delta.h gdk_logger.h
gdk_posix.h gdk_system.h gdk_tm.h gdk_storage.h
lib_gdk = {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
