meta-vitis-tc: aarch32-tc: Remove unused multilibs

This should save a considerable amount of disk space.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 5 insertions, 138 deletions

diff --git a/meta-vitis-tc/conf/machine/aarch32-tc.conf b/meta-vitis-tc/conf/machine/aarch32-tc.conf
index 5b59bc6a..644a677d 100644
--- a/meta-vitis-tc/conf/machine/aarch32-tc.conf
+++ b/meta-vitis-tc/conf/machine/aarch32-tc.conf
@@ -6,16 +6,12 @@ require conf/machine/include/baremetal-tc.conf
 # Define all of the multilibs supproted by this configuration
 MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
 
-MULTILIBS  = "multilib:libarmv5tesoftfp multilib:libarmv5tehard"
-MULTILIBS += "multilib:libnofp"
-MULTILIBS += "multilib:libv7nofp multilib:libv7fpsoftfp multilib:libv7fphard"
-MULTILIBS += "multilib:libv7anofp"
-MULTILIBS += "multilib:libv7afpsoftfp"
-MULTILIBS += "multilib:libv7afpthf multilib:libv7asimdsoftfp"
-MULTILIBS += "multilib:libv7asimdhard multilib:libv7vesimdsoftfp"
+MULTILIBS  = ""
+MULTILIBS += "multilib:libv7fphard"
+MULTILIBS += "multilib:libv7afpthf"
+MULTILIBS += "multilib:libv7asimdhard"
 MULTILIBS += "multilib:libvtvesimdhf"
-MULTILIBS += "multilib:libv8anofp"
-MULTILIBS += "multilib:libv8asimdsoftfp multilib:libv8asimdhard"
+MULTILIBS += "multilib:libv8asimdhard"
 
 TUNE_CCARGS = "${TUNE_CCARGS:tune-${DEFAULTTUNE}}"
 TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
@@ -32,66 +28,6 @@ TUNE_CCARGS:tune-aarch32 = ""
 TUNE_PKGARCH:tune-aarch32 = "aarch32"
 
 
-# arm/v5te/softfp
-# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
-
-AVAILTUNES += "armv5tesoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}"
-BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp"
-TUNE_FEATURES:tune-armv5tesoftfp = "arm"
-TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp"
-
-
-# arm/v5te/hard
-# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard
-DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard"
-
-AVAILTUNES += "armv5tehard"
-PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}"
-BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard"
-TUNE_FEATURES:tune-armv5tehard = "arm"
-TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
-TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf"
-
-
-# thumb/nofp
-# CFLAGS: -mthumb -mfloat-abi=soft
-DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp"
-
-AVAILTUNES += "armnofp"
-PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}"
-BASE_LIB:tune-armnofp = "lib/thumb/nofp"
-TUNE_FEATURES:tune-armnofp = "arm"
-TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft"
-TUNE_PKGARCH:tune-armnofp = "armt"
-
-
-# thumb/v7/nofp
-# CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft
-DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp"
-
-AVAILTUNES += "armv7nofp"
-PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}"
-BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp"
-TUNE_FEATURES:tune-armv7nofp = "arm"
-TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
-TUNE_PKGARCH:tune-armv7nofp = "armv7t"
-
-
-# thumb/v7+fp/softfp
-# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
-
-AVAILTUNES += "armv7fpsoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}"
-BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
-TUNE_FEATURES:tune-armv7fpsoftfp = "arm"
-TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt"
-
-
 # thumb/v7+fp/hard
 # CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard
 DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard"
@@ -104,30 +40,6 @@ TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
 TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf"
 
 
-# thumb/v7-a/nofp
-# CFLAGS: -mthumb -march=armv7-a -mfloat-abi=soft
-DEFAULTTUNE:virtclass-multilib-libv7anofp = "armv7anofp"
-
-AVAILTUNES += "armv7anofp"
-PACKAGE_EXTRA_ARCHS:tune-armv7anofp = "${TUNE_PKGARCH:tune-armv7anofp}"
-BASE_LIB:tune-armv7anofp = "lib/thumb/v7-a/nofp"
-TUNE_FEATURES:tune-armv7anofp = "arm"
-TUNE_CCARGS:tune-armv7anofp = "-mthumb -march=armv7-a -mfloat-abi=soft"
-TUNE_PKGARCH:tune-armv7anofp = "armv7at"
-
-
-# thumb/v7-a+fp/softfp
-# CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libv7afpsoftfp = "armv7afpsoftfp"
-
-AVAILTUNES += "armv7afpsoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv7afpsoftfp = "${TUNE_PKGARCH:tune-armv7afpsoftfp}"
-BASE_LIB:tune-armv7afpsoftfp = "lib/thumb/v7-a+fp/softfp"
-TUNE_FEATURES:tune-armv7afpsoftfp = "arm"
-TUNE_CCARGS:tune-armv7afpsoftfp = "-mthumb -march=armv7-a+fp -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv7afpsoftfp = "armv7afpt"
-
-
 # thumb/v7-a+fp/hard
 # CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=hard
 DEFAULTTUNE:virtclass-multilib-libv7afpthf = "armv7afpthf"
@@ -139,17 +51,6 @@ TUNE_FEATURES:tune-armv7afpthf = "arm"
 TUNE_CCARGS:tune-armv7afpthf = "-mthumb -march=armv7-a+fp -mfloat-abi=hard"
 TUNE_PKGARCH:tune-armv7afpthf = "armv7afpthf"
 
-# thumb/v7-a+simd/softfp
-# CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libv7asimdsoftfp = "armv7asimdsoftfp"
-
-AVAILTUNES += "armv7asimdsoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv7asimdsoftfp = "${TUNE_PKGARCH:tune-armv7asimdsoftfp}"
-BASE_LIB:tune-armv7asimdsoftfp = "lib/thumb/v7-a+simd/softfp"
-TUNE_FEATURES:tune-armv7asimdsoftfp = "arm"
-TUNE_CCARGS:tune-armv7asimdsoftfp = "-mthumb -march=armv7-a+simd -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv7asimdsoftfp = "armv7asimdt"
-
 
 # thumb/v7-a+simd/hard
 # CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=hard
@@ -163,17 +64,6 @@ TUNE_CCARGS:tune-armv7asimdhard = "-mthumb -march=armv7-a+simd -mfloat-abi=hard"
 TUNE_PKGARCH:tune-armv7asimdhard = "armv7asimdthf"
 
 
-# thumb/v7ve+simd/softfp
-# CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libv7vesimdsoftfp = "armv7vesimdsoftfp"
-
-AVAILTUNES += "armv7vesimdsoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv7vesimdsoftfp = "${TUNE_PKGARCH:tune-armv7vesimdsoftfp}"
-BASE_LIB:tune-armv7vesimdsoftfp = "lib/thumb/v7ve+simd/softfp"
-TUNE_FEATURES:tune-armv7vesimdsoftfp = "arm"
-TUNE_CCARGS:tune-armv7vesimdsoftfp = "-mthumb -march=armv7ve+simd -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv7vesimdsoftfp = "armv7vesimdt"
-
 # thumb/v7ve+simd/hard
 # CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=hard
 DEFAULTTUNE:virtclass-multilib-libvtvesimdhf = "armvtvesimdhf"
@@ -186,29 +76,6 @@ TUNE_CCARGS:tune-armvtvesimdhf = "-mthumb -march=armv7ve+simd -mfloat-abi=hard"
 TUNE_PKGARCH:tune-armvtvesimdhf = "armv7vesimdthf"
 
 
-# thumb/v8-a/nofp
-# CFLAGS: -mthumb -march=armv8-a -mfloat-abi=soft
-DEFAULTTUNE:virtclass-multilib-libv8anofp = "armv8anofp"
-
-AVAILTUNES += "armv8anofp"
-PACKAGE_EXTRA_ARCHS:tune-armv8anofp = "${TUNE_PKGARCH:tune-armv8anofp}"
-BASE_LIB:tune-armv8anofp = "lib/thumb/v8-a/nofp"
-TUNE_FEATURES:tune-armv8anofp = "arm"
-TUNE_CCARGS:tune-armv8anofp = "-mthumb -march=armv8-a -mfloat-abi=soft"
-TUNE_PKGARCH:tune-armv8anofp = "armv8at"
-
-# thumb/v8-a+simd/softfp
-# CFLAGS: -mthumb -march=armv8-a+simd -mfloat-abi=softfp
-DEFAULTTUNE:virtclass-multilib-libv8asimdsoftfp = "armv8asimdsoftfp"
-
-AVAILTUNES += "armv8asimdsoftfp"
-PACKAGE_EXTRA_ARCHS:tune-armv8asimdsoftfp = "${TUNE_PKGARCH:tune-armv8asimdsoftfp}"
-BASE_LIB:tune-armv8asimdsoftfp = "lib/thumb/v8-a+simd/softfp"
-TUNE_FEATURES:tune-armv8asimdsoftfp = "arm"
-TUNE_CCARGS:tune-armv8asimdsoftfp = "-mthumb -march=armv8-a+simd -mfloat-abi=softfp"
-TUNE_PKGARCH:tune-armv8asimdsoftfp = "armv8asimdt"
-
-
 # thumb/v8-a+simd/hard
 # CFLAGS:  -mthumb -march=armv8-a+simd -mfloat-abi=hard
 DEFAULTTUNE:virtclass-multilib-libv8asimdhard = "armv8asimdhard"