PERFORCE change 135149 for review
Randall R. Stewart
rrs at FreeBSD.org
Sun Feb 10 07:01:03 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=135149
Change 135149 by rrs at rrs-mips2-jnpr on 2008/02/10 15:00:22
Fixes all warning during buildworld (elfos.h elf.h)
Fixes typ casting fo mibII.c and yppaswdd_server.c
Adds a conf with the enet
Updates my conf to what I am using to now
Adds debug prints to init_main.c by commenting out the
if boot debug lines.
Affected files ...
.. //depot/projects/mips2-jnpr/src/contrib/bsnmp/snmp_mibII/mibII.c#2 edit
.. //depot/projects/mips2-jnpr/src/contrib/gcc/config/elfos.h#2 edit
.. //depot/projects/mips2-jnpr/src/contrib/gcc/config/mips/elf.h#2 edit
.. //depot/projects/mips2-jnpr/src/sys/kern/init_main.c#2 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#11 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs2#1 add
.. //depot/projects/mips2-jnpr/src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ====
@@ -1044,7 +1044,7 @@
break;
case RTM_IFINFO:
- ifm = (struct if_msghdr *)rtm;
+ ifm = (struct if_msghdr *)((void *)rtm);
mib_extract_addrs(ifm->ifm_addrs, (u_char *)(ifm + 1), addrs);
if ((ifp = mib_find_if_sys(ifm->ifm_index)) == NULL)
break;
==== //depot/projects/mips2-jnpr/src/contrib/gcc/config/elfos.h#2 (text+ko) ====
@@ -79,11 +79,14 @@
/* Output #ident as a .ident. */
-
+#ifndef ASM_OUTPUT_IDENT
#define ASM_OUTPUT_IDENT(FILE, NAME) \
fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME);
+#endif
+#ifndef IDENT_ASM_OP
#define IDENT_ASM_OP "\t.ident\t"
+#endif
#undef SET_ASM_OP
#define SET_ASM_OP "\t.set\t"
@@ -194,8 +197,9 @@
#define ASCII_DATA_ASM_OP "\t.ascii\t"
/* Support a read-only data section. */
+#ifndef READONLY_DATA_SECTION_ASM_OP
#define READONLY_DATA_SECTION_ASM_OP "\t.section\t.rodata"
-
+#endif
/* On svr4, we *do* have support for the .init and .fini sections, and we
can put stuff in there to be executed before and after `main'. We let
crtstuff.c and other files know this by defining the following symbols.
@@ -281,7 +285,7 @@
#endif
/* Write the extra assembler code needed to declare an object properly. */
-
+#ifndef ASM_DECLARE_OBJECT_NAME
#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \
do \
{ \
@@ -301,7 +305,7 @@
ASM_OUTPUT_LABEL (FILE, NAME); \
} \
while (0)
-
+#endif
/* Output the size directive for a decl in rest_of_decl_compilation
in the case where we did not do so before the initializer.
Once we find the error_mark_node, we know that the value of
==== //depot/projects/mips2-jnpr/src/contrib/gcc/config/mips/elf.h#2 (text+ko) ====
@@ -51,4 +51,7 @@
#define NO_IMPLICIT_EXTERN_C 1
+#ifdef HANDLE_PRAGMA_PACK_PUSH_POP
+#undef HANDLE_PRAGMA_PACK_PUSH_POP
+#endif
#define HANDLE_PRAGMA_PACK_PUSH_POP 1
==== //depot/projects/mips2-jnpr/src/sys/kern/init_main.c#2 (text+ko) ====
@@ -633,7 +633,7 @@
break;
for (next = path; *next != '\0' && *next != ':'; next++)
/* nothing */ ;
- if (bootverbose)
+ /* if (bootverbose)*/
printf("start_init: trying %.*s\n", (int)(next - path),
path);
@@ -698,7 +698,7 @@
mtx_unlock(&Giant);
return;
}
- if (error != ENOENT)
+ /* if (error != ENOENT)*/
printf("exec %.*s: error %d\n", (int)(next - path),
path, error);
}
==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#11 (text+ko) ====
@@ -79,6 +79,6 @@
#
# Use the following for RFS in mem-device
-#options MD_ROOT
+options MD_ROOT
# options ROOTDEVNAME = \"ufs:md0\"
-#options MD_ROOT_SIZE = 25200
+options MD_ROOT_SIZE = 25200
==== //depot/projects/mips2-jnpr/src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 (text+ko) ====
@@ -820,7 +820,7 @@
yp_error("pw_tmp() failed");
return &result;
}
- if (pw_copy(pfd, tfd, (struct passwd *)&argp->newpw, NULL) == -1) {
+ if (pw_copy(pfd, tfd, (struct passwd *)((void *)&argp->newpw), NULL) == -1) {
pw_fini();
yp_error("pw_copy() failed");
return &result;
@@ -858,7 +858,7 @@
pw_fini();
if (inplace) {
- if ((rval = update_inplace((struct passwd *)&argp->newpw,
+ if ((rval = update_inplace((struct passwd *)((void *)&argp->newpw),
argp->domain))) {
yp_error("inplace update failed -- rebuilding maps");
}
More information about the p4-projects
mailing list