From c3b5adaa9a7bdb7e61305c32e4991e3b38dab902 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Wed, 31 Oct 2007 10:33:20 -0700 Subject: configs: Always use -fPIC for shared libraries, never for static Mesa currently disables -fPIC for DRI on x86, but most Linux distros are re-enabling -fPIC for all DRI arches. Let's just do that here since that's normally what's wanted for shared libraries. Some justification: http://bugs.gentoo.org/show_bug.cgi?id=110840#c9 On the other hand, position-independent code is only necessary when building shared libraries, so disable it for the static cases. --- configs/linux-alpha-static | 1 + configs/linux-dri-x86 | 3 --- configs/linux-osmesa16-static | 1 + configs/linux-ppc-static | 1 + configs/linux-solo-x86 | 3 --- configs/linux-static | 1 + configs/linux-x86-64-static | 1 + configs/linux-x86-static | 1 + 8 files changed, 6 insertions(+), 6 deletions(-) (limited to 'configs') diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static index 08ec2d177e..53808d77ca 100644 --- a/configs/linux-alpha-static +++ b/configs/linux-alpha-static @@ -11,6 +11,7 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -static +PIC_FLAGS = # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86 index b196004e58..f9b164d27a 100644 --- a/configs/linux-dri-x86 +++ b/configs/linux-dri-x86 @@ -5,9 +5,6 @@ include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-x86 -# Unnecessary on x86, generally. -PIC_FLAGS = - # Add -m32 to CFLAGS: ARCH_FLAGS = -m32 diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static index 22f6851d32..0e0d1519f3 100644 --- a/configs/linux-osmesa16-static +++ b/configs/linux-osmesa16-static @@ -10,6 +10,7 @@ CXX = g++ CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE MKLIB_OPTIONS = -static +PIC_FLAGS = # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static index d0e168811f..3f3dc55643 100644 --- a/configs/linux-ppc-static +++ b/configs/linux-ppc-static @@ -5,6 +5,7 @@ include $(TOP)/configs/linux-ppc CONFIG_NAME = linux-ppc-static MKLIB_OPTIONS = -static +PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index 13cab37658..e37b9fb428 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -5,9 +5,6 @@ include $(TOP)/configs/linux-solo CONFIG_NAME = linux-solo-x86 -# Unnecessary on x86, generally. -PIC_FLAGS = - ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM ASM_SOURCES = $(X86_SOURCES) ASM_API = $(X86_API) diff --git a/configs/linux-static b/configs/linux-static index 45aefceece..2a77d4c4b7 100644 --- a/configs/linux-static +++ b/configs/linux-static @@ -5,6 +5,7 @@ include $(TOP)/configs/linux CONFIG_NAME = linux-static MKLIB_OPTIONS = -static +PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static index 4bb35ed859..06e6fc3650 100644 --- a/configs/linux-x86-64-static +++ b/configs/linux-x86-64-static @@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86-64 CONFIG_NAME = linux-x86-64-static MKLIB_OPTIONS = -static +PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/linux-x86-static b/configs/linux-x86-static index 33c131eb2b..2b6478b586 100644 --- a/configs/linux-x86-static +++ b/configs/linux-x86-static @@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86 CONFIG_NAME = linux-x86-static MKLIB_OPTIONS = -static +PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a -- cgit v1.2.3