diff options
| author | lloyd <[email protected]> | 2009-11-13 22:51:01 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-13 22:51:01 +0000 |
| commit | 0972ba645555b0bf283eba71e4b9edacdf424eba (patch) | |
| tree | ec5c59370b7ded3e0cc4e057601bad9df0d5d815 /src/build-data/cc | |
| parent | 1860807e4ed230f3aeea0831ec180e55d2f0eaa4 (diff) | |
| parent | be9b28137b0de48d3f86c96655fa1bbc5c70973c (diff) | |
propagate from branch 'net.randombit.botan' (head ac888e57b614c623590d79ab615353ad7c76ef68)
to branch 'net.randombit.botan.c++0x' (head 9bf78ed7e2521a328f6db7acbc1cd81b07718230)
Diffstat (limited to 'src/build-data/cc')
| -rw-r--r-- | src/build-data/cc/gcc.txt | 17 | ||||
| -rw-r--r-- | src/build-data/cc/icc.txt | 10 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 724316690..c4b5b9fbc 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -14,8 +14,8 @@ lang_flags "-D_REENTRANT -ansi -Wno-long-long -std=c++0x" warning_flags "-W -Wall" #warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" -lib_opt_flags "-O2" -check_opt_flags "-O" +lib_opt_flags "-O3" +check_opt_flags "-O2" shared_flags "-fPIC" debug_flags "-g" no_debug_flags "-finline-functions" @@ -42,15 +42,14 @@ beos -> "ld -shared -h $(SONAME)" <mach_opt> # Specializations first (they don't need to be, just clearer) i386 -> "-mtune=i686 -momit-leaf-frame-pointer" -r10000 -> "-mips4" -alpha-ev67 -> "-mcpu=ev6" # FIXME: GCC 3.1 and on has -march=ev67 -alpha-ev68 -> "-mcpu=ev6" -alpha-ev7 -> "-mcpu=ev6" ppc601 -> "-mpowerpc -mcpu=601" -sparc64-ultra3 -> "-mcpu=v9 -mtune=ultrasparc3" -em64t -> "-march=nocona -momit-leaf-frame-pointer" +# Until GCC gets -march support for these models +nehalem -> "-march=core2 -msse4.1 -msse4.2" +westmere -> "-march=core2 -maes -msse4.1 -msse4.2" cellppu -> "" +alpha-ev68 -> "-mcpu=ev6" +alpha-ev7 -> "-mcpu=ev6" # Default family options (SUBMODEL is substitued with the real submodel) # Anything after the quotes is what should be *removed* from the submodel name @@ -64,7 +63,7 @@ hppa -> "-march=SUBMODEL" hppa m68k -> "-mSUBMODEL" hitachi-sh -> "-mSUBMODEL" hitachi-sh sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- -sparc64 -> "-mcpu=v9 -mtune=ultrasparc" +sparc64 -> "-mcpu=v9 -mtune=SUBMODEL" mips32 -> "-mips1 -mcpu=SUBMODEL" mips32- mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- ppc -> "-mcpu=SUBMODEL" ppc diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index 628a59e2d..b5cad542c 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -24,10 +24,14 @@ dll_export_flags "" makefile_style unix <mach_opt> -pentium3 -> "-march=pentium3" -pentium4 -> "-march=pentium4" +pentium3 -> "-march=pentium3" +pentium4 -> "-march=pentium4" pentium-m -> "-march=pentium3" -core2 -> "-march=core2" +core2 -> "-march=core2" + +# ICC 11.1 doesn't have native Nehalem or Westmere support +nehalem -> "-march=core2" +westmere -> "-march=core2" </mach_opt> <so_link_flags> |