From 9eb026fb7ed4f5c3360908cb1f3d6417d74c7f6f Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Jan 2012 10:14:32 +0000 Subject: [PATCH] ARM support: updated wmake rules --- wmake/rules/linuxARM7/c++Opt | 2 -- wmake/rules/linuxARM7/cOpt | 2 -- wmake/rules/{linuxARM7 => linuxARM7Gcc}/c | 0 wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++ | 0 wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++Debug | 0 wmake/rules/linuxARM7Gcc/c++Opt | 3 +++ wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++Prof | 0 wmake/rules/{linuxARM7 => linuxARM7Gcc}/cDebug | 0 wmake/rules/linuxARM7Gcc/cOpt | 3 +++ wmake/rules/{linuxARM7 => linuxARM7Gcc}/cProf | 0 wmake/rules/{linuxARM7 => linuxARM7Gcc}/general | 2 +- wmake/rules/linuxARM7Gcc/mplibHPMPI | 3 +++ 12 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 wmake/rules/linuxARM7/c++Opt delete mode 100644 wmake/rules/linuxARM7/cOpt rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/c (100%) rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++ (100%) rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++Debug (100%) create mode 100644 wmake/rules/linuxARM7Gcc/c++Opt rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/c++Prof (100%) rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/cDebug (100%) create mode 100644 wmake/rules/linuxARM7Gcc/cOpt rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/cProf (100%) rename wmake/rules/{linuxARM7 => linuxARM7Gcc}/general (85%) create mode 100644 wmake/rules/linuxARM7Gcc/mplibHPMPI diff --git a/wmake/rules/linuxARM7/c++Opt b/wmake/rules/linuxARM7/c++Opt deleted file mode 100644 index 8f52814824..0000000000 --- a/wmake/rules/linuxARM7/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/wmake/rules/linuxARM7/cOpt b/wmake/rules/linuxARM7/cOpt deleted file mode 100644 index 1e61a7a81c..0000000000 --- a/wmake/rules/linuxARM7/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/wmake/rules/linuxARM7/c b/wmake/rules/linuxARM7Gcc/c similarity index 100% rename from wmake/rules/linuxARM7/c rename to wmake/rules/linuxARM7Gcc/c diff --git a/wmake/rules/linuxARM7/c++ b/wmake/rules/linuxARM7Gcc/c++ similarity index 100% rename from wmake/rules/linuxARM7/c++ rename to wmake/rules/linuxARM7Gcc/c++ diff --git a/wmake/rules/linuxARM7/c++Debug b/wmake/rules/linuxARM7Gcc/c++Debug similarity index 100% rename from wmake/rules/linuxARM7/c++Debug rename to wmake/rules/linuxARM7Gcc/c++Debug diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt new file mode 100644 index 0000000000..35fb837535 --- /dev/null +++ b/wmake/rules/linuxARM7Gcc/c++Opt @@ -0,0 +1,3 @@ +c++DBUG = +#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard +c++OPT = -O2 -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=soft diff --git a/wmake/rules/linuxARM7/c++Prof b/wmake/rules/linuxARM7Gcc/c++Prof similarity index 100% rename from wmake/rules/linuxARM7/c++Prof rename to wmake/rules/linuxARM7Gcc/c++Prof diff --git a/wmake/rules/linuxARM7/cDebug b/wmake/rules/linuxARM7Gcc/cDebug similarity index 100% rename from wmake/rules/linuxARM7/cDebug rename to wmake/rules/linuxARM7Gcc/cDebug diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt new file mode 100644 index 0000000000..4d60afe8f9 --- /dev/null +++ b/wmake/rules/linuxARM7Gcc/cOpt @@ -0,0 +1,3 @@ +cDBUG = +#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard +cOPT = -O3 -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard diff --git a/wmake/rules/linuxARM7/cProf b/wmake/rules/linuxARM7Gcc/cProf similarity index 100% rename from wmake/rules/linuxARM7/cProf rename to wmake/rules/linuxARM7Gcc/cProf diff --git a/wmake/rules/linuxARM7/general b/wmake/rules/linuxARM7Gcc/general similarity index 85% rename from wmake/rules/linuxARM7/general rename to wmake/rules/linuxARM7Gcc/general index fa1eb5b925..376c614846 100644 --- a/wmake/rules/linuxARM7/general +++ b/wmake/rules/linuxARM7Gcc/general @@ -1,5 +1,5 @@ CPP = cpp -traditional-cpp $(GFLAGS) -LD = ld -melf_i386 +LD = ld PROJECT_LIBS = -l$(WM_PROJECT) -ldl diff --git a/wmake/rules/linuxARM7Gcc/mplibHPMPI b/wmake/rules/linuxARM7Gcc/mplibHPMPI new file mode 100644 index 0000000000..8aff40632b --- /dev/null +++ b/wmake/rules/linuxARM7Gcc/mplibHPMPI @@ -0,0 +1,3 @@ +PFLAGS = +PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H +PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi