samples: Update ol7u9 configs

Update the ol7u9 configs to use versions of isl and cloog that work with
the version of GCC that oracle uses. Add a note that these configs are
obsolete. They will be dropped after the next release.

Signed-off-by: Chris Packham <judge.packham@gmail.com>

6 files changed, 17 insertions, 27 deletions

diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
index e93dcce6..7e594250 100644
--- a/samples/aarch64-ol7u9-linux-gnu/crosstool.config
+++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
@@ -6,22 +6,18 @@ CT_TARGET_VENDOR="ol7u9"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
 CT_BINUTILS_USE_ORACLE=y
-CT_BINUTILS_ORACLE_V_2_27=y
 CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol7-u9-aarch64"
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9-aarch64"
+CT_GLIBC_ORACLE_V_2_17=y
 CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
 CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_GLIBC_ORACLE_V_2_17=y
-CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9-aarch64"
-CT_CLOOG_V_0_18_0=y
-CT_CLOOG_VERSION="0.18.0"
-CT_ISL_V_0_11=y
-CT_ISL_VERSION="0.11.1"
 CT_GCC_USE_ORACLE=y
 CT_GCC_ORACLE_V_4_8=y
-CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
 CT_CC_LANG_CXX=y
+CT_CLOOG_V_0_18_1=y
+CT_ISL_V_0_11=y
diff --git a/samples/aarch64-ol7u9-linux-gnu/reported.by b/samples/aarch64-ol7u9-linux-gnu/reported.by
index 964d9dd1..9b32acfc 100644
--- a/samples/aarch64-ol7u9-linux-gnu/reported.by
+++ b/samples/aarch64-ol7u9-linux-gnu/reported.by
@@ -1,3 +1,3 @@
 reporter_name="Jose E. Marchesi"
 reporter_url=""
-reporter_comment="OL 7.9 toolchain configured for AARCH64"
+reporter_comment="OL 7.9 toolchain configured for AARCH64 (obsolete)"
diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
index 9423209e..3e076235 100644
--- a/samples/arm-ol7u9-linux-gnueabi/crosstool.config
+++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
@@ -6,22 +6,19 @@ CT_TARGET_VENDOR="ol7u9"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
 CT_BINUTILS_USE_ORACLE=y
-CT_BINUTILS_ORACLE_V_2_27=y
 CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol7-u9-arm"
+CT_BINUTILS_ORACLE_V_2_27=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9"
+CT_GLIBC_ORACLE_V_2_17=y
 CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
 CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_GLIBC_ORACLE_V_2_17=y
-CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9"
-CT_CLOOG_V_0_18_0=y
-CT_CLOOG_VERSION="0.18.0"
-CT_ISL_V_0_11=y
-CT_ISL_VERSION="0.11.1"
 CT_GCC_USE_ORACLE=y
 CT_GCC_ORACLE_V_4_8=y
-CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
 CT_CC_LANG_CXX=y
+CT_CLOOG_V_0_18_1=y
+CT_ISL_V_0_11=y
diff --git a/samples/arm-ol7u9-linux-gnueabi/reported.by b/samples/arm-ol7u9-linux-gnueabi/reported.by
index 19080faa..bbe42fa3 100644
--- a/samples/arm-ol7u9-linux-gnueabi/reported.by
+++ b/samples/arm-ol7u9-linux-gnueabi/reported.by
@@ -1,3 +1,3 @@
 reporter_name="Jose E. Marchesi"
 reporter_url=""
-reporter_comment="OL 7.9 toolchain configured for ARM w/o fp hardware"
+reporter_comment="OL 7.9 toolchain configured for ARM w/o fp hardware (obsolete)"
diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
index b66fadc1..6153a9fb 100644
--- a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
+++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
@@ -6,22 +6,19 @@ CT_TARGET_VENDOR="ol7u9"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
 CT_BINUTILS_USE_ORACLE=y
-CT_BINUTILS_ORACLE_V_2_27=y
 CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol7-u9-arm"
+CT_BINUTILS_ORACLE_V_2_27=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9"
+CT_GLIBC_ORACLE_V_2_17=y
 CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
 CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_GLIBC_ORACLE_V_2_17=y
-CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol7-u9"
-CT_CLOOG_V_0_18_0=y
-CT_CLOOG_VERSION="0.18.0"
-CT_ISL_V_0_11=y
-CT_ISL_VERSION="0.11.1"
 CT_GCC_USE_ORACLE=y
 CT_GCC_ORACLE_V_4_8=y
-CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
 CT_CC_LANG_CXX=y
+CT_CLOOG_V_0_18_1=y
+CT_ISL_V_0_11=y
diff --git a/samples/arm-ol7u9-linux-gnueabihf/reported.by b/samples/arm-ol7u9-linux-gnueabihf/reported.by
index 96dee7ee..2a43993f 100644
--- a/samples/arm-ol7u9-linux-gnueabihf/reported.by
+++ b/samples/arm-ol7u9-linux-gnueabihf/reported.by
@@ -1,3 +1,3 @@
 reporter_name="Jose E. Marchesi"
 reporter_url=""
-reporter_comment="OL 7.9 toolchain configured for ARM with fp hardware"
+reporter_comment="OL 7.9 toolchain configured for ARM with fp hardware (obsolete)"