Index: osprey/driver/OPTIONS
===================================================================
--- osprey/driver/OPTIONS	(revision 3436)
+++ osprey/driver/OPTIONS	(working copy)
@@ -2324,8 +2324,6 @@
 -pthread	;	ALL	NONE	""
 	"Compile with pthreads support"
 % gcc compatibility flags
--compat-gcc	toggle(&compat_gcc,TRUE);	ALL	NONE	""
-	""
 -Wabi		warn_ignored(option_name);	ALL	cfe	self	""
 	""
 -###		{show_version++; show_but_not_run = TRUE;}	ALL	NONE	"-###"
Index: osprey/driver/phases.c
===================================================================
--- osprey/driver/phases.c	(revision 3436)
+++ osprey/driver/phases.c	(working copy)
@@ -2034,12 +2034,6 @@
 #ifdef TARG_X8664 
         extern boolean link_with_mathlib;
 	if (option_was_seen(O_nodefaultlibs) || option_was_seen(O_nostdlib)) {
-	    // If -compat-gcc, link with open64rt even if -nostdlib.  Bug 4551.
-	    if (option_was_seen(O_compat_gcc) &&
-		!option_was_seen(O_fno_fast_stdlib) &&
-		!option_was_seen(O_nolibopen64rt)) {	// bug 9611
-	      // add_library(args, "open64rt");
-	    }
 	    return;
 	}
 #endif
Index: osprey/driver/file_utils.c
===================================================================
--- osprey/driver/file_utils.c	(revision 3436)
+++ osprey/driver/file_utils.c	(working copy)
@@ -1,4 +1,8 @@
 /*
+ * Copyright (C) 2010 Advanced Micro Devices, Inc.  All Rights Reserved.
+ */
+
+/*
  * Copyright 2002, 2003, 2004, 2005, 2006 PathScale, Inc.  All Rights Reserved.
  */
 
@@ -57,16 +61,8 @@
 #define DIR_SEPARATOR_STR "/"
 #endif
 
-extern int errno;
 static char *saved_orig_program_name;
 
-#if defined(KEY) && defined(SHARED_BUILD)
-// compat_gcc is defined in option_names.h which is generated by the executable
-// "table".  However, building "table" requires linking to this file, so make
-// the symbol weak.
-extern int compat_gcc __attribute__((weak));
-#endif
-
 /* drops path prefix in string */
 char *
 drop_path (char *s)
@@ -167,26 +163,6 @@
 		return FALSE;
 }
 
-boolean want_directory (char *path)
-{
-	if (is_directory(path))
-		return TRUE;
-
-#if defined(KEY) && defined(SHARED_BUILD)
-	// Warn about missing directory argument to -I/-L.  Bug 2794.
-	if (fullwarn ||
-	    (path[0] == '-' && compat_gcc != TRUE))
-		warning("%s is not a directory", path);
-	// Accept anything as a directory after (possibly) warning about the
-	// invalid ones.
-	return TRUE;
-#else
-	if (fullwarn)
-		warning("%s is not a directory", path);
-	return TRUE;
-#endif
-}
-
 /* check if directory is writable */
 boolean
 directory_is_writable (char *path)
Index: osprey/driver/file_utils.h
===================================================================
--- osprey/driver/file_utils.h	(revision 3436)
+++ osprey/driver/file_utils.h	(working copy)
@@ -1,4 +1,8 @@
 /*
+ * Copyright (C) 2010 Advanced Micro Devices, Inc.  All Rights Reserved.
+ */
+
+/*
  * Copyright 2002, 2003, 2004, 2005 PathScale, Inc.  All Rights Reserved.
  */
 
@@ -57,9 +61,6 @@
 /* check whether is a directory */
 extern boolean is_directory (char *path);
 
-/* check whether is a directory */
-extern boolean want_directory (char *path);
-
 /* check whether directory is writable */
 extern boolean directory_is_writable (char *path);
 
Index: osprey/driver/main.c
===================================================================
--- osprey/driver/main.c	(revision 3436)
+++ osprey/driver/main.c	(working copy)
@@ -244,13 +244,7 @@
 				      unrecognized_dashdash_option_name =
 				        option_name;
 				    }
-				    else if (option_was_seen(O_compat_gcc) ||
-					#ifdef PSC_TO_OPEN64
-					     getenv("OPEN64_STRICT_GCC")) {
-					#endif
-				      /* leave this env var undocumented */
-				      warning("unknown flag: %s", option_name);
-				    } else {
+				    else {
 				      /* print as error or not at all? */
 				      parse_error(option_name, "unknown flag");
 				    }
@@ -1003,8 +997,6 @@
       keep_flag = TRUE;
     } else if (!strcmp(argv[i], "-save_temps")) {
       keep_flag = TRUE;
-    } else if (!strcmp(argv[i], "-compat-gcc")) {
-      compat_gcc = TRUE;
     } else if (!strcmp(argv[i], "-S")) {
       ipa_conflict_option = argv[i];
     } else if (!strcmp(argv[i], "-fbgen")) {
@@ -1504,12 +1496,7 @@
 		   gnu_major_version);
 
   if (dump_version_only == TRUE) {
-  #ifdef PSC_TO_OPEN64
-    if (option_was_seen(O_compat_gcc))
-      puts(open64_gcc_version);
-    else
-      puts(OPEN64_FULL_VERSION);
-  #endif
+    puts(OPEN64_FULL_VERSION);
     return;
   }
 
Index: osprey/driver/table.c
===================================================================
--- osprey/driver/table.c	(revision 3436)
+++ osprey/driver/table.c	(working copy)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Advanced Micro Devices, Inc.  All Rights Reserved.
+ * Copyright (C) 2009-2010 Advanced Micro Devices, Inc.  All Rights Reserved.
  */
 
 /*
@@ -827,7 +827,7 @@
 				   || options[i].syntax == needs_directory_or_null
 #endif
 				   ) {
-				fprintf(f, "\tif (want_directory(next_string(argv,argi))) {\n");
+				fprintf(f, "\tif (is_directory(next_string(argv,argi))) {\n");
 			}
 			fprintf(f, "\t\toptargs = get_optarg(argv, argi);\n");
 			if (options[i].syntax == needs_decimal) {