From 43f30739b9d2677d4ad9fbe9685035583a9267c4 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 11 Sep 2003 19:57:59 +0000 Subject: Remove all locally-defined optimization flags Original commit message from CVS: Remove all locally-defined optimization flags --- configure.ac | 25 ------------------------- ext/sdl/Makefile.am | 2 +- 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/cdxaparse/Makefile.am | 2 +- gst/modplug/libmodplug/Makefile.am | 2 +- gst/mpeg1sys/Makefile.am | 2 +- gst/mpeg1videoparse/Makefile.am | 2 +- gst/mpeg2sub/Makefile.am | 8 +------- gst/mpegaudioparse/Makefile.am | 6 ++---- gst/smooth/Makefile.am | 2 +- gst/smpte/Makefile.am | 2 +- 15 files changed, 15 insertions(+), 64 deletions(-) diff --git a/configure.ac b/configure.ac index 0432ddf4..c3274bee 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/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 17cd3880..1fb69bba 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstsdlvideosink.la libgstsdlvideosink_la_SOURCES = sdlvideosink.c ## FIXME I have my doubts about these opti flags -libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) $(GST_OPT_CFLAGS) +libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index fa9abaf4..4f95f4ef 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 ea06100d..aea5a1f3 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 7edbd6c7..94ebea5b 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 6e235202..05ab6894 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 86a4d4e9..e45c0051 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/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index 0c19c123..411579cc 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -7,6 +7,6 @@ libgstcdxaparse_la_SOURCES = gstcdxaparse.c noinst_HEADERS = \ gstcdxaparse.h -libgstcdxaparse_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstcdxaparse_la_CFLAGS = $(GST_CFLAGS) libgstcdxaparse_la_LIBADD = libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am index 939014da..b900a60d 100644 --- a/gst/modplug/libmodplug/Makefile.am +++ b/gst/modplug/libmodplug/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmodplug.la -libmodplug_la_CXXFLAGS = $(GST_FNOEXCEPTIONS_CFLAGS) $(GST_CFLAGS) $(GST_FFASTMATH_CFLAGS) -D_REENTRANT +libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT libmodplug_la_LDFLAGS = -module -avoid-version libmodplug_la_SOURCES = tables.cpp \ sndmix.cpp \ diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index 0bf31a86..7bc1dda7 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstmpeg1systemencode.la libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \ buffer.c \ systems.c -libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) +libgstmpeg1systemencode_la_CFLAGS = $(GST_CFLAGS) libgstmpeg1systemencode_la_LIBADD = libgstmpeg1systemencode_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpeg1videoparse/Makefile.am b/gst/mpeg1videoparse/Makefile.am index fea71428..b8d1739b 100644 --- a/gst/mpeg1videoparse/Makefile.am +++ b/gst/mpeg1videoparse/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstmp1videoparse.la libgstmp1videoparse_la_SOURCES = gstmp1videoparse.c -libgstmp1videoparse_la_CFLAGS = $(GST_CFLAGS) -O3 $(FOMIT_FRAME_POINTER) $(GST_FFASTMATH_CFLAGS) +libgstmp1videoparse_la_CFLAGS = $(GST_CFLAGS) libgstmp1videoparse_la_LIBADD = libgstmp1videoparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am index fc1c39dd..ff2ad1a6 100644 --- a/gst/mpeg2sub/Makefile.am +++ b/gst/mpeg2sub/Makefile.am @@ -3,13 +3,7 @@ plugin_LTLIBRARIES = libgstmpeg2subt.la libgstmpeg2subt_la_SOURCES = gstmpeg2subt.c -if HAVE_CPU_I386 -ARCHCFLAGS = -mcpu=i486 -else -ARCHCFLAGS = -endif - -libgstmpeg2subt_la_CFLAGS = -O3 $(ARCHCFLAGS) $(GST_FSCHEDULE_CFLAGS) $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) +libgstmpeg2subt_la_CFLAGS = $(GST_CFLAGS) libgstmpeg2subt_la_LIBADD = libgstmpeg2subt_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index ece03b85..ee22c43e 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -3,17 +3,15 @@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c -# FIXME is this useful? -libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) +libgstmpegaudioparse_la_CFLAGS = $(GST_CFLAGS) libgstmpegaudioparse_la_LIBADD = libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmp3types_la_SOURCES = gstmp3types.c -libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) +libgstmp3types_la_CFLAGS = $(GST_CFLAGS) libgstmp3types_la_LIBADD = libgstmp3types_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmpegaudioparse.h EXTRA_DIST = README -# FIXME is this needed? diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 3d0143e0..c2dedd91 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstsmooth.la libgstsmooth_la_SOURCES = gstsmooth.c -libgstsmooth_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) +libgstsmooth_la_CFLAGS = $(GST_CFLAGS) libgstsmooth_la_LIBADD = libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index 00d06bbc..26723c8d 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -5,7 +5,7 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c noinst_HEADERS = gstsmpte.h gstmask.h paint.h -libgstsmpte_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstsmpte_la_CFLAGS = $(GST_CFLAGS) libgstsmpte_la_LIBADD = libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -- cgit v1.2.1