PERFORCE change 58773 for review

Doug Rabson dfr at FreeBSD.org
Tue Aug 3 04:26:46 PDT 2004


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

Change 58773 by dfr at dfr_home on 2004/08/03 11:26:19

	Integrate new file manually.

Affected files ...

.. //depot/projects/kse/lib/libc/gen/tls.c#5 integrate
.. //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#3 integrate
.. //depot/projects/kse/tools/regression/tls/Makefile#4 integrate
.. //depot/projects/kse/tools/regression/tls/Makefile.inc#1 branch
.. //depot/projects/kse/tools/regression/tls/libxx/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/libxx/xx.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/libyy/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/libyy/yy.c#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls1/Makefile#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls1/ttls1.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls2/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls2/ttls2.c#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#3 integrate

Differences ...

==== //depot/projects/kse/lib/libc/gen/tls.c#5 (text+ko) ====


==== //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/Makefile#4 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libxx/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libxx/xx.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libyy/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libyy/yy.c#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls1/Makefile#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls1/ttls1.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls2/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls2/ttls2.c#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/Makefile#2 (text+ko) ====

@@ -3,7 +3,7 @@
 all: ttls3
 
 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined
-CFLAGS+= -L${.CURDIR}/../../../../lib/libc -lc
+CFLAGS+= -L${.CURDIR}/../../../../lib/libc -lc -lthr
 CFLAGS+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc
 CFLAGS+= -Wl,--rpath=${.OBJDIR}
 CFLAGS+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1

==== //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#3 (text+ko) ====



More information about the p4-projects mailing list