Update x86's static and profile configs.

diff --git a/Makefile b/Makefile
index 4f8cc20390310e5a12be493e8828e592076479f3..a058e9839fac47741dc9d8d4124a8de1dc1b9d16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -132,8 +132,10 @@ linux-x86-debug \
 linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
+linux-x86-64-profile \
 linux-x86-64-static \
 linux-x86-glide \
+linux-x86-profile \
 linux-x86-static \
 netbsd \
 openbsd \

diff --git a/configs/linux-profile b/configs/linux-profile
index 3efdcf5e057dbdb815e5f923544b1ecbaf87f28d..e3895dd8befd7782dc36c7883003eb17bb26378c 100644 (file)
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -4,5 +4,5 @@ include $(TOP)/configs/linux-static
 
 CONFIG_NAME = linux-profile
 
-OPT_FLAGS = -pg -g -O2 -DNDEBUG
+OPT_FLAGS = -pg -g -O2
 DEFINES += -DNDEBUG

diff --git a/configs/linux-x86-64-profile b/configs/linux-x86-64-profile
new file mode 100644 (file)
index 0000000..6eb9c68
--- /dev/null
+++ b/configs/linux-x86-64-profile
@@ -0,0 +1,8 @@
+# Configuration for profiling on Linux for 64-bit X86 (Opteron) with gprof
+
+include $(TOP)/configs/linux-x86-64-static
+
+CONFIG_NAME = linux-x86-64-profile
+
+OPT_FLAGS = -pg -g -O2
+DEFINES += -DNDEBUG

diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 02574303a9785b717c7ca6c2da72da2a00011123..909965da36878b58d7defe8521af108f574d0a8e 100644 (file)
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -19,5 +19,8 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+               -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \
                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

diff --git a/configs/linux-x86-profile b/configs/linux-x86-profile
new file mode 100644 (file)
index 0000000..987b5f0
--- /dev/null
+++ b/configs/linux-x86-profile
@@ -0,0 +1,8 @@
+# Configuration for profiling on Linux with x86 optimizations with gprof
+
+include $(TOP)/configs/linux-x86-static
+
+CONFIG_NAME = linux-x86-profile
+
+OPT_FLAGS = -pg -g -O2
+DEFINES += -DNDEBUG

diff --git a/configs/linux-x86-static b/configs/linux-x86-static
index 9915987da37a743d4c0f069d17acae7a0953d3d2..3b281e6685efc72604deb008b4b9d2e8150d363e 100644 (file)
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -19,5 +19,8 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+               -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \
                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm