diff options
author | lloyd <[email protected]> | 2007-12-24 20:57:31 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2007-12-24 20:57:31 +0000 |
commit | eff9a5f8056f9556d28902871e129a6f2f076e51 (patch) | |
tree | 2c0a218510837e6ff112e1fa709b6e6c4a3f4e49 /misc/config | |
parent | 1ea96f920373b411ae08c9c9141845f2e4a96efc (diff) | |
parent | 769e503fd8e4cf0f3072e04afffb61db5b48d777 (diff) |
merge of '3d9e9476c5b2a2ee125eee7e0dd10bfe460d0546'
and '9fe0310805932b889bdfa17c9213f2b97d47ab6a'
Diffstat (limited to 'misc/config')
-rw-r--r-- | misc/config/arch/alpha | 1 | ||||
-rw-r--r-- | misc/config/arch/amd64 | 1 | ||||
-rw-r--r-- | misc/config/arch/ia32 | 3 | ||||
-rw-r--r-- | misc/config/arch/ppc | 2 | ||||
-rw-r--r-- | misc/config/arch/ppc64 | 2 | ||||
-rw-r--r-- | misc/config/cc/bcc | 8 | ||||
-rw-r--r-- | misc/config/cc/compaq | 9 | ||||
-rw-r--r-- | misc/config/cc/ekopath | 9 | ||||
-rw-r--r-- | misc/config/cc/gcc | 36 | ||||
-rw-r--r-- | misc/config/cc/hpcc | 8 | ||||
-rw-r--r-- | misc/config/cc/icc | 26 | ||||
-rw-r--r-- | misc/config/cc/kai | 19 | ||||
-rw-r--r-- | misc/config/cc/mipspro | 9 | ||||
-rw-r--r-- | misc/config/cc/msvc | 10 | ||||
-rw-r--r-- | misc/config/cc/pgi | 9 | ||||
-rw-r--r-- | misc/config/cc/sgipro64 | 8 | ||||
-rw-r--r-- | misc/config/cc/sunwspro | 10 | ||||
-rw-r--r-- | misc/config/os/aix | 6 | ||||
-rw-r--r-- | misc/config/os/beos | 5 | ||||
-rw-r--r-- | misc/config/os/cygwin | 6 | ||||
-rw-r--r-- | misc/config/os/freebsd | 9 | ||||
-rw-r--r-- | misc/config/os/hpux | 5 | ||||
-rw-r--r-- | misc/config/os/irix | 6 | ||||
-rw-r--r-- | misc/config/os/linux | 19 | ||||
-rw-r--r-- | misc/config/os/netbsd | 14 | ||||
-rw-r--r-- | misc/config/os/openbsd | 10 | ||||
-rw-r--r-- | misc/config/os/qnx | 8 | ||||
-rw-r--r-- | misc/config/os/solaris | 6 | ||||
-rw-r--r-- | misc/config/os/tru64 | 4 | ||||
-rw-r--r-- | misc/config/os/windows | 7 |
30 files changed, 18 insertions, 257 deletions
diff --git a/misc/config/arch/alpha b/misc/config/arch/alpha index 51c5e7220..16159207f 100644 --- a/misc/config/arch/alpha +++ b/misc/config/arch/alpha @@ -1,6 +1,7 @@ realname "DEC Alpha" default_submodel alpha-ev5 +endian little <aliases> axp diff --git a/misc/config/arch/amd64 b/misc/config/arch/amd64 index 2291ef055..403ac47ec 100644 --- a/misc/config/arch/amd64 +++ b/misc/config/arch/amd64 @@ -3,6 +3,7 @@ realname "AMD64" default_submodel amd64 endian little +unaligned ok <aliases> x86-64 diff --git a/misc/config/arch/ia32 b/misc/config/arch/ia32 index 1eec8cdbe..1d2b36af1 100644 --- a/misc/config/arch/ia32 +++ b/misc/config/arch/ia32 @@ -1,8 +1,9 @@ realname "IA-32" -default_submodel i586 +default_submodel i686 endian little +unaligned ok <aliases> x86 diff --git a/misc/config/arch/ppc b/misc/config/arch/ppc index 01cd92ad0..0f7ceac2b 100644 --- a/misc/config/arch/ppc +++ b/misc/config/arch/ppc @@ -1,5 +1,7 @@ realname "PowerPC" +endian big + # G3; probably a reasonable assumption these days default_submodel ppc740 diff --git a/misc/config/arch/ppc64 b/misc/config/arch/ppc64 index cbd74bb9f..2bb789949 100644 --- a/misc/config/arch/ppc64 +++ b/misc/config/arch/ppc64 @@ -1,5 +1,7 @@ realname "PowerPC 64" +endian big + default_submodel power4 <submodel_aliases> diff --git a/misc/config/cc/bcc b/misc/config/cc/bcc index 56206fb81..a3bf7cf6f 100644 --- a/misc/config/cc/bcc +++ b/misc/config/cc/bcc @@ -26,11 +26,3 @@ i686 -> "/G6" athlon -> "/G6" pentium4 -> "/G6" </mach_opt> - -<arch> -ia32 -</arch> - -<os> -windows -</os> diff --git a/misc/config/cc/compaq b/misc/config/cc/compaq index 5710698a0..90811b039 100644 --- a/misc/config/cc/compaq +++ b/misc/config/cc/compaq @@ -24,12 +24,3 @@ default -> "$(CXX) -shared -soname $(SONAME)" <mach_opt> alpha -> "-arch=SUBMODEL" alpha- </mach_opt> - -<arch> -alpha -</arch> - -<os> -tru64 -linux -</os> diff --git a/misc/config/cc/ekopath b/misc/config/cc/ekopath index abf0b5b1c..f8bd8f2fe 100644 --- a/misc/config/cc/ekopath +++ b/misc/config/cc/ekopath @@ -35,12 +35,3 @@ core2duo -> "-mcpu=core" ia32 -> "-mcpu=anyx86" amd64 -> "-mcpu=athlon64" </mach_opt> - -<os> -linux -</os> - -<arch> -ia32 -amd64 -</arch> diff --git a/misc/config/cc/gcc b/misc/config/cc/gcc index 1485037c2..2111f9940 100644 --- a/misc/config/cc/gcc +++ b/misc/config/cc/gcc @@ -81,39 +81,3 @@ freebsd -> "-pthread" netbsd -> "-pthread" qnx -> "-fexceptions -D_QNX_SOURCE" </mach_abi_linking> - -<os> -aix -beos -cygwin -darwin -freebsd -hpux -irix -linux -netbsd -openbsd -qnx -solaris -tru64 -windows -</os> - -<arch> -alpha -amd64 -arm -hppa -ia32 -ia64 -m68k -mips32 -mips64 -ppc -ppc64 -s390 -s390x -sh -sparc32 -sparc64 -</arch> diff --git a/misc/config/cc/hpcc b/misc/config/cc/hpcc index 7167be329..2048c5bb2 100644 --- a/misc/config/cc/hpcc +++ b/misc/config/cc/hpcc @@ -27,11 +27,3 @@ hppa2.0 -> "+DA2.0W" <so_link_flags> default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?) </so_link_flags> - -<arch> -hppa -</arch> - -<os> -hpux -</os> diff --git a/misc/config/cc/icc b/misc/config/cc/icc index ad9957e1d..4d51b5fe9 100644 --- a/misc/config/cc/icc +++ b/misc/config/cc/icc @@ -1,6 +1,6 @@ realname "Intel C++" -binary_name "icc" +binary_name "icpc" compile_option "-c " output_to_option "-o " @@ -11,30 +11,20 @@ add_lib_option "-l" lib_opt_flags "-O3 -ip -unroll" check_opt_flags "-O2" debug_flags "-g" -no_debug_flags "" +no_debug_flags "-fomit-frame-pointer" lang_flags "" warning_flags "-w1" -so_obj_flags "-KPIC" +so_obj_flags "-fPIC" makefile_style unix <mach_opt> -i586 -> "-tpp5" -i686 -> "-tpp6 -xiM" -athlon -> "-tpp6 -xiM" -pentium4 -> "-tpp7 -xiMW" +i686 -> "-march=pentium3" +athlon -> "-march=pentium3" +pentium4 -> "-march=pentium4" +core2duo -> "-msse3" </mach_opt> <so_link_flags> -default -> "$(CXX) -KPIC -shared" +default -> "$(CXX) -fPIC -shared" </so_link_flags> - -<arch> -amd64 -ia32 -ia64 -</arch> - -<os> -linux -</os> diff --git a/misc/config/cc/kai b/misc/config/cc/kai index 49afd1a3b..564ca2157 100644 --- a/misc/config/cc/kai +++ b/misc/config/cc/kai @@ -25,22 +25,3 @@ default -> "$(CXX) --soname $(SONAME)" <mach_abi_linking> all -> "--one_per" </mach_abi_linking> - -<arch> -alpha -hppa -ia32 -mips32 -mips64 -sparc32 -sparc64 -</arch> - -<os> -hpux -irix -linux -solaris -tru64 -</os> - diff --git a/misc/config/cc/mipspro b/misc/config/cc/mipspro index 2f01cf29e..8ceeb52b7 100644 --- a/misc/config/cc/mipspro +++ b/misc/config/cc/mipspro @@ -37,12 +37,3 @@ mips64-r10000 -> "-mips4 -r10000" mips32 -> "-n32" mips64 -> "-64" </mach_abi_linking> - -<arch> -mips32 -mips64 -</arch> - -<os> -irix -</os> diff --git a/misc/config/cc/msvc b/misc/config/cc/msvc index cb5b56b5d..5bcec8e23 100644 --- a/misc/config/cc/msvc +++ b/misc/config/cc/msvc @@ -10,7 +10,7 @@ add_lib_option "" lib_opt_flags "/O2 /Ob2" check_opt_flags "/O2" -debug_flags "" +debug_flags "/Zi" no_debug_flags "" lang_flags "/EHsc /GR /D_CONSOLE" warning_flags "" @@ -18,11 +18,3 @@ warning_flags "" ar_command "link /lib" makefile_style nmake - -<arch> -ia32 -</arch> - -<os> -windows -</os> diff --git a/misc/config/cc/pgi b/misc/config/cc/pgi index 9b5a24611..b67edbcc3 100644 --- a/misc/config/cc/pgi +++ b/misc/config/cc/pgi @@ -26,12 +26,3 @@ athlon -> "-tp k7" pentium4 -> "-tp p6" ia32 -> "-tp px" </mach_opt> - -<arch> -ia32 -</arch> - -<os> -linux -solaris -</os> diff --git a/misc/config/cc/sgipro64 b/misc/config/cc/sgipro64 index b1429df94..5bb561834 100644 --- a/misc/config/cc/sgipro64 +++ b/misc/config/cc/sgipro64 @@ -25,11 +25,3 @@ default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" <mach_opt> </mach_opt> - -<arch> -ia64 -</arch> - -<os> -linux -</os> diff --git a/misc/config/cc/sunwspro b/misc/config/cc/sunwspro index 179b06408..842df153f 100644 --- a/misc/config/cc/sunwspro +++ b/misc/config/cc/sunwspro @@ -41,13 +41,3 @@ sparc64 -> "-xchip=SUBMODEL" sparc64- <mach_abi_linking> sparc64 -> "-xarch=v9" </mach_abi_linking> - -<arch> -ia32 -sparc32 -sparc64 -</arch> - -<os> -solaris -</os> diff --git a/misc/config/os/aix b/misc/config/os/aix index fd7330f18..cec818580 100644 --- a/misc/config/os/aix +++ b/misc/config/os/aix @@ -5,9 +5,3 @@ os_type unix <supports_shared> all </supports_shared> - -<arch> -ia64 -ppc -ppc64 -</arch> diff --git a/misc/config/os/beos b/misc/config/os/beos index 498bd493d..2b12792bb 100644 --- a/misc/config/os/beos +++ b/misc/config/os/beos @@ -11,11 +11,6 @@ doc_dir documentation all </supports_shared> -<arch> -ia32 -ppc -</arch> - <aliases> haiku </aliases> diff --git a/misc/config/os/cygwin b/misc/config/os/cygwin index ce10e504b..c2aadea98 100644 --- a/misc/config/os/cygwin +++ b/misc/config/os/cygwin @@ -11,9 +11,3 @@ doc_dir docs <supports_shared> #all </supports_shared> - -<arch> -ia32 -amd64 # in theory -ia64 # in theory -</arch> diff --git a/misc/config/os/freebsd b/misc/config/os/freebsd index d7818cdc6..6cc184d98 100644 --- a/misc/config/os/freebsd +++ b/misc/config/os/freebsd @@ -7,12 +7,3 @@ install_group wheel <supports_shared> all </supports_shared> - -<arch> -alpha -amd64 -ia32 -ia64 -powerpc -sparc64 -</arch> diff --git a/misc/config/os/hpux b/misc/config/os/hpux index 7a12d10dd..6e17d3b73 100644 --- a/misc/config/os/hpux +++ b/misc/config/os/hpux @@ -8,11 +8,6 @@ so_suffix sl all </supports_shared> -<arch> -hppa -ia64 -</arch> - <aliases> hp-ux </aliases> diff --git a/misc/config/os/irix b/misc/config/os/irix index 773942391..fd8b43287 100644 --- a/misc/config/os/irix +++ b/misc/config/os/irix @@ -5,9 +5,3 @@ os_type unix <supports_shared> all </supports_shared> - -<arch> -mips32 -mips64 -</arch> - diff --git a/misc/config/os/linux b/misc/config/os/linux index 701fc9091..acf224244 100644 --- a/misc/config/os/linux +++ b/misc/config/os/linux @@ -6,22 +6,3 @@ os_type unix <supports_shared> all </supports_shared> - -<arch> -alpha -amd64 -arm -hppa -ia32 -ia64 -m68k -mips32 -mips64 -ppc -ppc64 -sh -sparc32 -sparc64 -s390 -s390x -</arch> diff --git a/misc/config/os/netbsd b/misc/config/os/netbsd index b0caeff70..da713e3a0 100644 --- a/misc/config/os/netbsd +++ b/misc/config/os/netbsd @@ -7,17 +7,3 @@ install_group wheel <supports_shared> all </supports_shared> - -<arch> -alpha -amd64 -arm -hppa -ia32 -ia64 -m68k -mips32 -mips64 -ppc -sparc32 -</arch> diff --git a/misc/config/os/openbsd b/misc/config/os/openbsd index 8d0329e1e..9f966bf49 100644 --- a/misc/config/os/openbsd +++ b/misc/config/os/openbsd @@ -7,13 +7,3 @@ install_group wheel <supports_shared> all </supports_shared> - -<arch> -alpha -ia32 -m68k -mips32 -ppc -sparc32 -sparc64 -</arch> diff --git a/misc/config/os/qnx b/misc/config/os/qnx index cd5ddab5f..28bc8dea9 100644 --- a/misc/config/os/qnx +++ b/misc/config/os/qnx @@ -5,11 +5,3 @@ os_type unix <supports_shared> all </supports_shared> - -<arch> -arm -ia32 -mips32 -ppc -sh -</arch> diff --git a/misc/config/os/solaris b/misc/config/os/solaris index 078019584..58b458e9b 100644 --- a/misc/config/os/solaris +++ b/misc/config/os/solaris @@ -9,12 +9,6 @@ install_cmd_exec install -u OWNER -g GROUP -m 755 all </supports_shared> -<arch> -ia32 -sparc32 -sparc64 -</arch> - <aliases> sunos </aliases> diff --git a/misc/config/os/tru64 b/misc/config/os/tru64 index e2b264104..e320c1df4 100644 --- a/misc/config/os/tru64 +++ b/misc/config/os/tru64 @@ -6,10 +6,6 @@ os_type unix all </supports_shared> -<arch> -alpha -</arch> - <aliases> osf1 </aliases> diff --git a/misc/config/os/windows b/misc/config/os/windows index 44b2a102b..2f21da309 100644 --- a/misc/config/os/windows +++ b/misc/config/os/windows @@ -19,12 +19,7 @@ install_group <nil> #all </supports_shared> -<arch> -ia32 -amd64 # in theory -ia64 # in theory -</arch> - <aliases> win32 +mswin32 </aliases> |