[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile lame.c

[Jeff Cohen]

Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame:

Makefile updated: 1.1 -> 1.2
lame.c updated: 1.1 -> 1.2
---
Log message:

Fix for src != obj
Don't include header files from within a function.


---
Diffs of the changes:  (+4 -4)

 Makefile |    2 +-
 lame.c   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.1 llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.1	Tue Jan  9 17:44:34 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile	Thu Mar 29 11:53:54 2007
@@ -3,5 +3,5 @@
 PROG     = consumer-lame
 CPPFLAGS = -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE
 LDFLAGS  = -lm
-RUN_OPTIONS = -S large.wav output_large.mp3
+RUN_OPTIONS = -S large.wav $(PROJ_SRC_DIR)/output_large.mp3
 include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c
diff -u llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c:1.1 llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c:1.1	Tue Jan  9 17:44:35 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c	Thu Mar 29 11:53:54 2007
@@ -1187,6 +1187,9 @@
 }
 
 
+#ifdef __FreeBSD__
+# include <floatingpoint.h>
+#endif
 
 
 /* initialize mp3 encoder */
@@ -1196,8 +1199,6 @@
   /*
    *  Disable floating point exepctions
    */
-#ifdef __FreeBSD__
-# include <floatingpoint.h>
   {
   /* seet floating point mask to the Linux default */
   fp_except_t mask;
@@ -1206,7 +1207,6 @@
   fpsetmask(mask & ~(FP_X_INV|FP_X_DZ));
   /*  fprintf(stderr,"FreeBSD mask is 0x%x\n",mask); */
   }
-#endif
 #if defined(__riscos__) && !defined(ABORTFP)
   /* Disable FPE's under RISC OS */
   /* if bit is set, we disable trapping that error! */