diff options
author | José Fonseca <jfonseca@titan.(none)> | 2007-09-28 17:17:11 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@titan.(none)> | 2007-09-28 18:18:50 +0100 |
commit | 59424e2d34b791100d7924069df261b8147c3bff (patch) | |
tree | 1bb0f88830270a31d1c40a1eb559a5b7caa0ba32 | |
parent | 8731e391f5a8bb45adb53242b0a473707c0c024c (diff) |
Update x86's static and profile configs.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | configs/linux-profile | 2 | ||||
-rw-r--r-- | configs/linux-x86-64-profile | 8 | ||||
-rw-r--r-- | configs/linux-x86-64-static | 5 | ||||
-rw-r--r-- | configs/linux-x86-profile | 8 | ||||
-rw-r--r-- | configs/linux-x86-static | 5 |
6 files changed, 27 insertions, 3 deletions
@@ -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 3efdcf5e057..e3895dd8bef 100644 --- 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 index 00000000000..6eb9c6844b3 --- /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 02574303a97..909965da368 100644 --- 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 index 00000000000..987b5f0cf9a --- /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 9915987da37..3b281e6685e 100644 --- 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 |