Remove support for old DDR tool terminology

Signed-off-by: Keith W. Campbell <[email protected]>
dsouzai · Jun 19, 2020 · e4cce2c · e4cce2c
1 parent 934b0ff
commit e4cce2c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/cmake/modules/ddr/DDRSetStub.cmake.in b/cmake/modules/ddr/DDRSetStub.cmake.in
@@ -26,10 +26,6 @@ set(OMR_MODULES_DIR "@OMR_MODULES_DIR@")
 set(DDR_SUPPORT_DIR "@OMR_MODULES_DIR@/ddr")
 set(DDR_INFO_DIR "@DDR_INFO_DIR@")
 set(DDR_EXCLUDES "$<TARGET_PROPERTY:@DDR_TARGET_NAME@,EXCLUDES>")
-# temporarily support old property until downstream projects adapt
-if(NOT DDR_EXCLUDES)
-	set(DDR_EXCLUDES "$<TARGET_PROPERTY:@DDR_TARGET_NAME@,BLACKLIST>")
-endif()
 set(DDR_OVERRIDES_FILE "$<TARGET_PROPERTY:@DDR_TARGET_NAME@,OVERRIDES_FILE>")
 set(DDR_BLOB "$<TARGET_PROPERTY:@DDR_TARGET_NAME@,BLOB>")
 set(DDR_SUPERSET "$<TARGET_PROPERTY:@DDR_TARGET_NAME@,SUPERSET>")

diff --git a/ddr/tools/ddrgen/ddrgen.cpp b/ddr/tools/ddrgen/ddrgen.cpp
@@ -246,13 +246,6 @@ Options::configure(OMRPortLibrary *portLibrary, int argc, char *argv[])
 			} else {
 				overrideListFile = argv[++i];
 			}
-		} else if (matchesEither(argv[i], "-l", "--blacklist")) {
-			/* temporarily support old options until downstream projects adapt */
-			if (argc < i + 2) {
-				showHelp = true;
-			} else {
-				excludesFile = argv[++i];
-			}
 		} else if (matchesEither(argv[i], "-x", "--excludes")) {
 			if (argc < i + 2) {
 				showHelp = true;
@@ -261,9 +254,6 @@ Options::configure(OMRPortLibrary *portLibrary, int argc, char *argv[])
 			}
 		} else if (matchesEither(argv[i], "-e", "--show-empty")) {
 			printEmptyTypes = true;
-		} else if (matchesEither(argv[i], "-sb", "--show-blacklisted")) {
-			/* temporarily support old options until downstream projects adapt */
-			showExcluded = true;
 		} else if (matchesEither(argv[i], "-sx", "--show-excluded")) {
 			showExcluded = true;
 		} else if (matchesEither(argv[i], "-v", "--version")) {