From 3bc2bb0461b1b40466821daf0061eab769621eab Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 13 Oct 2009 16:01:51 +0000 Subject: Rename all of the build-data files with a .txt extension, and filter for such in configure.py. Paul Clark reported on the list having problems with it otherwise because of CVS droppings being picked up and subsequently errored on when parsing them as build info files (of course) failed. --- configure.pl | 2 + configure.py | 17 +++++--- src/build-data/arch/alpha | 31 ------------- src/build-data/arch/alpha.txt | 31 +++++++++++++ src/build-data/arch/amd64 | 27 ------------ src/build-data/arch/amd64.txt | 27 ++++++++++++ src/build-data/arch/arm | 23 ---------- src/build-data/arch/arm.txt | 23 ++++++++++ src/build-data/arch/hitachi-sh | 11 ----- src/build-data/arch/hitachi-sh.txt | 11 +++++ src/build-data/arch/hppa | 17 -------- src/build-data/arch/hppa.txt | 17 ++++++++ src/build-data/arch/ia32 | 60 ------------------------- src/build-data/arch/ia32.txt | 60 +++++++++++++++++++++++++ src/build-data/arch/ia64 | 15 ------- src/build-data/arch/ia64.txt | 15 +++++++ src/build-data/arch/m68k | 15 ------- src/build-data/arch/m68k.txt | 15 +++++++ src/build-data/arch/mips32 | 22 ---------- src/build-data/arch/mips32.txt | 22 ++++++++++ src/build-data/arch/mips64 | 22 ---------- src/build-data/arch/mips64.txt | 22 ++++++++++ src/build-data/arch/ppc | 24 ---------- src/build-data/arch/ppc.txt | 24 ++++++++++ src/build-data/arch/ppc64 | 22 ---------- src/build-data/arch/ppc64.txt | 22 ++++++++++ src/build-data/arch/s390 | 7 --- src/build-data/arch/s390.txt | 7 +++ src/build-data/arch/s390x | 7 --- src/build-data/arch/s390x.txt | 7 +++ src/build-data/arch/sparc32 | 34 --------------- src/build-data/arch/sparc32.txt | 34 +++++++++++++++ src/build-data/arch/sparc64 | 15 ------- src/build-data/arch/sparc64.txt | 15 +++++++ src/build-data/cc/bcc | 31 ------------- src/build-data/cc/bcc.txt | 31 +++++++++++++ src/build-data/cc/compaq | 29 ------------- src/build-data/cc/compaq.txt | 29 +++++++++++++ src/build-data/cc/ekopath | 40 ----------------- src/build-data/cc/ekopath.txt | 40 +++++++++++++++++ src/build-data/cc/gcc | 89 -------------------------------------- src/build-data/cc/gcc.txt | 89 ++++++++++++++++++++++++++++++++++++++ src/build-data/cc/hpcc | 32 -------------- src/build-data/cc/hpcc.txt | 32 ++++++++++++++ src/build-data/cc/icc | 35 --------------- src/build-data/cc/icc.txt | 35 +++++++++++++++ src/build-data/cc/kai | 30 ------------- src/build-data/cc/kai.txt | 30 +++++++++++++ src/build-data/cc/mipspro | 42 ------------------ src/build-data/cc/mipspro.txt | 42 ++++++++++++++++++ src/build-data/cc/msvc | 27 ------------ src/build-data/cc/msvc.txt | 27 ++++++++++++ src/build-data/cc/open64 | 30 ------------- src/build-data/cc/open64.txt | 30 +++++++++++++ src/build-data/cc/pgi | 31 ------------- src/build-data/cc/pgi.txt | 31 +++++++++++++ src/build-data/cc/sgipro64 | 30 ------------- src/build-data/cc/sgipro64.txt | 30 +++++++++++++ src/build-data/cc/sunwspro | 47 -------------------- src/build-data/cc/sunwspro.txt | 47 ++++++++++++++++++++ src/build-data/cc/xlc | 29 ------------- src/build-data/cc/xlc.txt | 29 +++++++++++++ src/build-data/os/aix | 7 --- src/build-data/os/aix.txt | 7 +++ src/build-data/os/beos | 16 ------- src/build-data/os/beos.txt | 16 +++++++ src/build-data/os/cygwin | 13 ------ src/build-data/os/cygwin.txt | 13 ++++++ src/build-data/os/darwin | 19 -------- src/build-data/os/darwin.txt | 19 ++++++++ src/build-data/os/defaults | 19 -------- src/build-data/os/defaults.txt | 19 ++++++++ src/build-data/os/dragonfly | 11 ----- src/build-data/os/dragonfly.txt | 11 +++++ src/build-data/os/freebsd | 11 ----- src/build-data/os/freebsd.txt | 11 +++++ src/build-data/os/hpux | 13 ------ src/build-data/os/hpux.txt | 13 ++++++ src/build-data/os/irix | 7 --- src/build-data/os/irix.txt | 7 +++ src/build-data/os/linux | 12 ----- src/build-data/os/linux.txt | 12 +++++ src/build-data/os/mingw | 22 ---------- src/build-data/os/mingw.txt | 22 ++++++++++ src/build-data/os/netbsd | 7 --- src/build-data/os/netbsd.txt | 7 +++ src/build-data/os/openbsd | 7 --- src/build-data/os/openbsd.txt | 7 +++ src/build-data/os/qnx | 7 --- src/build-data/os/qnx.txt | 7 +++ src/build-data/os/solaris | 15 ------- src/build-data/os/solaris.txt | 15 +++++++ src/build-data/os/tru64 | 11 ----- src/build-data/os/tru64.txt | 11 +++++ src/build-data/os/windows | 26 ----------- src/build-data/os/windows.txt | 26 +++++++++++ 96 files changed, 1110 insertions(+), 1103 deletions(-) delete mode 100644 src/build-data/arch/alpha create mode 100644 src/build-data/arch/alpha.txt delete mode 100644 src/build-data/arch/amd64 create mode 100644 src/build-data/arch/amd64.txt delete mode 100644 src/build-data/arch/arm create mode 100644 src/build-data/arch/arm.txt delete mode 100644 src/build-data/arch/hitachi-sh create mode 100644 src/build-data/arch/hitachi-sh.txt delete mode 100644 src/build-data/arch/hppa create mode 100644 src/build-data/arch/hppa.txt delete mode 100644 src/build-data/arch/ia32 create mode 100644 src/build-data/arch/ia32.txt delete mode 100644 src/build-data/arch/ia64 create mode 100644 src/build-data/arch/ia64.txt delete mode 100644 src/build-data/arch/m68k create mode 100644 src/build-data/arch/m68k.txt delete mode 100644 src/build-data/arch/mips32 create mode 100644 src/build-data/arch/mips32.txt delete mode 100644 src/build-data/arch/mips64 create mode 100644 src/build-data/arch/mips64.txt delete mode 100644 src/build-data/arch/ppc create mode 100644 src/build-data/arch/ppc.txt delete mode 100644 src/build-data/arch/ppc64 create mode 100644 src/build-data/arch/ppc64.txt delete mode 100644 src/build-data/arch/s390 create mode 100644 src/build-data/arch/s390.txt delete mode 100644 src/build-data/arch/s390x create mode 100644 src/build-data/arch/s390x.txt delete mode 100644 src/build-data/arch/sparc32 create mode 100644 src/build-data/arch/sparc32.txt delete mode 100644 src/build-data/arch/sparc64 create mode 100644 src/build-data/arch/sparc64.txt delete mode 100644 src/build-data/cc/bcc create mode 100644 src/build-data/cc/bcc.txt delete mode 100644 src/build-data/cc/compaq create mode 100644 src/build-data/cc/compaq.txt delete mode 100644 src/build-data/cc/ekopath create mode 100644 src/build-data/cc/ekopath.txt delete mode 100644 src/build-data/cc/gcc create mode 100644 src/build-data/cc/gcc.txt delete mode 100644 src/build-data/cc/hpcc create mode 100644 src/build-data/cc/hpcc.txt delete mode 100644 src/build-data/cc/icc create mode 100644 src/build-data/cc/icc.txt delete mode 100644 src/build-data/cc/kai create mode 100644 src/build-data/cc/kai.txt delete mode 100644 src/build-data/cc/mipspro create mode 100644 src/build-data/cc/mipspro.txt delete mode 100644 src/build-data/cc/msvc create mode 100644 src/build-data/cc/msvc.txt delete mode 100644 src/build-data/cc/open64 create mode 100644 src/build-data/cc/open64.txt delete mode 100644 src/build-data/cc/pgi create mode 100644 src/build-data/cc/pgi.txt delete mode 100644 src/build-data/cc/sgipro64 create mode 100644 src/build-data/cc/sgipro64.txt delete mode 100644 src/build-data/cc/sunwspro create mode 100644 src/build-data/cc/sunwspro.txt delete mode 100644 src/build-data/cc/xlc create mode 100644 src/build-data/cc/xlc.txt delete mode 100644 src/build-data/os/aix create mode 100644 src/build-data/os/aix.txt delete mode 100644 src/build-data/os/beos create mode 100644 src/build-data/os/beos.txt delete mode 100644 src/build-data/os/cygwin create mode 100644 src/build-data/os/cygwin.txt delete mode 100644 src/build-data/os/darwin create mode 100644 src/build-data/os/darwin.txt delete mode 100644 src/build-data/os/defaults create mode 100644 src/build-data/os/defaults.txt delete mode 100644 src/build-data/os/dragonfly create mode 100644 src/build-data/os/dragonfly.txt delete mode 100644 src/build-data/os/freebsd create mode 100644 src/build-data/os/freebsd.txt delete mode 100644 src/build-data/os/hpux create mode 100644 src/build-data/os/hpux.txt delete mode 100644 src/build-data/os/irix create mode 100644 src/build-data/os/irix.txt delete mode 100644 src/build-data/os/linux create mode 100644 src/build-data/os/linux.txt delete mode 100644 src/build-data/os/mingw create mode 100644 src/build-data/os/mingw.txt delete mode 100644 src/build-data/os/netbsd create mode 100644 src/build-data/os/netbsd.txt delete mode 100644 src/build-data/os/openbsd create mode 100644 src/build-data/os/openbsd.txt delete mode 100644 src/build-data/os/qnx create mode 100644 src/build-data/os/qnx.txt delete mode 100644 src/build-data/os/solaris create mode 100644 src/build-data/os/solaris.txt delete mode 100644 src/build-data/os/tru64 create mode 100644 src/build-data/os/tru64.txt delete mode 100644 src/build-data/os/windows create mode 100644 src/build-data/os/windows.txt diff --git a/configure.pl b/configure.pl index bd7e41a3e..9415d5a42 100755 --- a/configure.pl +++ b/configure.pl @@ -1582,6 +1582,8 @@ sub read_info_files { foreach my $file (dir_list($dir)) { my $fullpath = File::Spec->catfile($dir, $file); + $file =~ s/.txt//; + trace("reading $fullpath"); %{$allinfo{$file}} = &$func($file, $fullpath); } diff --git a/configure.py b/configure.py index 676fa11f5..4d923d78e 100755 --- a/configure.py +++ b/configure.py @@ -270,7 +270,7 @@ def lex_me_harder(infofile, to_obj, allowed_groups, name_val_pairs): else: to_obj.parent_module = None else: - to_obj.basename = basename + to_obj.basename = basename.replace('.txt', '') lexer = shlex.shlex(open(infofile), infofile, posix=True) lexer.wordchars += '|:.<>/,-!' # handle various funky chars in info.txt @@ -883,18 +883,23 @@ def load_info_files(options): for (dirpath, dirnames, filenames) in \ os.walk(os.path.join(options.build_data, subdir)): for filename in filenames: - yield os.path.join(dirpath, filename) + if filename.endswith('.txt'): + yield os.path.join(dirpath, filename) - archinfo = dict([(os.path.basename(info), ArchInfo(info)) + def form_name(filepath): + return os.path.basename(filepath).replace('.txt', '') + + archinfo = dict([(form_name(info), ArchInfo(info)) for info in list_files_in_build_data('arch')]) - osinfo = dict([(os.path.basename(info), OsInfo(info)) + osinfo = dict([(form_name(info), OsInfo(info)) for info in list_files_in_build_data('os')]) - ccinfo = dict([(os.path.basename(info), CompilerInfo(info)) + ccinfo = dict([(form_name(info), CompilerInfo(info)) for info in list_files_in_build_data('cc')]) - del osinfo['defaults'] # FIXME (remove the file) + if 'defaults' in osinfo: + del osinfo['defaults'] # FIXME (remove the file) return (modules, archinfo, ccinfo, osinfo) diff --git a/src/build-data/arch/alpha b/src/build-data/arch/alpha deleted file mode 100644 index 60b264396..000000000 --- a/src/build-data/arch/alpha +++ /dev/null @@ -1,31 +0,0 @@ -realname "DEC Alpha" - -default_submodel alpha-ev4 -endian little - - -axp -alphaaxp - - - -alpha-ev4 -alpha-ev5 -alpha-ev56 -alpha-pca56 -alpha-ev6 -alpha-ev67 -alpha-ev68 -alpha-ev7 - - - -alphaev4 -> alpha-ev4 -alphaev5 -> alpha-ev5 -alphaev56 -> alpha-ev56 -alphapca56 -> alpha-pca56 -alphaev6 -> alpha-ev6 -alphaev67 -> alpha-ev67 -alphaev68 -> alpha-ev68 -alphaev7 -> alpha-ev7 - diff --git a/src/build-data/arch/alpha.txt b/src/build-data/arch/alpha.txt new file mode 100644 index 000000000..60b264396 --- /dev/null +++ b/src/build-data/arch/alpha.txt @@ -0,0 +1,31 @@ +realname "DEC Alpha" + +default_submodel alpha-ev4 +endian little + + +axp +alphaaxp + + + +alpha-ev4 +alpha-ev5 +alpha-ev56 +alpha-pca56 +alpha-ev6 +alpha-ev67 +alpha-ev68 +alpha-ev7 + + + +alphaev4 -> alpha-ev4 +alphaev5 -> alpha-ev5 +alphaev56 -> alpha-ev56 +alphapca56 -> alpha-pca56 +alphaev6 -> alpha-ev6 +alphaev67 -> alpha-ev67 +alphaev68 -> alpha-ev68 +alphaev7 -> alpha-ev7 + diff --git a/src/build-data/arch/amd64 b/src/build-data/arch/amd64 deleted file mode 100644 index 216588e7b..000000000 --- a/src/build-data/arch/amd64 +++ /dev/null @@ -1,27 +0,0 @@ -realname "x86-64" - -default_submodel opteron - -endian little -unaligned ok - - -x86-64 -x86_64 # for RPM - - - -opteron -em64t -core2 - - - -core2duo -> core2 -intelcore2 -> core2 -intelcore2duo -> core2 - -amdopteron -> opteron -athlon64 -> opteron -k8 -> opteron - diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt new file mode 100644 index 000000000..216588e7b --- /dev/null +++ b/src/build-data/arch/amd64.txt @@ -0,0 +1,27 @@ +realname "x86-64" + +default_submodel opteron + +endian little +unaligned ok + + +x86-64 +x86_64 # for RPM + + + +opteron +em64t +core2 + + + +core2duo -> core2 +intelcore2 -> core2 +intelcore2duo -> core2 + +amdopteron -> opteron +athlon64 -> opteron +k8 -> opteron + diff --git a/src/build-data/arch/arm b/src/build-data/arch/arm deleted file mode 100644 index c6be4ad46..000000000 --- a/src/build-data/arch/arm +++ /dev/null @@ -1,23 +0,0 @@ -realname "ARM" - -default_submodel arm2 - - -arm2 -arm3 -arm6 -arm7 -arm8 -arm9 -strongarm -strongarm110 -strongarm1100 -xscale - - - -sa110 -> strongarm110 -sa1100 -> strongarm1100 -strongarm1110 -> strongarm1100 -armv5tel -> xscale - diff --git a/src/build-data/arch/arm.txt b/src/build-data/arch/arm.txt new file mode 100644 index 000000000..c6be4ad46 --- /dev/null +++ b/src/build-data/arch/arm.txt @@ -0,0 +1,23 @@ +realname "ARM" + +default_submodel arm2 + + +arm2 +arm3 +arm6 +arm7 +arm8 +arm9 +strongarm +strongarm110 +strongarm1100 +xscale + + + +sa110 -> strongarm110 +sa1100 -> strongarm1100 +strongarm1110 -> strongarm1100 +armv5tel -> xscale + diff --git a/src/build-data/arch/hitachi-sh b/src/build-data/arch/hitachi-sh deleted file mode 100644 index 8e9f7eee3..000000000 --- a/src/build-data/arch/hitachi-sh +++ /dev/null @@ -1,11 +0,0 @@ -realname "Hitachi SH" - -default_submodel hitachi-sh1 - - -hitachi-sh1 -hitachi-sh2 -hitachi-sh3 -hitachi-sh3e -hitachi-sh4 - diff --git a/src/build-data/arch/hitachi-sh.txt b/src/build-data/arch/hitachi-sh.txt new file mode 100644 index 000000000..8e9f7eee3 --- /dev/null +++ b/src/build-data/arch/hitachi-sh.txt @@ -0,0 +1,11 @@ +realname "Hitachi SH" + +default_submodel hitachi-sh1 + + +hitachi-sh1 +hitachi-sh2 +hitachi-sh3 +hitachi-sh3e +hitachi-sh4 + diff --git a/src/build-data/arch/hppa b/src/build-data/arch/hppa deleted file mode 100644 index 4cdd40889..000000000 --- a/src/build-data/arch/hppa +++ /dev/null @@ -1,17 +0,0 @@ -realname "HP-PA" - -default_submodel hppa1.0 - - -hp-pa -parisc -pa-risc -hp-parisc -hp-pa-risc - - - -hppa1.0 -hppa1.1 -hppa2.0 - diff --git a/src/build-data/arch/hppa.txt b/src/build-data/arch/hppa.txt new file mode 100644 index 000000000..4cdd40889 --- /dev/null +++ b/src/build-data/arch/hppa.txt @@ -0,0 +1,17 @@ +realname "HP-PA" + +default_submodel hppa1.0 + + +hp-pa +parisc +pa-risc +hp-parisc +hp-pa-risc + + + +hppa1.0 +hppa1.1 +hppa2.0 + diff --git a/src/build-data/arch/ia32 b/src/build-data/arch/ia32 deleted file mode 100644 index aafcf9a77..000000000 --- a/src/build-data/arch/ia32 +++ /dev/null @@ -1,60 +0,0 @@ -realname "IA-32" - -default_submodel i386 - -endian little -unaligned ok - - -x86 -ix86 -80x86 -i86pc # for Solaris - - - -i386 -i486 -i586 -i686 -pentium2 -pentium3 -pentium4 -pentium-m -prescott -k6 -athlon - - - -pentium -> i586 -pentiumpro -> i686 -pentium_pro -> i686 -pentium2 -> pentium2 -pentiumii -> pentium2 -pentium3 -> pentium3 -pentiumiii -> pentium3 - -x86family5 -> i586 -x86family6 -> i686 - -pentiumm -> pentium-m -intelpentiumm -> pentium-m - -intelpentium4 -> pentium4 - -duron -> athlon -athlon-xp -> athlon -k7 -> athlon - -p2 -> i686 -p3 -> i686 -p4 -> pentium4 - -intelcput2250 -> prescott -intelcput2300 -> prescott -intelcput2400 -> prescott -intelcput2500 -> prescott -intelcput2600 -> prescott -intelcput2700 -> prescott - diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt new file mode 100644 index 000000000..aafcf9a77 --- /dev/null +++ b/src/build-data/arch/ia32.txt @@ -0,0 +1,60 @@ +realname "IA-32" + +default_submodel i386 + +endian little +unaligned ok + + +x86 +ix86 +80x86 +i86pc # for Solaris + + + +i386 +i486 +i586 +i686 +pentium2 +pentium3 +pentium4 +pentium-m +prescott +k6 +athlon + + + +pentium -> i586 +pentiumpro -> i686 +pentium_pro -> i686 +pentium2 -> pentium2 +pentiumii -> pentium2 +pentium3 -> pentium3 +pentiumiii -> pentium3 + +x86family5 -> i586 +x86family6 -> i686 + +pentiumm -> pentium-m +intelpentiumm -> pentium-m + +intelpentium4 -> pentium4 + +duron -> athlon +athlon-xp -> athlon +k7 -> athlon + +p2 -> i686 +p3 -> i686 +p4 -> pentium4 + +intelcput2250 -> prescott +intelcput2300 -> prescott +intelcput2400 -> prescott +intelcput2500 -> prescott +intelcput2600 -> prescott +intelcput2700 -> prescott + diff --git a/src/build-data/arch/ia64 b/src/build-data/arch/ia64 deleted file mode 100644 index 7ca84c007..000000000 --- a/src/build-data/arch/ia64 +++ /dev/null @@ -1,15 +0,0 @@ -realname "IA-64" - -# This is safe: only affects tuning, not ISA -default_submodel itanium2 - - -merced -itanium - - - -itanium1 -itanium2 -mckinley - diff --git a/src/build-data/arch/ia64.txt b/src/build-data/arch/ia64.txt new file mode 100644 index 000000000..7ca84c007 --- /dev/null +++ b/src/build-data/arch/ia64.txt @@ -0,0 +1,15 @@ +realname "IA-64" + +# This is safe: only affects tuning, not ISA +default_submodel itanium2 + + +merced +itanium + + + +itanium1 +itanium2 +mckinley + diff --git a/src/build-data/arch/m68k b/src/build-data/arch/m68k deleted file mode 100644 index 27f246abc..000000000 --- a/src/build-data/arch/m68k +++ /dev/null @@ -1,15 +0,0 @@ -realname "Motorola 680x0" - -default_submodel 68020 - - -680x0 -68k - - - -68020 -68030 -68040 -68060 - diff --git a/src/build-data/arch/m68k.txt b/src/build-data/arch/m68k.txt new file mode 100644 index 000000000..27f246abc --- /dev/null +++ b/src/build-data/arch/m68k.txt @@ -0,0 +1,15 @@ +realname "Motorola 680x0" + +default_submodel 68020 + + +680x0 +68k + + + +68020 +68030 +68040 +68060 + diff --git a/src/build-data/arch/mips32 b/src/build-data/arch/mips32 deleted file mode 100644 index 9846c8fb2..000000000 --- a/src/build-data/arch/mips32 +++ /dev/null @@ -1,22 +0,0 @@ -realname "MIPS" - -default_submodel r3000 - - -mips -mipsel # For Debian - - - -r3000 -r6000 - - - -r3k -> r3000 -r6k -> r6000 - -# These are for RPM -mipsbe -> r3000 -mipsle -> r3000 - diff --git a/src/build-data/arch/mips32.txt b/src/build-data/arch/mips32.txt new file mode 100644 index 000000000..9846c8fb2 --- /dev/null +++ b/src/build-data/arch/mips32.txt @@ -0,0 +1,22 @@ +realname "MIPS" + +default_submodel r3000 + + +mips +mipsel # For Debian + + + +r3000 +r6000 + + + +r3k -> r3000 +r6k -> r6000 + +# These are for RPM +mipsbe -> r3000 +mipsle -> r3000 + diff --git a/src/build-data/arch/mips64 b/src/build-data/arch/mips64 deleted file mode 100644 index dbb49d028..000000000 --- a/src/build-data/arch/mips64 +++ /dev/null @@ -1,22 +0,0 @@ -realname "MIPS64" - -default_submodel r4400 - - -r4000 -r4100 -r4300 -r4400 -r4600 -r4560 -r5000 -r8000 -r10000 - - - -r4k -> r4000 -r5k -> r5000 -r8k -> r8000 -r10k -> r10000 - diff --git a/src/build-data/arch/mips64.txt b/src/build-data/arch/mips64.txt new file mode 100644 index 000000000..dbb49d028 --- /dev/null +++ b/src/build-data/arch/mips64.txt @@ -0,0 +1,22 @@ +realname "MIPS64" + +default_submodel r4400 + + +r4000 +r4100 +r4300 +r4400 +r4600 +r4560 +r5000 +r8000 +r10000 + + + +r4k -> r4000 +r5k -> r5000 +r8k -> r8000 +r10k -> r10000 + diff --git a/src/build-data/arch/ppc b/src/build-data/arch/ppc deleted file mode 100644 index 16112f389..000000000 --- a/src/build-data/arch/ppc +++ /dev/null @@ -1,24 +0,0 @@ -realname "PowerPC" - -endian big - -default_submodel ppc604 - - -powerpc - - - -g3 -> ppc740 -g4 -> ppc7450 - - - -ppc601 -ppc603 -ppc604 -ppc740 -ppc750 -ppc7400 -ppc7450 - diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt new file mode 100644 index 000000000..16112f389 --- /dev/null +++ b/src/build-data/arch/ppc.txt @@ -0,0 +1,24 @@ +realname "PowerPC" + +endian big + +default_submodel ppc604 + + +powerpc + + + +g3 -> ppc740 +g4 -> ppc7450 + + + +ppc601 +ppc603 +ppc604 +ppc740 +ppc750 +ppc7400 +ppc7450 + diff --git a/src/build-data/arch/ppc64 b/src/build-data/arch/ppc64 deleted file mode 100644 index 6d5eb7ad2..000000000 --- a/src/build-data/arch/ppc64 +++ /dev/null @@ -1,22 +0,0 @@ -realname "PowerPC 64" - -endian big - -default_submodel power4 - - -g5 -> ppc970 - - - -rs64a -ppc970 -power3 -power4 -power5 -cellppu - - - -cellbroadbandengine -> cellppu - diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt new file mode 100644 index 000000000..6d5eb7ad2 --- /dev/null +++ b/src/build-data/arch/ppc64.txt @@ -0,0 +1,22 @@ +realname "PowerPC 64" + +endian big + +default_submodel power4 + + +g5 -> ppc970 + + + +rs64a +ppc970 +power3 +power4 +power5 +cellppu + + + +cellbroadbandengine -> cellppu + diff --git a/src/build-data/arch/s390 b/src/build-data/arch/s390 deleted file mode 100644 index 392f51397..000000000 --- a/src/build-data/arch/s390 +++ /dev/null @@ -1,7 +0,0 @@ -realname "S/390 31-bit" - -default_submodel s390 - - -s390 - diff --git a/src/build-data/arch/s390.txt b/src/build-data/arch/s390.txt new file mode 100644 index 000000000..392f51397 --- /dev/null +++ b/src/build-data/arch/s390.txt @@ -0,0 +1,7 @@ +realname "S/390 31-bit" + +default_submodel s390 + + +s390 + diff --git a/src/build-data/arch/s390x b/src/build-data/arch/s390x deleted file mode 100644 index 49fb0bda7..000000000 --- a/src/build-data/arch/s390x +++ /dev/null @@ -1,7 +0,0 @@ -realname "S/390 64-bit" - -default_submodel s390x - - -s390x - diff --git a/src/build-data/arch/s390x.txt b/src/build-data/arch/s390x.txt new file mode 100644 index 000000000..49fb0bda7 --- /dev/null +++ b/src/build-data/arch/s390x.txt @@ -0,0 +1,7 @@ +realname "S/390 64-bit" + +default_submodel s390x + + +s390x + diff --git a/src/build-data/arch/sparc32 b/src/build-data/arch/sparc32 deleted file mode 100644 index 6b752df87..000000000 --- a/src/build-data/arch/sparc32 +++ /dev/null @@ -1,34 +0,0 @@ -realname "SPARC" - -# V7 doesn't have integer multiply, so it will be bitterly slow for some things -# (especially BigInt). Also, it's fairly rare nowadays, so we default to V8. -default_submodel sparc32-v8 - -endian big - - -sparc - - - -sparc32-v7 -sparc32-v8 -sparc32-v9 - - - -cypress -> sparc32-v7 -supersparc -> sparc32-v8 -hypersparc -> sparc32-v8 -microsparc -> sparc32-v8 -sparclite -> sparc32-v8 - -sparcv7 -> sparc32-v7 -sparcv8 -> sparc32-v8 -sparcv9 -> sparc32-v9 - -sparc-v7 -> sparc32-v7 -sparc-v8 -> sparc32-v8 -sparc-v9 -> sparc32-v9 - - diff --git a/src/build-data/arch/sparc32.txt b/src/build-data/arch/sparc32.txt new file mode 100644 index 000000000..6b752df87 --- /dev/null +++ b/src/build-data/arch/sparc32.txt @@ -0,0 +1,34 @@ +realname "SPARC" + +# V7 doesn't have integer multiply, so it will be bitterly slow for some things +# (especially BigInt). Also, it's fairly rare nowadays, so we default to V8. +default_submodel sparc32-v8 + +endian big + + +sparc + + + +sparc32-v7 +sparc32-v8 +sparc32-v9 + + + +cypress -> sparc32-v7 +supersparc -> sparc32-v8 +hypersparc -> sparc32-v8 +microsparc -> sparc32-v8 +sparclite -> sparc32-v8 + +sparcv7 -> sparc32-v7 +sparcv8 -> sparc32-v8 +sparcv9 -> sparc32-v9 + +sparc-v7 -> sparc32-v7 +sparc-v8 -> sparc32-v8 +sparc-v9 -> sparc32-v9 + + diff --git a/src/build-data/arch/sparc64 b/src/build-data/arch/sparc64 deleted file mode 100644 index c0575efc4..000000000 --- a/src/build-data/arch/sparc64 +++ /dev/null @@ -1,15 +0,0 @@ -realname "SPARC64" - -default_submodel sparc64-ultra - - -sparc64-ultra -sparc64-ultra2 -sparc64-ultra3 - - - -ultrasparc -> sparc64-ultra -ultrasparc2 -> sparc64-ultra2 -ultrasparc3 -> sparc64-ultra3 - diff --git a/src/build-data/arch/sparc64.txt b/src/build-data/arch/sparc64.txt new file mode 100644 index 000000000..c0575efc4 --- /dev/null +++ b/src/build-data/arch/sparc64.txt @@ -0,0 +1,15 @@ +realname "SPARC64" + +default_submodel sparc64-ultra + + +sparc64-ultra +sparc64-ultra2 +sparc64-ultra3 + + + +ultrasparc -> sparc64-ultra +ultrasparc2 -> sparc64-ultra2 +ultrasparc3 -> sparc64-ultra3 + diff --git a/src/build-data/cc/bcc b/src/build-data/cc/bcc deleted file mode 100644 index df09daff0..000000000 --- a/src/build-data/cc/bcc +++ /dev/null @@ -1,31 +0,0 @@ -realname "Borland C++" - -binary_name "bcc32" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O2" -check_opt_flags "-O2" -debug_flags "" -no_debug_flags "" -lang_flags "-tWR -tWM -tWC" -warning_flags "-w" - -dll_import_flags "" -dll_export_flags "" - -ar_command "tlib /C /P256" - -makefile_style nmake - - -i486 -> "/G4" -i586 -> "/G5" -i686 -> "/G6" -athlon -> "/G6" -pentium4 -> "/G6" - diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt new file mode 100644 index 000000000..df09daff0 --- /dev/null +++ b/src/build-data/cc/bcc.txt @@ -0,0 +1,31 @@ +realname "Borland C++" + +binary_name "bcc32" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O2" +check_opt_flags "-O2" +debug_flags "" +no_debug_flags "" +lang_flags "-tWR -tWM -tWC" +warning_flags "-w" + +dll_import_flags "" +dll_export_flags "" + +ar_command "tlib /C /P256" + +makefile_style nmake + + +i486 -> "/G4" +i586 -> "/G5" +i686 -> "/G6" +athlon -> "/G6" +pentium4 -> "/G6" + diff --git a/src/build-data/cc/compaq b/src/build-data/cc/compaq deleted file mode 100644 index 66d3a5219..000000000 --- a/src/build-data/cc/compaq +++ /dev/null @@ -1,29 +0,0 @@ -realname "Compaq C++" - -binary_name "cxx" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -# -O3 and up seem to be unhappy with Botan -lib_opt_flags "-O2" -check_opt_flags "-O2" -debug_flags "-g" -no_debug_flags "" -lang_flags "-std ansi -D__USE_STD_IOSTREAM" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -shared -soname $(SONAME)" - - - -alpha -> "-arch=SUBMODEL" alpha- - diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt new file mode 100644 index 000000000..66d3a5219 --- /dev/null +++ b/src/build-data/cc/compaq.txt @@ -0,0 +1,29 @@ +realname "Compaq C++" + +binary_name "cxx" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +# -O3 and up seem to be unhappy with Botan +lib_opt_flags "-O2" +check_opt_flags "-O2" +debug_flags "-g" +no_debug_flags "" +lang_flags "-std ansi -D__USE_STD_IOSTREAM" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -shared -soname $(SONAME)" + + + +alpha -> "-arch=SUBMODEL" alpha- + diff --git a/src/build-data/cc/ekopath b/src/build-data/cc/ekopath deleted file mode 100644 index ca2471059..000000000 --- a/src/build-data/cc/ekopath +++ /dev/null @@ -1,40 +0,0 @@ -realname "PathScale EKOPath C++" - -binary_name "pathCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint" -check_opt_flags "-O2" -lang_flags "-D_REENTRANT -ansi -Wno-long-long" -warning_flags "-W -Wall" - -ar_command "pathCC -ar -o" - -shared_flags "-fPIC" -debug_flags "-g" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" - - - -athlon -> "-mcpu=athlon" -pentium4 -> "-mcpu=pentium4" - -opteron -> "-mcpu=opteron" -em64t -> "-mcpu=em64t" -core2 -> "-mcpu=core" - -ia32 -> "-mcpu=anyx86" -amd64 -> "-mcpu=athlon64" - diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt new file mode 100644 index 000000000..ca2471059 --- /dev/null +++ b/src/build-data/cc/ekopath.txt @@ -0,0 +1,40 @@ +realname "PathScale EKOPath C++" + +binary_name "pathCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint" +check_opt_flags "-O2" +lang_flags "-D_REENTRANT -ansi -Wno-long-long" +warning_flags "-W -Wall" + +ar_command "pathCC -ar -o" + +shared_flags "-fPIC" +debug_flags "-g" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" + + + +athlon -> "-mcpu=athlon" +pentium4 -> "-mcpu=pentium4" + +opteron -> "-mcpu=opteron" +em64t -> "-mcpu=em64t" +core2 -> "-mcpu=core" + +ia32 -> "-mcpu=anyx86" +amd64 -> "-mcpu=athlon64" + diff --git a/src/build-data/cc/gcc b/src/build-data/cc/gcc deleted file mode 100644 index 978ed6d58..000000000 --- a/src/build-data/cc/gcc +++ /dev/null @@ -1,89 +0,0 @@ -realname "GNU C++" - -binary_name "g++" - -compiler_has_tr1 yes - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lang_flags "-D_REENTRANT -ansi -Wno-long-long" -warning_flags "-W -Wall" -#warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" - -lib_opt_flags "-O2 -finline-functions" -check_opt_flags "-O2" -shared_flags "-fPIC" -debug_flags "-g" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -# The default works for GNU ld and several other Unix linkers -default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" - -# AIX doesn't seem to have soname support (weird...) -aix -> "$(CXX) -shared -fPIC" - -darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)" -hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)" -solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)" -# Gotta use ld directly on BeOS, their GCC is busted -beos -> "ld -shared -h $(SONAME)" - - - -# 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" -cellppu -> "" - -# Default family options (SUBMODEL is substitued with the real submodel) -# Anything after the quotes is what should be *removed* from the submodel name -# before it's put into SUBMODEL. -alpha -> "-mcpu=SUBMODEL" alpha- -amd64 -> "-march=SUBMODEL -momit-leaf-frame-pointer" -arm -> "-mcpu=SUBMODEL" -ia32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" -ia64 -> "-mtune=SUBMODEL" -hppa -> "-march=SUBMODEL" hppa -m68k -> "-mSUBMODEL" -hitachi-sh -> "-mSUBMODEL" hitachi-sh -sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- -sparc64 -> "-mcpu=v9 -mtune=ultrasparc" -mips32 -> "-mips1 -mcpu=SUBMODEL" mips32- -mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- -ppc -> "-mcpu=SUBMODEL" ppc -ppc64 -> "-mcpu=SUBMODEL" ppc - - -# Note that the 'linking' bit means "use this for both compiling *and* linking" - -amd64 -> "-m64" -mips64 -> "-mabi=64" -s390 -> "-m31" -s390x -> "-m64" -sparc32 -> "-m32 -mno-app-regs" -sparc64 -> "-m64 -mno-app-regs" -ppc64 -> "-m64" - -# This should probably be used on most/all targets, but the docs are incomplete -openbsd -> "-pthread" -freebsd -> "-pthread" -dragonfly -> "-pthread" -netbsd -> "-pthread -D_NETBSD_SOURCE" -qnx -> "-fexceptions -D_QNX_SOURCE" - diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt new file mode 100644 index 000000000..978ed6d58 --- /dev/null +++ b/src/build-data/cc/gcc.txt @@ -0,0 +1,89 @@ +realname "GNU C++" + +binary_name "g++" + +compiler_has_tr1 yes + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lang_flags "-D_REENTRANT -ansi -Wno-long-long" +warning_flags "-W -Wall" +#warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" + +lib_opt_flags "-O2 -finline-functions" +check_opt_flags "-O2" +shared_flags "-fPIC" +debug_flags "-g" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +# The default works for GNU ld and several other Unix linkers +default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" + +# AIX doesn't seem to have soname support (weird...) +aix -> "$(CXX) -shared -fPIC" + +darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)" +hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)" +solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)" +# Gotta use ld directly on BeOS, their GCC is busted +beos -> "ld -shared -h $(SONAME)" + + + +# 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" +cellppu -> "" + +# Default family options (SUBMODEL is substitued with the real submodel) +# Anything after the quotes is what should be *removed* from the submodel name +# before it's put into SUBMODEL. +alpha -> "-mcpu=SUBMODEL" alpha- +amd64 -> "-march=SUBMODEL -momit-leaf-frame-pointer" +arm -> "-mcpu=SUBMODEL" +ia32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" +ia64 -> "-mtune=SUBMODEL" +hppa -> "-march=SUBMODEL" hppa +m68k -> "-mSUBMODEL" +hitachi-sh -> "-mSUBMODEL" hitachi-sh +sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- +sparc64 -> "-mcpu=v9 -mtune=ultrasparc" +mips32 -> "-mips1 -mcpu=SUBMODEL" mips32- +mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- +ppc -> "-mcpu=SUBMODEL" ppc +ppc64 -> "-mcpu=SUBMODEL" ppc + + +# Note that the 'linking' bit means "use this for both compiling *and* linking" + +amd64 -> "-m64" +mips64 -> "-mabi=64" +s390 -> "-m31" +s390x -> "-m64" +sparc32 -> "-m32 -mno-app-regs" +sparc64 -> "-m64 -mno-app-regs" +ppc64 -> "-m64" + +# This should probably be used on most/all targets, but the docs are incomplete +openbsd -> "-pthread" +freebsd -> "-pthread" +dragonfly -> "-pthread" +netbsd -> "-pthread -D_NETBSD_SOURCE" +qnx -> "-fexceptions -D_QNX_SOURCE" + diff --git a/src/build-data/cc/hpcc b/src/build-data/cc/hpcc deleted file mode 100644 index 284e92ca6..000000000 --- a/src/build-data/cc/hpcc +++ /dev/null @@ -1,32 +0,0 @@ -realname "HP-UX C++" - -binary_name "aCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "+O2" -check_opt_flags "+O2" -debug_flags "-g" -no_debug_flags "" -lang_flags "-AA -ext +eh -z" -warning_flags "" # +w -shared_flags "+Z" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -hppa1.0 -> "+DAportable" -hppa1.1 -> "+DA1.1" -hppa2.0 -> "+DA2.0W" - - - -default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?) - diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt new file mode 100644 index 000000000..284e92ca6 --- /dev/null +++ b/src/build-data/cc/hpcc.txt @@ -0,0 +1,32 @@ +realname "HP-UX C++" + +binary_name "aCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "+O2" +check_opt_flags "+O2" +debug_flags "-g" +no_debug_flags "" +lang_flags "-AA -ext +eh -z" +warning_flags "" # +w +shared_flags "+Z" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +hppa1.0 -> "+DAportable" +hppa1.1 -> "+DA1.1" +hppa2.0 -> "+DA2.0W" + + + +default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?) + diff --git a/src/build-data/cc/icc b/src/build-data/cc/icc deleted file mode 100644 index 7d8e9682f..000000000 --- a/src/build-data/cc/icc +++ /dev/null @@ -1,35 +0,0 @@ -realname "Intel C++" - -binary_name "icpc" - -compiler_has_tr1 yes - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O2 -ip -unroll" -check_opt_flags "-O2" -debug_flags "-g" -no_debug_flags "-fomit-frame-pointer" -lang_flags "" -warning_flags "-w1" -shared_flags "-fPIC" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -pentium3 -> "-march=pentium3" -pentium4 -> "-march=pentium4" -pentium-m -> "-march=pentium3" -core2 -> "-march=core2" - - - -default -> "$(CXX) -fPIC -shared" - diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt new file mode 100644 index 000000000..7d8e9682f --- /dev/null +++ b/src/build-data/cc/icc.txt @@ -0,0 +1,35 @@ +realname "Intel C++" + +binary_name "icpc" + +compiler_has_tr1 yes + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O2 -ip -unroll" +check_opt_flags "-O2" +debug_flags "-g" +no_debug_flags "-fomit-frame-pointer" +lang_flags "" +warning_flags "-w1" +shared_flags "-fPIC" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +pentium3 -> "-march=pentium3" +pentium4 -> "-march=pentium4" +pentium-m -> "-march=pentium3" +core2 -> "-march=core2" + + + +default -> "$(CXX) -fPIC -shared" + diff --git a/src/build-data/cc/kai b/src/build-data/cc/kai deleted file mode 100644 index 8585e54e0..000000000 --- a/src/build-data/cc/kai +++ /dev/null @@ -1,30 +0,0 @@ -realname "KAI C++" - -binary_name "KCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -ar_command "KCC -o" - -lib_opt_flags "+K3 --inline_auto_space_time=65 --abstract_pointer" -check_opt_flags "+K3" -lang_flags "-D__KAI_STRICT" -debug_flags "-g" -no_debug_flags "" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) --soname $(SONAME)" - - - -all -> "--one_per" - diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt new file mode 100644 index 000000000..8585e54e0 --- /dev/null +++ b/src/build-data/cc/kai.txt @@ -0,0 +1,30 @@ +realname "KAI C++" + +binary_name "KCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +ar_command "KCC -o" + +lib_opt_flags "+K3 --inline_auto_space_time=65 --abstract_pointer" +check_opt_flags "+K3" +lang_flags "-D__KAI_STRICT" +debug_flags "-g" +no_debug_flags "" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) --soname $(SONAME)" + + + +all -> "--one_per" + diff --git a/src/build-data/cc/mipspro b/src/build-data/cc/mipspro deleted file mode 100644 index b75fc4fb3..000000000 --- a/src/build-data/cc/mipspro +++ /dev/null @@ -1,42 +0,0 @@ -realname "SGI MIPSPro C++" - -binary_name "CC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O3 -OPT:alias=TYPED" -check_opt_flags "-O3 -OPT:alias=TYPED" -debug_flags "-g3" -no_debug_flags "" -shared_flags "-KPIC" -lang_flags "-ansi -LANG:ansi-for-init-scope=ON" -# Disabled, because, while my code is fine, it warns about a lot of it's own -# headers -#warning_flags "-fullwarn" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" - - - -mips32 -> "-mips1" -mips64 -> "-mips3" - -mips64-r5000 -> "-mips4 -r5000" -mips64-r8000 -> "-mips4 -r8000" -mips64-r10000 -> "-mips4 -r10000" - - - -mips32 -> "-n32" -mips64 -> "-64" - diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt new file mode 100644 index 000000000..b75fc4fb3 --- /dev/null +++ b/src/build-data/cc/mipspro.txt @@ -0,0 +1,42 @@ +realname "SGI MIPSPro C++" + +binary_name "CC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O3 -OPT:alias=TYPED" +check_opt_flags "-O3 -OPT:alias=TYPED" +debug_flags "-g3" +no_debug_flags "" +shared_flags "-KPIC" +lang_flags "-ansi -LANG:ansi-for-init-scope=ON" +# Disabled, because, while my code is fine, it warns about a lot of it's own +# headers +#warning_flags "-fullwarn" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" + + + +mips32 -> "-mips1" +mips64 -> "-mips3" + +mips64-r5000 -> "-mips4 -r5000" +mips64-r8000 -> "-mips4 -r8000" +mips64-r10000 -> "-mips4 -r10000" + + + +mips32 -> "-n32" +mips64 -> "-64" + diff --git a/src/build-data/cc/msvc b/src/build-data/cc/msvc deleted file mode 100644 index 68e4517f8..000000000 --- a/src/build-data/cc/msvc +++ /dev/null @@ -1,27 +0,0 @@ -realname "Visual C++" - -binary_name "cl.exe" - -compile_option "/nologo /c " -output_to_option "/Fo" -add_include_dir_option "/I" -add_lib_dir_option "-L" -add_lib_option "" - -lib_opt_flags "/O2" -check_opt_flags "/O2" -debug_flags "/Zi" -no_debug_flags "" -lang_flags "/EHsc /GR /D_CONSOLE" -warning_flags "" - -dll_import_flags "__declspec(dllimport)" -dll_export_flags "__declspec(dllexport)" - -ar_command "lib" - -makefile_style nmake - - -default -> "link /DLL" - diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt new file mode 100644 index 000000000..68e4517f8 --- /dev/null +++ b/src/build-data/cc/msvc.txt @@ -0,0 +1,27 @@ +realname "Visual C++" + +binary_name "cl.exe" + +compile_option "/nologo /c " +output_to_option "/Fo" +add_include_dir_option "/I" +add_lib_dir_option "-L" +add_lib_option "" + +lib_opt_flags "/O2" +check_opt_flags "/O2" +debug_flags "/Zi" +no_debug_flags "" +lang_flags "/EHsc /GR /D_CONSOLE" +warning_flags "" + +dll_import_flags "__declspec(dllimport)" +dll_export_flags "__declspec(dllexport)" + +ar_command "lib" + +makefile_style nmake + + +default -> "link /DLL" + diff --git a/src/build-data/cc/open64 b/src/build-data/cc/open64 deleted file mode 100644 index b7c1e9e99..000000000 --- a/src/build-data/cc/open64 +++ /dev/null @@ -1,30 +0,0 @@ -realname "Open64" - -binary_name "openCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O3 -OPT:alias=TYPED" -check_opt_flags "-O3 -OPT:alias=TYPED" -debug_flags "-g3" -no_debug_flags "-fomit-frame-pointer" -shared_flags "-fPIC" -lang_flags "-ansi -LANG:ansi-for-init-scope=ON" -warning_flags "-Wall -W" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" - - - -amd64 -> "-m64" - diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt new file mode 100644 index 000000000..b7c1e9e99 --- /dev/null +++ b/src/build-data/cc/open64.txt @@ -0,0 +1,30 @@ +realname "Open64" + +binary_name "openCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O3 -OPT:alias=TYPED" +check_opt_flags "-O3 -OPT:alias=TYPED" +debug_flags "-g3" +no_debug_flags "-fomit-frame-pointer" +shared_flags "-fPIC" +lang_flags "-ansi -LANG:ansi-for-init-scope=ON" +warning_flags "-Wall -W" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" + + + +amd64 -> "-m64" + diff --git a/src/build-data/cc/pgi b/src/build-data/cc/pgi deleted file mode 100644 index 35f466477..000000000 --- a/src/build-data/cc/pgi +++ /dev/null @@ -1,31 +0,0 @@ -realname "Portland Group C++" - -binary_name "pgCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-fast -Minline" -check_opt_flags "-fast" -shared_flags "-fPIC" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -linux -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" -solaris -> "$(CXX) -G -fPIC -Wl,-h,$(SONAME)" - - - -i586 -> "-tp p5" -i686 -> "-tp p6" -athlon -> "-tp k7" -pentium4 -> "-tp p6" -ia32 -> "-tp px" - diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt new file mode 100644 index 000000000..35f466477 --- /dev/null +++ b/src/build-data/cc/pgi.txt @@ -0,0 +1,31 @@ +realname "Portland Group C++" + +binary_name "pgCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-fast -Minline" +check_opt_flags "-fast" +shared_flags "-fPIC" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +linux -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" +solaris -> "$(CXX) -G -fPIC -Wl,-h,$(SONAME)" + + + +i586 -> "-tp p5" +i686 -> "-tp p6" +athlon -> "-tp k7" +pentium4 -> "-tp p6" +ia32 -> "-tp px" + diff --git a/src/build-data/cc/sgipro64 b/src/build-data/cc/sgipro64 deleted file mode 100644 index 28132ffcc..000000000 --- a/src/build-data/cc/sgipro64 +++ /dev/null @@ -1,30 +0,0 @@ -realname "SGI Pro64" - -binary_name "sgiCC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O3 -OPT:alias=TYPED" -check_opt_flags "-O3 -OPT:alias=TYPED" -debug_flags "-g3" -no_debug_flags "" -shared_flags "-KPIC" -lang_flags "-ansi -LANG:ansi-for-init-scope=ON" -warning_flags "-Wall -W" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" - - - - - diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt new file mode 100644 index 000000000..28132ffcc --- /dev/null +++ b/src/build-data/cc/sgipro64.txt @@ -0,0 +1,30 @@ +realname "SGI Pro64" + +binary_name "sgiCC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O3 -OPT:alias=TYPED" +check_opt_flags "-O3 -OPT:alias=TYPED" +debug_flags "-g3" +no_debug_flags "" +shared_flags "-KPIC" +lang_flags "-ansi -LANG:ansi-for-init-scope=ON" +warning_flags "-Wall -W" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" + + + + + diff --git a/src/build-data/cc/sunwspro b/src/build-data/cc/sunwspro deleted file mode 100644 index e1bc0b26f..000000000 --- a/src/build-data/cc/sunwspro +++ /dev/null @@ -1,47 +0,0 @@ -realname "Sun Workshop Pro C++" - -binary_name "CC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -# The compiler supports up to -xO5, but anything higher than -xO2 causes -# incorrect results, infinite loops, other badness. :( -lib_opt_flags "-xO2" -check_opt_flags "-xO2" -debug_flags "-g" -no_debug_flags "" -shared_flags "-KPIC" -warning_flags "+w" -lang_flags "+p -D__EXTENSIONS__" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -default -> "$(CXX) -G -h$(SONAME)" - - - -i386 -> "-xtarget=486" -i486 -> "-xtarget=486" -i586 -> "-xtarget=pentium" -i686 -> "-xtarget=pentium_pro" -pentium4 -> "-xtarget=pentium_pro" -k6 -> "-xtarget=pentium" - -sparc32-v9 -> "-xchip=ultra -xarch=v8" - -sparc32 -> "-xchip=ultra -xarch=SUBMODEL" sparc32- -sparc64 -> "-xchip=SUBMODEL" sparc64- - - - -sparc64 -> "-xarch=v9" -amd64 -> "-m64" - diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt new file mode 100644 index 000000000..e1bc0b26f --- /dev/null +++ b/src/build-data/cc/sunwspro.txt @@ -0,0 +1,47 @@ +realname "Sun Workshop Pro C++" + +binary_name "CC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +# The compiler supports up to -xO5, but anything higher than -xO2 causes +# incorrect results, infinite loops, other badness. :( +lib_opt_flags "-xO2" +check_opt_flags "-xO2" +debug_flags "-g" +no_debug_flags "" +shared_flags "-KPIC" +warning_flags "+w" +lang_flags "+p -D__EXTENSIONS__" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +default -> "$(CXX) -G -h$(SONAME)" + + + +i386 -> "-xtarget=486" +i486 -> "-xtarget=486" +i586 -> "-xtarget=pentium" +i686 -> "-xtarget=pentium_pro" +pentium4 -> "-xtarget=pentium_pro" +k6 -> "-xtarget=pentium" + +sparc32-v9 -> "-xchip=ultra -xarch=v8" + +sparc32 -> "-xchip=ultra -xarch=SUBMODEL" sparc32- +sparc64 -> "-xchip=SUBMODEL" sparc64- + + + +sparc64 -> "-xarch=v9" +amd64 -> "-m64" + diff --git a/src/build-data/cc/xlc b/src/build-data/cc/xlc deleted file mode 100644 index 64b888421..000000000 --- a/src/build-data/cc/xlc +++ /dev/null @@ -1,29 +0,0 @@ -realname "IBM XL C/C++" - -binary_name "xlC" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O2" -check_opt_flags "-O2" -lang_flags "" -debug_flags "-g" -no_debug_flags "" - -dll_import_flags "" -dll_export_flags "" - -makefile_style unix - - -cellppu -> "-qarch=cell" -ppc970 -> "-qarch=ppc970" -power4 -> "-qarch=pwr4" -power5 -> "-qarch=pwr5" - -cellppu -> "-qarch=cell" - diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt new file mode 100644 index 000000000..64b888421 --- /dev/null +++ b/src/build-data/cc/xlc.txt @@ -0,0 +1,29 @@ +realname "IBM XL C/C++" + +binary_name "xlC" + +compile_option "-c " +output_to_option "-o " +add_include_dir_option "-I" +add_lib_dir_option "-L" +add_lib_option "-l" + +lib_opt_flags "-O2" +check_opt_flags "-O2" +lang_flags "" +debug_flags "-g" +no_debug_flags "" + +dll_import_flags "" +dll_export_flags "" + +makefile_style unix + + +cellppu -> "-qarch=cell" +ppc970 -> "-qarch=ppc970" +power4 -> "-qarch=pwr4" +power5 -> "-qarch=pwr5" + +cellppu -> "-qarch=cell" + diff --git a/src/build-data/os/aix b/src/build-data/os/aix deleted file mode 100644 index cec818580..000000000 --- a/src/build-data/os/aix +++ /dev/null @@ -1,7 +0,0 @@ -realname "AIX" - -os_type unix - - -all - diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt new file mode 100644 index 000000000..cec818580 --- /dev/null +++ b/src/build-data/os/aix.txt @@ -0,0 +1,7 @@ +realname "AIX" + +os_type unix + + +all + diff --git a/src/build-data/os/beos b/src/build-data/os/beos deleted file mode 100644 index 2b12792bb..000000000 --- a/src/build-data/os/beos +++ /dev/null @@ -1,16 +0,0 @@ -realname "BeOS" - -os_type beos - -install_root /boot/beos -header_dir ../develop/headers -lib_dir system/lib -doc_dir documentation - - -all - - - -haiku - diff --git a/src/build-data/os/beos.txt b/src/build-data/os/beos.txt new file mode 100644 index 000000000..2b12792bb --- /dev/null +++ b/src/build-data/os/beos.txt @@ -0,0 +1,16 @@ +realname "BeOS" + +os_type beos + +install_root /boot/beos +header_dir ../develop/headers +lib_dir system/lib +doc_dir documentation + + +all + + + +haiku + diff --git a/src/build-data/os/cygwin b/src/build-data/os/cygwin deleted file mode 100644 index c2aadea98..000000000 --- a/src/build-data/os/cygwin +++ /dev/null @@ -1,13 +0,0 @@ -realname "Cygwin" - -os_type unix - -install_root c:\Botan -doc_dir docs - -# Cygwin supports shared libs fine, but there are problems with making a Botan -# shared library when libraries it depends on are static-only (such as libz). -# So until I can figure out a work-around, it's disabled. - -#all - diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt new file mode 100644 index 000000000..c2aadea98 --- /dev/null +++ b/src/build-data/os/cygwin.txt @@ -0,0 +1,13 @@ +realname "Cygwin" + +os_type unix + +install_root c:\Botan +doc_dir docs + +# Cygwin supports shared libs fine, but there are problems with making a Botan +# shared library when libraries it depends on are static-only (such as libz). +# So until I can figure out a work-around, it's disabled. + +#all + diff --git a/src/build-data/os/darwin b/src/build-data/os/darwin deleted file mode 100644 index 298621216..000000000 --- a/src/build-data/os/darwin +++ /dev/null @@ -1,19 +0,0 @@ -realname "Darwin / MacOS X" - -os_type unix - -so_suffix dylib - -# It doesn't have the 's' option; you need to use needs ranlib -ar_command "ar cr" -ar_needs_ranlib yes - -doc_dir doc - - -all - - - -macosx - diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt new file mode 100644 index 000000000..298621216 --- /dev/null +++ b/src/build-data/os/darwin.txt @@ -0,0 +1,19 @@ +realname "Darwin / MacOS X" + +os_type unix + +so_suffix dylib + +# It doesn't have the 's' option; you need to use needs ranlib +ar_command "ar cr" +ar_needs_ranlib yes + +doc_dir doc + + +all + + + +macosx + diff --git a/src/build-data/os/defaults b/src/build-data/os/defaults deleted file mode 100644 index 5648643a9..000000000 --- a/src/build-data/os/defaults +++ /dev/null @@ -1,19 +0,0 @@ -# Defaults are for a Unix box, since that's what most of OS variants are. It -# would be nice to have generic 'windows', 'beos', 'unix', etc targets to -# handle defaults for those classes of OSes, though Unix is by far the most -# varied/fragmented - -obj_suffix o -so_suffix so -static_suffix a - -ar_command "ar crs" -ar_needs_ranlib no - -install_root /usr/local -header_dir include -lib_dir lib -doc_dir share/doc - -install_cmd_data "install -m 644" -install_cmd_exec "install -m 755" diff --git a/src/build-data/os/defaults.txt b/src/build-data/os/defaults.txt new file mode 100644 index 000000000..5648643a9 --- /dev/null +++ b/src/build-data/os/defaults.txt @@ -0,0 +1,19 @@ +# Defaults are for a Unix box, since that's what most of OS variants are. It +# would be nice to have generic 'windows', 'beos', 'unix', etc targets to +# handle defaults for those classes of OSes, though Unix is by far the most +# varied/fragmented + +obj_suffix o +so_suffix so +static_suffix a + +ar_command "ar crs" +ar_needs_ranlib no + +install_root /usr/local +header_dir include +lib_dir lib +doc_dir share/doc + +install_cmd_data "install -m 644" +install_cmd_exec "install -m 755" diff --git a/src/build-data/os/dragonfly b/src/build-data/os/dragonfly deleted file mode 100644 index 7e3663435..000000000 --- a/src/build-data/os/dragonfly +++ /dev/null @@ -1,11 +0,0 @@ -realname "DragonFly" - -os_type unix - - -posix_mlock - - - -all - diff --git a/src/build-data/os/dragonfly.txt b/src/build-data/os/dragonfly.txt new file mode 100644 index 000000000..7e3663435 --- /dev/null +++ b/src/build-data/os/dragonfly.txt @@ -0,0 +1,11 @@ +realname "DragonFly" + +os_type unix + + +posix_mlock + + + +all + diff --git a/src/build-data/os/freebsd b/src/build-data/os/freebsd deleted file mode 100644 index ea96b0c88..000000000 --- a/src/build-data/os/freebsd +++ /dev/null @@ -1,11 +0,0 @@ -realname "FreeBSD" - -os_type unix - - -posix_mlock - - - -all - diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt new file mode 100644 index 000000000..ea96b0c88 --- /dev/null +++ b/src/build-data/os/freebsd.txt @@ -0,0 +1,11 @@ +realname "FreeBSD" + +os_type unix + + +posix_mlock + + + +all + diff --git a/src/build-data/os/hpux b/src/build-data/os/hpux deleted file mode 100644 index 6e17d3b73..000000000 --- a/src/build-data/os/hpux +++ /dev/null @@ -1,13 +0,0 @@ -realname "HP-UX" - -os_type unix - -so_suffix sl - - -all - - - -hp-ux - diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt new file mode 100644 index 000000000..6e17d3b73 --- /dev/null +++ b/src/build-data/os/hpux.txt @@ -0,0 +1,13 @@ +realname "HP-UX" + +os_type unix + +so_suffix sl + + +all + + + +hp-ux + diff --git a/src/build-data/os/irix b/src/build-data/os/irix deleted file mode 100644 index fd8b43287..000000000 --- a/src/build-data/os/irix +++ /dev/null @@ -1,7 +0,0 @@ -realname "IRIX" - -os_type unix - - -all - diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt new file mode 100644 index 000000000..fd8b43287 --- /dev/null +++ b/src/build-data/os/irix.txt @@ -0,0 +1,7 @@ +realname "IRIX" + +os_type unix + + +all + diff --git a/src/build-data/os/linux b/src/build-data/os/linux deleted file mode 100644 index 53528511a..000000000 --- a/src/build-data/os/linux +++ /dev/null @@ -1,12 +0,0 @@ -realname "Linux" - -os_type unix - - -posix_mlock - - -# Is this correct? - -all - diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt new file mode 100644 index 000000000..53528511a --- /dev/null +++ b/src/build-data/os/linux.txt @@ -0,0 +1,12 @@ +realname "Linux" + +os_type unix + + +posix_mlock + + +# Is this correct? + +all + diff --git a/src/build-data/os/mingw b/src/build-data/os/mingw deleted file mode 100644 index eb25017fc..000000000 --- a/src/build-data/os/mingw +++ /dev/null @@ -1,22 +0,0 @@ -realname "MS Windows (MinGW)" -os_type windows - -obj_suffix o -so_suffix dll -static_suffix a - -ar_command "ar crs" -ar_needs_ranlib yes - -install_root /mingw -header_dir include -lib_dir lib -doc_dir share/doc - -install_cmd_data "install -m 644" -install_cmd_exec "install -m 755" - - -msys -mingw32 - diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt new file mode 100644 index 000000000..eb25017fc --- /dev/null +++ b/src/build-data/os/mingw.txt @@ -0,0 +1,22 @@ +realname "MS Windows (MinGW)" +os_type windows + +obj_suffix o +so_suffix dll +static_suffix a + +ar_command "ar crs" +ar_needs_ranlib yes + +install_root /mingw +header_dir include +lib_dir lib +doc_dir share/doc + +install_cmd_data "install -m 644" +install_cmd_exec "install -m 755" + + +msys +mingw32 + diff --git a/src/build-data/os/netbsd b/src/build-data/os/netbsd deleted file mode 100644 index 435d8f5e8..000000000 --- a/src/build-data/os/netbsd +++ /dev/null @@ -1,7 +0,0 @@ -realname "NetBSD" - -os_type unix - - -all - diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt new file mode 100644 index 000000000..435d8f5e8 --- /dev/null +++ b/src/build-data/os/netbsd.txt @@ -0,0 +1,7 @@ +realname "NetBSD" + +os_type unix + + +all + diff --git a/src/build-data/os/openbsd b/src/build-data/os/openbsd deleted file mode 100644 index cb44bd115..000000000 --- a/src/build-data/os/openbsd +++ /dev/null @@ -1,7 +0,0 @@ -realname "OpenBSD" - -os_type unix - - -all - diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt new file mode 100644 index 000000000..cb44bd115 --- /dev/null +++ b/src/build-data/os/openbsd.txt @@ -0,0 +1,7 @@ +realname "OpenBSD" + +os_type unix + + +all + diff --git a/src/build-data/os/qnx b/src/build-data/os/qnx deleted file mode 100644 index 28bc8dea9..000000000 --- a/src/build-data/os/qnx +++ /dev/null @@ -1,7 +0,0 @@ -realname "QNX" - -os_type unix - - -all - diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt new file mode 100644 index 000000000..28bc8dea9 --- /dev/null +++ b/src/build-data/os/qnx.txt @@ -0,0 +1,7 @@ +realname "QNX" + +os_type unix + + +all + diff --git a/src/build-data/os/solaris b/src/build-data/os/solaris deleted file mode 100644 index 8610b4898..000000000 --- a/src/build-data/os/solaris +++ /dev/null @@ -1,15 +0,0 @@ -realname "Solaris" - -os_type unix - - -posix_mlock - - - -all - - - -sunos - diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt new file mode 100644 index 000000000..8610b4898 --- /dev/null +++ b/src/build-data/os/solaris.txt @@ -0,0 +1,15 @@ +realname "Solaris" + +os_type unix + + +posix_mlock + + + +all + + + +sunos + diff --git a/src/build-data/os/tru64 b/src/build-data/os/tru64 deleted file mode 100644 index e320c1df4..000000000 --- a/src/build-data/os/tru64 +++ /dev/null @@ -1,11 +0,0 @@ -realname "Tru64" - -os_type unix - - -all - - - -osf1 - diff --git a/src/build-data/os/tru64.txt b/src/build-data/os/tru64.txt new file mode 100644 index 000000000..e320c1df4 --- /dev/null +++ b/src/build-data/os/tru64.txt @@ -0,0 +1,11 @@ +realname "Tru64" + +os_type unix + + +all + + + +osf1 + diff --git a/src/build-data/os/windows b/src/build-data/os/windows deleted file mode 100644 index a04d609b8..000000000 --- a/src/build-data/os/windows +++ /dev/null @@ -1,26 +0,0 @@ -realname "MS Windows" - -os_type windows - -obj_suffix obj -so_suffix dll -static_suffix lib - -install_root c:\Botan -doc_dir docs - -install_cmd_data "copy" -install_cmd_exec "copy" - - -win32_virtual_lock - - - -msvc - - - -win32 -MSWin32 - diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt new file mode 100644 index 000000000..a04d609b8 --- /dev/null +++ b/src/build-data/os/windows.txt @@ -0,0 +1,26 @@ +realname "MS Windows" + +os_type windows + +obj_suffix obj +so_suffix dll +static_suffix lib + +install_root c:\Botan +doc_dir docs + +install_cmd_data "copy" +install_cmd_exec "copy" + + +win32_virtual_lock + + + +msvc + + + +win32 +MSWin32 + -- cgit v1.2.3