Attachment 1301 Details for Bug 1843 – [FIXED_X11R68x] Patch for 2004-11-12-trunk

[patch] [FIXED_X11R68x] Patch for 2004-11-12-trunk

patch.gudiff (text/plain), 14.62 KB, created by Roland Mainz on 2004-11-12 20:37:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-11-12 20:37:38 UTC

Size: 14.62 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.523
>diff -u -2 -0 -r1.523 ChangeLog
>--- xc/ChangeLog	11 Nov 2004 15:45:26 -0000	1.523
>+++ xc/ChangeLog	13 Nov 2004 04:35:31 -0000
>@@ -1,20 +1,37 @@
>+2004-11-12 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/lib/GL/mesa/Imakefile
>+        * xc/lib/GL/mesa/math/Imakefile
>+        * xc/lib/GL/mesa/shader/Imakefile
>+        * xc/lib/GL/mesa/sparc/Imakefile
>+        * xc/lib/GL/mesa/swrast/Imakefile
>+        * xc/lib/GL/mesa/swrast_setup/Imakefile
>+        * xc/lib/GL/mesa/tnl/Imakefile
>+        * xc/lib/GL/mesa/tnl_dd/Imakefile
>+        Bugzilla #1843 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1843):
>+        Fix build failure in the linker stage of libOSMesa.so.4.0 which
>+        happens more or less every couple of months with the message
>+        "ld: fatal: too many symbols require `small' PIC references:
>+        have 2112, maximum 2048 -- recompile some modules -K PIC.".
>+        The fix is to add |#define LargePICTable YES| to _ALL_ relevant
>+        Imakefiles (previously this was done only on "on-demand" basis).
>+
> 2004-11-11  Matthieu Herrb  <matthieu.herrb@laas.fr>
> 
> 	* config/cf/OpenBSDLib.tmpl:
> 	update shared lib revisions on OpenBSD (Bug #1828).
> 	* config/cf/xorgsite.def:
> 	* config/cf/xprint_site.def:
> 	update references to xf86site.def in comments (Bug #1827).
> 	* programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c:
> 	(KbdGetMapping):
> 	* programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c: (KbdOn),
> 	(KbdOff), (WSReadInput), (OpenKeyboard), (xf86OSKbdPreInit):
> 	fix kbd driver for wskbd protocol and pure wscons console driver
> 	(Bug #1825).
> 	* programs/Xserver/hw/xfree86/xf86cfg/interface.c: (main):
> 	don't add '-4' to generated default file name (bug #1826).
> 	* programs/xdm/resource.c:
> 	typo in resource name (XFree86 bug #1300, X.org bug #1825)
> 
> 2004-11-10  Kristian Hoegsberg  <krh@redhat.com>
> 
>Index: xc/lib/GL/mesa/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,45 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
>+
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
> #define MesaX86BuildDir /**/
> ASM_SUBDIRS = x86
> #endif
> #ifdef SparcArchitecture
> #define MesaSparcBuildDir /**/
> ASM_SUBDIRS = sparc
> #endif
> #define MesaBuildDir /**/
> #define NeedToLinkMesaSrc
> 
> #ifdef UseCompaqMathLibrary
>  MATH_DEFINES = -DCCPML
> #endif
> 
>       DEFINES = $(ALLOC_DEFINES) GlxDefines \
>Index: xc/lib/GL/mesa/math/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/math/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/math/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/math/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,45 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
>+
> 
> #define MesaMathBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
> 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
>       ASM_DIR = x86
>      ASM_SRCS =
>      ASM_OBJS =
>Index: xc/lib/GL/mesa/shader/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/shader/Imakefile,v
>retrieving revision 1.1.3.2
>diff -u -2 -0 -r1.1.3.2 Imakefile
>--- xc/lib/GL/mesa/shader/Imakefile	16 Jun 2004 09:27:56 -0000	1.1.3.2
>+++ xc/lib/GL/mesa/shader/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,44 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
> 
> #define MesaShaderBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
> 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
>       ASM_DIR = x86
>      ASM_SRCS =
>      ASM_OBJS =
>Index: xc/lib/GL/mesa/sparc/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/sparc/Imakefile,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 Imakefile
>--- xc/lib/GL/mesa/sparc/Imakefile	19 Aug 2004 07:34:43 -0000	1.2
>+++ xc/lib/GL/mesa/sparc/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -8,40 +8,44 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #define MesaSPARCBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
>       DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
>      INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \
> 		-I$(MESASRCDIR)/src/SPARC \
> 		-I../../../include \
>                 -I$(MESASRCDIR)/include \
>                 -I$(GLXLIBSRC)/include \
>                 -I$(MESASRCDIR)/src/mesa \
>                 -I$(MESASRCDIR)/src/mesa/main \
>                 -I$(MESASRCDIR)/src/mesa/sparc \
>                 -I$(MESASRCDIR)/src/mesa/glapi
> 
>Index: xc/lib/GL/mesa/swrast/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/swrast/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/swrast/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/swrast/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,44 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
> 
> #define MesaSwrastBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
> 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
>       ASM_DIR = x86
>      ASM_SRCS =
>      ASM_OBJS =
>Index: xc/lib/GL/mesa/swrast_setup/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/swrast_setup/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/swrast_setup/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/swrast_setup/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,45 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
>+
> 
> #define MesaSwrastSetupBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
> 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
>       ASM_DIR = x86
>      ASM_SRCS =
>      ASM_OBJS =
> #if MesaUseMMX
>Index: xc/lib/GL/mesa/tnl/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/tnl/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/tnl/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/tnl/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,44 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
> 
> #define MesaTnlBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
> 		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> #if defined(i386Architecture) && MesaUseX86Asm
>       ASM_DIR = x86
>      ASM_SRCS =
>      ASM_OBJS =
>Index: xc/lib/GL/mesa/tnl_dd/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/mesa/tnl_dd/Imakefile,v
>retrieving revision 1.1.3.1
>diff -u -2 -0 -r1.1.3.1 Imakefile
>--- xc/lib/GL/mesa/tnl_dd/Imakefile	16 Jun 2004 09:25:10 -0000	1.1.3.1
>+++ xc/lib/GL/mesa/tnl_dd/Imakefile	13 Nov 2004 04:35:44 -0000
>@@ -9,40 +9,44 @@
>  *   BuildOSMesaLib
>  *
>  * In other cases, only the shared version is needed to link in to loadable
>  * driver modules.
>  */
> 
> #if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
> #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
> #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
> #define DoExtraLib SharedLibGlx
> #define DoDebugLib DebugLibGlx
> #define DoProfileLib ProfileLibGlx
> #else
> #define DoNormalLib SharedLibGlxWithoutPIC
> #define DoSharedLib !SharedLibGlxWithoutPIC
> #define DoExtraLib NO
> #define DoDebugLib NO
> #define DoProfileLib NO
> #endif
> 
>+/* Large PIC tables needed for Solaris SPARC builds */
>+#if (defined(SunArchitecture) && defined(SparcArchitecture))
>+# define LargePICTable YES
>+#endif
> 
> #define MesaTnlDdBuildDir /**/
> #define NeedToLinkMesaSrc
> #include "Imakefile.inc"
> 
> #if Malloc0ReturnsNull
> ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
> #endif
> 
> #if BuildXF86DRI
>   DRI_DEFINES = GlxDefines
>  DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
> 		-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
> 		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
> #endif
> 
> MESA_INCLUDES = -I$(MESASRCDIR)/src \
> 		-I$(MESASRCDIR)/src/math \
> 		-I$(MESASRCDIR)/src/tnl_dd \
> 		-I$(MESASRCDIR)/include \

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1843: 1301

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.