Date: Tue, 27 May 2008 04:30:19 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 142361 for review Message-ID: <200805270430.m4R4UJw1032749@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142361 Change 142361 by jb@freebsd3 on 2008/05/27 04:29:19 Reset these to match RELENG_7. Blind integrations are bad. :-/ Affected files ... .. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#5 edit .. //depot/projects/dtrace7/src/share/mk/bsd.dep.mk#4 edit .. //depot/projects/dtrace7/src/share/mk/bsd.endian.mk#4 edit .. //depot/projects/dtrace7/src/share/mk/bsd.snmpmod.mk#3 edit .. //depot/projects/dtrace7/src/share/mk/bsd.subdir.mk#3 edit .. //depot/projects/dtrace7/src/share/mk/bsd.symver.mk#3 edit .. //depot/projects/dtrace7/src/share/mk/version_gen.awk#3 edit Differences ... ==== //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.66 2008/03/19 12:20:44 imp Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.62.2.2 2008/03/17 18:07:32 jhb Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -12,13 +12,9 @@ MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" MACHINE_CPU = itanium -. elif ${MACHINE_ARCH} == "powerpc" -MACHINE_CPU = aim . elif ${MACHINE_ARCH} == "sparc64" . elif ${MACHINE_ARCH} == "arm" MACHINE_CPU = arm -. elif ${MACHINE_ARCH} == "mips" -MACHINE_CPU = mips . endif .else @@ -67,7 +63,6 @@ # http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # http://gcc.gnu.org/onlinedocs/gcc/IA-64-Options.html # http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html -# http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html # http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html # http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html @@ -114,25 +109,6 @@ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif -. elif ${MACHINE_ARCH} == "powerpc" -. if ${CPUTYPE} == "e500" -MACHINE_CPU = booke -_CPUCFLAGS = -Wa,-me500 -msoft-float -. endif -. elif ${MACHINE_ARCH} == "mips" -. if ${CPUTYPE} == "mips32" -_CPUCFLAGS = -march=mips32 -. elif ${CPUTYPE} == "mips32r2" -_CPUCFLAGS = -march=mips32r2 -. elif ${CPUTYPE} == "mips64" -_CPUCFLAGS = -march=mips64 -. elif ${CPUTYPE} == "mips64r2" -_CPUCFLAGS = -march=mips64r2 -. elif ${CPUTYPE} == "mips4kc" -_CPUCFLAGS = -march=4kc -. elif ${CPUTYPE} == "mips24kc" -_CPUCFLAGS = -march=24kc -. endif . endif # Set up the list of CPU features based on the CPU type. This is an @@ -198,19 +174,6 @@ LD += -EB .endif -.if ${MACHINE_ARCH} == "mips" -. if defined(TARGET_BIG_ENDIAN) -CFLAGS += -EB -LDFLAGS += -Wl,-EB -LD += -EB -. else -CFLAGS += -EL -LDFLAGS += -Wl,-EL -LD += -EL -. endif -CFLAGS += -msoft-float -G0 -mno-dsp -mabicalls -.endif - # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk .if !defined(NO_CPU_CFLAGS) ==== //depot/projects/dtrace7/src/share/mk/bsd.dep.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.50 2008/02/05 08:52:35 des Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.48 2005/01/06 11:12:43 krion Exp $ # # The include file <bsd.dep.mk> handles Makefile dependencies. # ==== //depot/projects/dtrace7/src/share/mk/bsd.endian.mk#4 (text+ko) ==== @@ -1,14 +1,12 @@ -# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.5 2008/04/28 14:54:17 gonzo Exp $ +# $FreeBSD: src/share/mk/bsd.endian.mk,v 1.4 2006/11/05 15:33:26 cognet Exp $ .if ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "ia64" || \ - (${MACHINE_ARCH} == "arm" && !defined(TARGET_BIG_ENDIAN)) || \ - (${MACHINE_ARCH} == "mips" && !defined(TARGET_BIG_ENDIAN)) + (${MACHINE_ARCH} == "arm" && !defined(TARGET_BIG_ENDIAN)) TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "arm" || \ - ${MACHINE_ARCH} == "mips" + ${MACHINE_ARCH} == "arm" TARGET_ENDIANNESS= 4321 .endif ==== //depot/projects/dtrace7/src/share/mk/bsd.snmpmod.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.snmpmod.mk,v 1.3 2008/01/08 12:55:56 harti Exp $ +# $FreeBSD: src/share/mk/bsd.snmpmod.mk,v 1.2 2005/11/10 12:07:12 harti Exp $ INCSDIR= ${INCLUDEDIR}/bsnmp @@ -7,7 +7,7 @@ CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CFLAGS+= -I. -${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} ${EXTRAMIBSYMS} +${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET} .ORDER: ${MOD}_tree.c ${MOD}_tree.h ==== //depot/projects/dtrace7/src/share/mk/bsd.subdir.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.51 2007/12/07 15:02:06 ru Exp $ +# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.50 2005/05/31 07:14:51 ru Exp $ # # The include file <bsd.subdir.mk> contains the default targets # for building subdirectories. @@ -26,7 +26,7 @@ # # afterinstall, all, all-man, beforeinstall, checkdpadd, # clean, cleandepend, cleandir, depend, install, lint, maninstall, -# manlint, obj, objlink, realinstall, regress, tags +# obj, objlink, realinstall, regress, tags # .include <bsd.init.mk> @@ -65,8 +65,9 @@ fi; \ ${MAKE} all + .for __target in all all-man checkdpadd clean cleandepend cleandir \ - depend distribute lint maninstall manlint \ + depend distribute lint maninstall \ obj objlink realinstall regress tags \ ${SUBDIR_TARGETS} ${__target}: _SUBDIR ==== //depot/projects/dtrace7/src/share/mk/bsd.symver.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.symver.mk,v 1.5 2007/10/18 15:21:35 yar Exp $ +# $FreeBSD: src/share/mk/bsd.symver.mk,v 1.4 2007/05/21 09:01:23 ru Exp $ .if !target(__<bsd.symver.mk>__) __<bsd.symver.mk>__: @@ -34,9 +34,6 @@ .endif .endif .endfor -.if empty(_vgen) -.error ${VERSION_GEN} not found in the search path. -.endif # Run the symbol maps through the C preprocessor before passing # them to the symbol version generator. ==== //depot/projects/dtrace7/src/share/mk/version_gen.awk#3 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/mk/version_gen.awk,v 1.5 2007/10/18 10:32:28 yar Exp $ +# $FreeBSD: src/share/mk/version_gen.awk,v 1.3 2007/07/21 20:52:32 kan Exp $ # # @@ -34,12 +34,10 @@ # version name. # symbols[][] - array index by [version name, symbol index], contains # names of symbols defined for each version. -# names[] - array index is symbol name and value is its first version seen, -# used to check for duplicate symbols and warn about them. # BEGIN { brackets = 0; - errors = warns = 0; + errors = 0; version_count = 0; current_version = ""; stderr = "/dev/stderr"; @@ -47,13 +45,10 @@ # Strip comments. sub("#.*$", "", $0); - # Strip leading and trailing whitespace. - sub("^[ \t]+", "", $0); - sub("[ \t]+$", "", $0); + # Strip trailing spaces. + sub(" *$", "", $0); - if (/^[a-zA-Z0-9._]+[ \t]*{$/) { - # Strip brace. - sub("{", "", $1); + if (/^[ \t]*[a-zA-Z0-9._]+ *{/) { brackets++; symver = $1; versions[symver] = 1; @@ -61,56 +56,39 @@ generated[symver] = 0; version_count++; } - else if (/^}[ \t]*[a-zA-Z0-9._]+[ \t]*;$/) { - v = $1 != "}" ? $1 : $2; - # Strip brace. - sub("}", "", v); + else if (/^[ \t]*} *[a-zA-Z0-9._]+ *;/) { # Strip semicolon. - sub(";", "", v); - if (symver == "") { - printf("File %s: Unmatched bracket.\n", - vfile) > stderr; - errors++; - } - else if (versions[v] != 1) { - printf("File %s: `%s' has unknown " \ - "successor `%s'.\n", - vfile, symver, v) > stderr; - errors++; - } + gsub(";", "", $2); + if (symver == "") + printf("Unmatched bracket.\n"); + else if (versions[$2] != 1) + printf("File %s: %s has unknown " \ + "successor %s\n", vfile, symver, $2); else - successors[symver] = v; + successors[symver] = $2; brackets--; } - else if (/^}[ \t]*;$/) { - if (symver == "") { + else if (/^[ \t]*};/) { + if (symver == "") printf("File %s: Unmatched bracket.\n", vfile) > stderr; - errors++; - } # No successor brackets--; } - else if (/^}$/) { - printf("File %s: Missing final semicolon.\n", + else if (/^[ \t]*}/) { + printf("File %s: Missing ending semi-colon.\n", vfile) > stderr; - errors++; } else if (/^$/) ; # Ignore blank lines. - else { - printf("File %s: Unknown directive: `%s'.\n", + else + printf("File %s: Unknown directive: %s\n", vfile, $0) > stderr; - errors++; - } } brackets = 0; } -{ - # Set meaningful filename for diagnostics. - filename = FILENAME != "" ? FILENAME : "<stdin>"; - +/.*/ { # Delete comments, preceding and trailing whitespace, then # consume blank lines. sub("#.*$", "", $0); @@ -120,18 +98,15 @@ next; } -/^[a-zA-Z0-9._]+[ \t]*{$/ { +/^[a-zA-Z0-9._]+ +{$/ { # Strip bracket from version name. sub("{", "", $1); - if (current_version != "") { + if (current_version != "") printf("File %s, line %d: Illegal nesting detected.\n", - filename, FNR) > stderr; - errors++; - } + FILENAME, FNR) > stderr; else if (versions[$1] == 0) { printf("File %s, line %d: Undefined " \ - "library version `%s'.\n", filename, FNR, $1) > stderr; - errors++; + "library version %s\n", FILENAME, FNR, $1) > stderr; # Remove this entry from the versions. delete versions[$1]; } @@ -141,52 +116,20 @@ next; } -/^[a-zA-Z0-9._]+[ \t]*;$/ { - # Strip semicolon. - sub(";", "", $1); +/^[a-zA-Z0-9._]+ *;$/ { if (current_version != "") { count = versions[current_version]; versions[current_version]++; symbols[current_version, count] = $1; - if ($1 in names && names[$1] != current_version) { - # - # A graver case when a dup symbol appears under - # different versions in the map. That can result - # in subtle problems with the library later. - # - printf("File %s, line %d: Duplicated symbol `%s' " \ - "in version `%s', first seen in `%s'. " \ - "Did you forget to move it to ObsoleteVersions?\n", - filename, FNR, $1, - current_version, names[$1]) > stderr; - errors++; - } - else if (names[$1] == current_version) { - # - # A harmless case: a dup symbol with the same version. - # - printf("File %s, line %d: warning: " \ - "Duplicated symbol `%s' in version `%s'.\n", - filename, FNR, $1, current_version) > stderr; - warns++; - } - else - names[$1] = current_version; - } - else { - printf("File %s, line %d: Symbol `%s' outside version scope.\n", - filename, FNR, $1) > stderr; - errors++; } next; } -/^}[ \t]*;$/ { +/^} *;$/ { brackets--; if (brackets < 0) { printf("File %s, line %d: Unmatched bracket.\n", - filename, FNR, $1) > stderr; - errors++; + FILENAME, FNR, $1) > stderr; brackets = 0; # Reset } current_version = ""; @@ -194,10 +137,9 @@ } -{ - printf("File %s, line %d: Unknown directive: `%s'.\n", - filename, FNR, $0) > stderr; - errors++; +/.*/ { + printf("File %s, line %d: Unknown directive: '%s'\n", + FILENAME, FNR, $0) > stderr; } function print_version(v) @@ -220,7 +162,7 @@ for (i = 1; i < versions[v]; i++) { if (i == 1) printf("global:\n"); - printf("\t%s;\n", symbols[v, i]); + printf("\t%s\n", symbols[v, i]); } version_count--; @@ -236,13 +178,7 @@ generated[v] = 1; } - END { - if (errors) { - printf("%d error(s) total.\n", errors) > stderr; - exit(1); - } - # OK, no errors. for (v in versions) { print_version(v); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805270430.m4R4UJw1032749>