summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2006-08-24 18:06:37 +0000
committerIan Romanick <idr@us.ibm.com>2006-08-24 18:06:37 +0000
commitce9767f863e7788d4ab0099404abce72399f0b2c (patch)
tree2a81681e418fc2ef5ae4fafa56b54bf2a4e02eba /configs
parent39f222a4217eb574fbd18ecb7786ffbd4228d03f (diff)
Make sure that _GNU_SOURCE is enabled in the linux configs that set
HAVE_POSIX_MEMALIGN. This eliminates a compiler warning. Also, clean up some crufty linux-sparc* configs.
Diffstat (limited to 'configs')
-rw-r--r--configs/linux3
-rw-r--r--configs/linux-sparc29
-rw-r--r--configs/linux-sparc514
-rw-r--r--configs/linux-ultrasparc14
4 files changed, 10 insertions, 50 deletions
diff --git a/configs/linux b/configs/linux
index 6736f14e0d..0d455ff46a 100644
--- a/configs/linux
+++ b/configs/linux
@@ -17,7 +17,8 @@ PIC_FLAGS = -fPIC
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
+ -D_BSD_SOURCE -D_GNU_SOURCE \
+ -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = -I/usr/X11R6/include
diff --git a/configs/linux-sparc b/configs/linux-sparc
index d9552e8d89..9925afc19b 100644
--- a/configs/linux-sparc
+++ b/configs/linux-sparc
@@ -1,30 +1,9 @@
# Configuration for Linux on Sparc
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
CONFIG_NAME = linux-sparc
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O2
-PIC_FLAGS = -fPIC
-
-DEFINES = -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-GLUT_CFLAGS = -fexceptions
-
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+#ASM_FLAGS = -DUSE_SPARC_ASM
+#ASM_SOURCES = $(SPARC_SOURCES)
+#ASM_API = $(SPARC_API)
diff --git a/configs/linux-sparc5 b/configs/linux-sparc5
index b55fffcca8..e8848d26ab 100644
--- a/configs/linux-sparc5
+++ b/configs/linux-sparc5
@@ -1,17 +1,7 @@
# Configuration for Linux on Sparc5
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-sparc
CONFIG_NAME = linux-sparc5
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-
+ARCH_FLAGS += -mcpu=ultrasparc
diff --git a/configs/linux-ultrasparc b/configs/linux-ultrasparc
index cffdd7e417..d6c838ed92 100644
--- a/configs/linux-ultrasparc
+++ b/configs/linux-ultrasparc
@@ -1,17 +1,7 @@
# Configuration for Linux on UltraSparc
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-sparc
CONFIG_NAME = linux-ultrasparc
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+ARCH_FLAGS += -mv8 -mtune=ultrasparc