Attachment 1267 Details for Bug 1815 – Prototype patch for 2004-11-09-trunk

[patch] Prototype patch for 2004-11-09-trunk

patch.gudiff (text/plain), 6.53 KB, created by Roland Mainz on 2004-11-09 19:42:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-11-09 19:42:26 UTC

Size: 6.53 KB

patch

obsolete

>Index: xc/config/cf/sun.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/sun.cf,v
>retrieving revision 1.10
>diff -u -2 -0 -r1.10 sun.cf
>--- xc/config/cf/sun.cf	8 Nov 2004 00:08:21 -0000	1.10
>+++ xc/config/cf/sun.cf	10 Nov 2004 03:21:05 -0000
>@@ -143,41 +143,43 @@
> 
> #endif /* HasSunC */
> 
> /* we used to have this here :
>  *
>  * #if HasSunC 
>  * # ifndef CCompilerMajorVersion
>  * #  define CCompilerMajorVersion 3
>  * #  define DefaultCDebugFlags	-xO3
>  * #  define OptimizedCDebugFlags	-xO3
>  * # endif
>  * #endif
>  */
> 
> #ifndef HasSunCplusplus
> # define HasSunCplusplus HasSunC	/* ??? */
> #endif
> #if HasSunCplusplus
> # ifndef HasCplusplus
> #  define HasCplusplus YES
>-#  define OptimizedCplusplusDebugFlags	-xO4 -xbuiltin=%all -xlibmil
>+#  ifndef OptimizedCplusplusDebugFlags
>+#   define OptimizedCplusplusDebugFlags	-xO4 -xbuiltin=%all -xlibmil
>+#  endif
> # endif
> # ifndef CplusplusCompilerMajorVersion
> #  ifdef DefaultSunProCplusplusCompilerMajorVersion
> #   define CplusplusCompilerMajorVersion DefaultSunProCplusplusCompilerMajorVersion
> #  else
> #   define CplusplusCompilerMajorVersion 3
> #  endif
> # endif
> # ifndef CplusplusCompilerMinorVersion
> #  ifdef DefaultSunProCplusplusCompilerMinorVersion
> #   define CplusplusCompilerMinorVersion DefaultSunProCplusplusCompilerMinorVersion
> #  else
> #   define CplusplusCompilerMinorVersion 0
> #  endif
> # endif
> XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
> #endif
> 
> /* we used to have this here :
>  *
>Index: xc/config/cf/sv4Lib.rules
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/sv4Lib.rules,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 sv4Lib.rules
>--- xc/config/cf/sv4Lib.rules	8 Nov 2004 00:08:21 -0000	1.4
>+++ xc/config/cf/sv4Lib.rules	10 Nov 2004 03:21:05 -0000
>@@ -11,41 +11,41 @@
> #endif
> #ifndef SharedDataSeparation
> # define SharedDataSeparation NO
> #endif
> #ifndef HasGcc2ForCplusplus
> # define HasGcc2ForCplusplus HasGcc2
> #endif
> #ifndef SharedCodeDef
> # define SharedCodeDef /**/
> #endif
> #ifndef SharedLibraryDef
> # define SharedLibraryDef /**/
> #endif
> #ifndef ShLibIncludeFile
> # define ShLibIncludeFile <sv4Lib.tmpl>
> #endif
> #ifndef SharedLibraryLdCmd
> # define SharedLibraryLdCmd $(LD)
> #endif
> #ifndef SharedLibraryLoadFlags
>-# define SharedLibraryLoadFlags -G -z text
>+# define SharedLibraryLoadFlags -G -z text OptimizedCDebugFlags
> #endif
> #ifndef PositionIndependentCFlags
> # if HasGcc2
> #  define PositionIndependentCFlags -fPIC
> # else
> #  define PositionIndependentCFlags -K PIC
> # endif
> #endif
> #ifndef PositionIndependentCplusplusFlags
> # if HasGcc2ForCplusplus
> #  define PositionIndependentCplusplusFlags -fPIC
> # else
> #  define PositionIndependentCplusplusFlags -K PIC
> # endif
> #endif
> #ifndef UseExportLists
> # define UseExportLists NO
> #endif
> #ifndef StripInstalledPrograms
> # define StripInstalledPrograms NO
>@@ -71,46 +71,46 @@
> 	MakeDir($(DESTDIR)dest)						@@\
> 	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
> 	@if $(SOSYMLINK); then (set -x; \				@@\
> 	  $(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
> 	  cd $(DESTDIR)dest; \						@@\
> 	  $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)); fi
> #endif
> 
> #endif /* InstallSharedLibrary */
> 
> /*
>  * InstallSharedLibraryData - generate rules to install the shared library data
>  */
> #ifndef InstallSharedLibraryData
> # define InstallSharedLibraryData(libname,rev,dest)
> #endif /* InstallSharedLibraryData */
> 
> #ifndef LinkWithExports
> # if UseExportLists
> #  define LinkWithExports(libname,rev,solist,down,up) \
>-	(cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))	@@\
>+	(cd down; $(CCENVSETUP) SharedLibraryLdCmd OptimizedCDebugFlags -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))	@@\
> 	if [ -f Concat(lib,libname.elist) ]; then \			@@\
> 	    $(RM) down/$@.exports $@.list; \				@@\
> 	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
> 	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
>-	    (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
>+	    (cd down; $(CCENVSETUP) SharedLibraryLdCmd OptimizedCDebugFlags -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
> 	    $(RM) down/$@.exports $@.list; \				@@\
> 	fi;
> # else
> #  define LinkWithExports(libname,rev,solist,down,up) \
> 	(cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
> # endif
> #endif
> 
> /*
>  * SharedLibraryTarget - generate rules to create a shared library;
>  * build it into a different name so that we do not hose people by having
>  * the library gone for long periods.
>  */
> #ifndef SharedLibraryTarget
> # define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
> AllTarget(Concat(lib,libname.so.rev))					@@\
> 									@@\
> Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
> 	$(RM) $@~							@@\
> 	LinkWithExports(libname,rev,solist,down,up)			@@\
>@@ -142,41 +142,41 @@
> 	@if $(SOSYMLINK); then (set -x; \				@@\
> 	  $(RM) Concat(lib,libname.so); \				@@\
> 	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
> 	LinkBuildLibrary($@)						@@\
> 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
> 									@@\
> clean::									@@\
> 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
> 
> #endif /* SharedDepLibraryTarget */
> 
> /*
>  * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
>  */
> #ifndef SharedDepCplusplusLibraryTarget
> #define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
> AllTarget(Concat(lib,libname.so.rev))					@@\
> 									@@\
> Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
> 	$(RM) $@~							@@\
>-	(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
>+	(cd down; $(CXX) OptimizedCplusplusDebugFlags -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
> 	$(RM) $@ 							@@\
> 	$(MV) $@~ $@							@@\
> 	LinkBuildLibrary($@)						@@\
> 									@@\
> clean::									@@\
> 	$(RM) Concat(lib,libname.so.rev)				
> #endif /* SharedDepCplusplusLibraryTarget */
> 
> 
> #ifndef SharedDepModuleTarget
> #define SharedDepModuleTarget(name,deps,solist)				@@\
> AllTarget(name)								@@\
> 									@@\
> name: deps								@@\
> 	$(RM) $@~							@@\
> 	SharedLibraryLdCmd -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
> 	$(RM) $@							@@\
> 	$(MV) $@~ $@							@@\
> 									@@\
> clean::									@@\

Actions: View | Splinter Review

Attachments on bug 1815: 1267

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.