From ebb066d86147ac78aa4eaa7590e08e281b46fc2e Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 11 Sep 2003 19:58:00 +0000 Subject: [PATCH] Remove all locally-defined optimization flags Original commit message from CVS: Remove all locally-defined optimization flags --- configure.ac | 25 ------------------------- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/idct/Makefile.am | 2 +- gst-libs/gst/resample/Makefile.am | 18 +----------------- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/video/Makefile.am | 2 +- gst/audioscale/Makefile.am | 2 +- gst/videoscale/Makefile.am | 2 +- 8 files changed, 7 insertions(+), 48 deletions(-) diff --git a/configure.ac b/configure.ac index 0432ddf4ff..c3274bee1c 100644 --- a/configure.ac +++ b/configure.ac @@ -49,13 +49,6 @@ if test "x$GST_WALL" = "xyes"; then if test "x$GST_CVS" = "xyes"; then AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR") fi - - dnl set gcc-style optimization flags if using the gnu compiler. - GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops" - GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions" - GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math" - GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2" - GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions" fi dnl determine c++ compiler @@ -1107,17 +1100,6 @@ if test "x$USE_DEBUG" = xyes; then GST_CFLAGS="$GST_CFLAGS -g" fi -if test "x$USE_PROFILING" = xyes; then -dnl CFLAGS="$CFLAGS -pg -fprofile-arcs" - FOMIT_FRAME_POINTER="" -else - FOMIT_FRAME_POINTER="-fomit-frame-pointer" -fi - -dnl -dnl AC_SUBST(FOMIT_FRAME_POINTER) -dnl - dnl ############################# dnl # Set automake conditionals # dnl ############################# @@ -1149,16 +1131,9 @@ AM_CONDITIONAL(HAVE_RAW1394, test "x$HAVE_RAW1394" = "xyes") dnl prefer internal headers to already installed ones GST_CFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GST_ERROR" -GST_OPT_CFLAGS="$GST_FINLINE_CFLAGS $GST_FFASTMATH_CFLAGS" AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) -AC_SUBST(GST_FUNROLL_CFLAGS) -AC_SUBST(GST_FINLINE_CFLAGS) -AC_SUBST(GST_FFASTMATH_CFLAGS) -AC_SUBST(GST_FSCHEDULE_CFLAGS) -AC_SUBST(GST_FNOEXCEPTIONS_CFLAGS) -AC_SUBST(GST_OPT_CFLAGS) dnl ########################### dnl # Configure external libs # diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index fa9abaf472..4f95f4efdf 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -8,5 +8,5 @@ libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio libgstaudioinclude_HEADERS = audio.h audioclock.h libgstaudio_la_LIBADD = -libgstaudio_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstaudio_la_CFLAGS = $(GST_CFLAGS) libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index ea06100d91..aea5a1f37e 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -28,5 +28,5 @@ noinst_HEADERS = dct.h libgstidct_la_LIBADD = -libgstidct_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstidct_la_CFLAGS = $(GST_CFLAGS) libgstidct_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 7edbd6c7fe..94ebea5bbc 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -2,19 +2,9 @@ librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstresample.la -if HAVE_CPU_I386 -ARCHCFLAGS = -march=i486 -else -if HAVE_CPU_PPC -ARCHCFLAGS = -Wa,-m7400 -else -ARCHCFLAGS = -endif -endif - libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h libgstresample_la_LIBADD = -libgstresample_la_CFLAGS = $(GST_CFLAGS) $(GST_FFASTMATH_CFLAGS) $(ARCHCFLAGS) +libgstresample_la_CFLAGS = $(GST_CFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample @@ -22,9 +12,3 @@ libgstresampleinclude_HEADERS = resample.h noinst_HEADERS = private.h -#check_PROGRAMS = test -#test_SOURCES = test.c -#test_LDADD = libresample.la - - - diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 6e235202d0..05ab689461 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -8,5 +8,5 @@ libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff libgstriffinclude_HEADERS = riff.h libgstriff_la_LIBADD = -libgstriff_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) +libgstriff_la_CFLAGS = $(GST_CFLAGS) libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 86a4d4e997..e45c00511e 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -8,5 +8,5 @@ libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video libgstvideoinclude_HEADERS = video.h libgstvideo_la_LIBADD = -libgstvideo_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstvideo_la_CFLAGS = $(GST_CFLAGS) libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am index 1a71e10ca9..bd54146d15 100644 --- a/gst/audioscale/Makefile.am +++ b/gst/audioscale/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstaudioscale.la libgstaudioscale_la_SOURCES = gstaudioscale.c -libgstaudioscale_la_CFLAGS = $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstaudioscale_la_CFLAGS = $(GST_CFLAGS) libgstaudioscale_la_LIBADD = libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index 79adf6a42b..33cc3f95bb 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -13,7 +13,7 @@ libgstvideoscale_la_SOURCES = \ gstvideoscale.c \ videoscale.c \ $(ARCHSRCS) -libgstvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) +libgstvideoscale_la_CFLAGS = $(GST_CFLAGS) libgstvideoscale_la_LIBADD = libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)