From 367fc3ca45c48bc977ba7575008cb8776cc347b5 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 1 Dec 2000 18:15:41 +0000
Subject: Move <sgidefs.h> to <asm/gcc/sgidefs.h>.

---
 arch/mips/Makefile               |  2 +-
 arch/mips64/Makefile             |  1 +
 include/asm-mips/gcc/sgidefs.h   | 17 +++++++++++++++++
 include/asm-mips64/gcc/sgidefs.h | 17 +++++++++++++++++
 include/sgidefs.h                | 17 -----------------
 5 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 include/asm-mips/gcc/sgidefs.h
 create mode 100644 include/asm-mips64/gcc/sgidefs.h
 delete mode 100644 include/sgidefs.h

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ca802dba9..e789ac01e 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -90,7 +90,7 @@ endif
 #
 GCCFLAGS	+= -pipe
 
-CFLAGS		+= $(GCCFLAGS)
+CFLAGS		:= -I $(TOPDIR)/include/asm/gcc $(CFLAGS) $(GCCFLAGS)
 AFLAGS		+= $(GCCFLAGS)
 
 #
diff --git a/arch/mips64/Makefile b/arch/mips64/Makefile
index 17bc0974e..ecc4a3a46 100644
--- a/arch/mips64/Makefile
+++ b/arch/mips64/Makefile
@@ -33,6 +33,7 @@ endif
 # machines may also.  Since BFD is incredibly buggy with respect to
 # crossformat linking we rely on the elf2ecoff tool for format conversion.
 #
+CFLAGS		+= $(TOPDIR)/include/asm/gcc $(CFLAGS)
 CFLAGS		+= -mabi=64 -G 0 -mno-abicalls -fno-pic -Wa,--trap -pipe
 LINKFLAGS	+= -G 0 -static # -N
 MODFLAGS	+= -mlong-calls
diff --git a/include/asm-mips/gcc/sgidefs.h b/include/asm-mips/gcc/sgidefs.h
new file mode 100644
index 000000000..05994371a
--- /dev/null
+++ b/include/asm-mips/gcc/sgidefs.h
@@ -0,0 +1,17 @@
+/*
+ * include/sgidefs.h
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1996 by Ralf Baechle
+ *
+ * This file is here to satisfy GCC's expectations.
+ */
+#ifndef __SGIDEFS_H
+#define __SGIDEFS_H
+
+#include <asm/sgidefs.h>
+
+#endif /* __SGIDEFS_H */
diff --git a/include/asm-mips64/gcc/sgidefs.h b/include/asm-mips64/gcc/sgidefs.h
new file mode 100644
index 000000000..05994371a
--- /dev/null
+++ b/include/asm-mips64/gcc/sgidefs.h
@@ -0,0 +1,17 @@
+/*
+ * include/sgidefs.h
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1996 by Ralf Baechle
+ *
+ * This file is here to satisfy GCC's expectations.
+ */
+#ifndef __SGIDEFS_H
+#define __SGIDEFS_H
+
+#include <asm/sgidefs.h>
+
+#endif /* __SGIDEFS_H */
diff --git a/include/sgidefs.h b/include/sgidefs.h
deleted file mode 100644
index 05994371a..000000000
--- a/include/sgidefs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * include/sgidefs.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1996 by Ralf Baechle
- *
- * This file is here to satisfy GCC's expectations.
- */
-#ifndef __SGIDEFS_H
-#define __SGIDEFS_H
-
-#include <asm/sgidefs.h>
-
-#endif /* __SGIDEFS_H */
-- 
cgit v1.2.3