* config/linux.h (CC1_SPEC): Define it only if not defined.

        * config/m68k/linux.h (CC1_SPEC): Undefine it before include
        <linux.h>

        * config/linux.h (DEFAULT_VTABLE_THUNKS): New. Defined as 1 if
        USE_GNULIBC_1 is not defined.

        * config/alpha/linux.h (DEFAULT_VTABLE_THUNKS): New. Defined
        as 1.
        * config/rs6000/linux.h (DEFAULT_VTABLE_THUNKS): Ditto.

        * config/sparc/linux.h (DEFAULT_VTABLE_THUNKS): New. Defined
        as 1 if USE_GNULIBC_1 is not defined.
Linux patches from HJ.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@14960 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 22 insertions, 1 deletions

diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
index 4dbc65025cf..3de3a9b59ad 100644
--- a/gcc/config/alpha/linux.h
+++ b/gcc/config/alpha/linux.h
@@ -48,6 +48,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef ASM_SPEC
 #define ASM_SPEC "-nocpp"
 
+#undef DEFAULT_VTABLE_THUNKS
+#define DEFAULT_VTABLE_THUNKS 1
+
 /* Can't do stabs */
 #undef SDB_DEBUGGING_INFO
 
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
index 439452600c4..ba81586ae94 100644
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -83,8 +83,14 @@ Boston, MA 02111-1307, USA.  */
   "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
 
 /* This is for -profile to use -lc_p instead of -lc. */
-#undef  CC1_SPEC
+#ifndef CC1_SPEC
 #define CC1_SPEC "%{profile:-p}"
+#endif
+
+#ifndef USE_GNULIBC_1
+#undef DEFAULT_VTABLE_THUNKS
+#define DEFAULT_VTABLE_THUNKS 1
+#endif
 
 #undef	LIB_SPEC
 /* We no longer link with libc_p.a or libg.a by default. If you
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index 0ebc5f1ca71..9ba66f7680d 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -23,6 +23,10 @@ Boston, MA 02111-1307, USA.  */
 #define USE_GAS			/* But GAS wants jbsr instead of jsr */
 
 #include <m68k/m68k.h>
+
+/* Make sure CC1 is undefined. */
+#undef CC1_SPEC
+
 #include <linux.h>		/* some common stuff */
 
 #undef TARGET_VERSION
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
index 2483f41ccc6..787afa816d4 100644
--- a/gcc/config/rs6000/linux.h
+++ b/gcc/config/rs6000/linux.h
@@ -60,3 +60,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef	MULTILIB_DEFAULTS
 #define	MULTILIB_DEFAULTS { "mbig", "mcall-linux" }
+
+#undef DEFAULT_VTABLE_THUNKS
+#define DEFAULT_VTABLE_THUNKS 1
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
index 8129e4265e0..f02998fd571 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -35,6 +35,11 @@ Boston, MA 02111-1307, USA.  */
 #define MULTIBYTE_CHARS 1
 #endif
 
+#ifndef USE_GNULIBC_1
+#undef DEFAULT_VTABLE_THUNKS
+#define DEFAULT_VTABLE_THUNKS 1
+#endif
+
 /* There are conflicting reports about whether this system uses
    a different assembler syntax.  wilson@cygnus.com says # is right.  */
 #undef COMMENT_BEGIN