diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-02-12 22:59:56 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-02-12 22:59:56 -0800 |
| commit | 55cc5d40ec16ea0639046ff1487636ba618d0e09 (patch) | |
| tree | 14676665e6b850191b444ab86123d6e709746fcf | |
| parent | d58ee30d172f6848edb1b3b225cc90c2143dc750 (diff) | |
| download | spike-55cc5d40ec16ea0639046ff1487636ba618d0e09.zip spike-55cc5d40ec16ea0639046ff1487636ba618d0e09.tar.gz spike-55cc5d40ec16ea0639046ff1487636ba618d0e09.tar.bz2 | |
migrate to c++11
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | riscv/common.h | 2 |
3 files changed, 2 insertions, 4 deletions
@@ -4008,7 +4008,7 @@ fi CFLAGS="-Wall -O2 -Wno-unused" -CXXFLAGS="-Wall -O2 -Wno-pmf-conversions" +CXXFLAGS="-Wall -O2 -std=c++0x -Wno-pmf-conversions" #------------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 4a12469..94d9980 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_HEADER_STDC #------------------------------------------------------------------------- AC_SUBST([CFLAGS], ["-Wall -O2 -Wno-unused"]) -AC_SUBST([CXXFLAGS],["-Wall -O2 -Wno-pmf-conversions"]) +AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x -Wno-pmf-conversions"]) #------------------------------------------------------------------------- # MCPPBS subproject list diff --git a/riscv/common.h b/riscv/common.h index 801baf8..03f8c8e 100644 --- a/riscv/common.h +++ b/riscv/common.h @@ -1,8 +1,6 @@ #ifndef _RISCV_COMMON_H #define _RISCV_COMMON_H -#define static_assert(x) switch (x) case 0: case (x): - #define likely(x) __builtin_expect(x, 1) #define unlikely(x) __builtin_expect(x, 0) |