PERFORCE change 150027 for review

Warner Losh imp at FreeBSD.org
Thu Sep 18 16:51:36 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=150027

Change 150027 by imp at imp_paco-paco on 2008/09/18 16:50:44

	Add/delete files from mainline.
	Note: libc/mips is botched and needs some hand holding.

Affected files ...

.. //depot/projects/mips2/src/contrib/gcc/config/mips/freebsd.h#9 integrate
.. //depot/projects/mips2/src/contrib/pf/pflogd/pidfile.c#3 delete
.. //depot/projects/mips2/src/contrib/pf/pflogd/pidfile.h#3 delete
.. //depot/projects/mips2/src/lib/libkvm/kvm_mips.c#2 integrate
.. //depot/projects/mips2/src/lib/libstand/mips/_setjmp.S#3 integrate
.. //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#4 integrate
.. //depot/projects/mips2/src/share/man/man4/man4.i386/sbni.4#3 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#3 delete
.. //depot/projects/mips2/src/sys/dev/sbni/if_sbni.c#5 branch
.. //depot/projects/mips2/src/sys/dev/sbni/if_sbni_isa.c#4 branch
.. //depot/projects/mips2/src/sys/dev/sbni/if_sbni_pci.c#4 branch
.. //depot/projects/mips2/src/sys/dev/sbni/if_sbnireg.h#3 branch
.. //depot/projects/mips2/src/sys/dev/sbni/if_sbnivar.h#3 branch
.. //depot/projects/mips2/src/sys/modules/sbni/Makefile#3 branch
.. //depot/projects/mips2/src/usr.bin/gprof/mips.h#2 integrate

Differences ...

==== //depot/projects/mips2/src/contrib/gcc/config/mips/freebsd.h#9 (text+ko) ====

@@ -19,10 +19,7 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Default to the mips32 ISA */
-#undef DRIVER_SELF_SPECS
-#define DRIVER_SELF_SPECS \
-  "%{!march=*: -march=mips32}"
+/* $FreeBSD: src/contrib/gcc/config/mips/freebsd.h,v 1.2 2008/09/01 23:09:45 obrien Exp $ */
 
 /* Define default target values.  */
 
@@ -124,15 +121,13 @@
     }								\
   while (0)
 
-
-/* Clean up after the generic MIPS/ELF configuration.  */
-#undef MD_EXEC_PREFIX
-#undef MD_STARTFILE_PREFIX
-
-/* Extra specs we need.  */
-#undef SUBTARGET_EXTRA_SPECS
-#define SUBTARGET_EXTRA_SPECS						\
-  { "fbsd_dynamic_linker",		FBSD_DYNAMIC_LINKER}
+/* Default to the mips32 ISA */
+#undef  DRIVER_SELF_SPECS
+#define DRIVER_SELF_SPECS \
+  "%{!march=*: -march=mips32}"
+#if 0
+  "%{!EB:%{!EL:%(endian_spec)}}", 
+#endif
 
 /* Provide a SUBTARGET_CPP_SPEC appropriate for FreeBSD.  */
 

==== //depot/projects/mips2/src/lib/libkvm/kvm_mips.c#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libstand/mips/_setjmp.S#3 (text+ko) ====


==== //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#4 (text+ko) ====


==== //depot/projects/mips2/src/usr.bin/gprof/mips.h#2 (text+ko) ====

@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -30,8 +26,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/gprof/arm.h,v 1.1 2004/05/14 13:44:04 cognet Exp $
+ *	@(#)mips.h	8.1 (Berkeley) 6/6/93
+ * From: @(#)sparc.h	5.1 (Berkeley) 7/8/92
+ * $FreeBSD: src/usr.bin/gprof/mips.h,v 1.4 2008/09/02 15:35:47 obrien Exp $
  */
 
     /*


More information about the p4-projects mailing list