Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 545190
Collapse All | Expand All

(-)a/build/linux.gcc.inc (-31 / +7 lines)
Lines 32-43 Link Here
32
EXPORT_KEY = -Wl,--version-script,
32
EXPORT_KEY = -Wl,--version-script,
33
LIBDL = -ldl
33
LIBDL = -ldl
34
34
35
CPLUS = g++
35
CPLUS := $(CXX)
36
CONLY = gcc
36
CONLY := $(CC)
37
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
37
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
38
LIBS += -lpthread -lrt
38
LIBS += -lpthread -lrt
39
LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
39
LINK_FLAGS = -Wl,-rpath-link=. -rdynamic
40
C_FLAGS = $(CPLUS_FLAGS)
40
C_FLAGS := $(CPLUS_FLAGS)
41
# gcc 4.4 and higher support -std=c++0x
41
# gcc 4.4 and higher support -std=c++0x
42
ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[4-9]|[5-9])"))
42
ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[4-9]|[5-9])"))
43
    CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
43
    CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X
Lines 54-60 Link Here
54
endif
54
endif
55
55
56
ifeq ($(cfg), release)
56
ifeq ($(cfg), release)
57
        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
57
        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
58
endif
58
endif
59
ifeq ($(cfg), debug)
59
ifeq ($(cfg), debug)
60
        CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
60
        CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
Lines 74-97 Link Here
74
74
75
ifeq (intel64,$(arch))
75
ifeq (intel64,$(arch))
76
    ITT_NOTIFY = -DDO_ITT_NOTIFY
76
    ITT_NOTIFY = -DDO_ITT_NOTIFY
77
    CPLUS_FLAGS += -m64 $(RTM_KEY)
77
    CPLUS_FLAGS += $(RTM_KEY)
78
    LIB_LINK_FLAGS += -m64
79
endif
78
endif
80
79
81
ifeq (ia32,$(arch))
80
ifeq (ia32,$(arch))
82
    ITT_NOTIFY = -DDO_ITT_NOTIFY
81
    ITT_NOTIFY = -DDO_ITT_NOTIFY
83
    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
82
    CPLUS_FLAGS += $(RTM_KEY)
84
    LIB_LINK_FLAGS += -m32
85
endif
86
87
ifeq (ppc64,$(arch))
88
    CPLUS_FLAGS += -m64
89
    LIB_LINK_FLAGS += -m64
90
endif
91
92
ifeq (ppc32,$(arch))
93
    CPLUS_FLAGS += -m32
94
    LIB_LINK_FLAGS += -m32
95
endif
83
endif
96
84
97
ifeq (bg,$(arch))
85
ifeq (bg,$(arch))
Lines 99-110 Link Here
99
    CONLY = mpicc
87
    CONLY = mpicc
100
endif
88
endif
101
89
102
# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
103
ifeq (sparc,$(arch))
104
    CPLUS_FLAGS    += -mcpu=v9 -m64
105
    LIB_LINK_FLAGS += -mcpu=v9 -m64
106
endif
107
108
# automatically generate "IT" instructions when compiling for Thumb ISA
90
# automatically generate "IT" instructions when compiling for Thumb ISA
109
ifeq (armv7,$(arch))
91
ifeq (armv7,$(arch))
110
    CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
92
    CPLUS_FLAGS    += -Wa,-mimplicit-it=thumb
Lines 113-125 Link Here
113
#------------------------------------------------------------------------------
95
#------------------------------------------------------------------------------
114
# Setting assembler data.
96
# Setting assembler data.
115
#------------------------------------------------------------------------------
97
#------------------------------------------------------------------------------
116
ASM = as
98
ASM := $(AS)
117
ifeq (intel64,$(arch))
118
    ASM_FLAGS += --64
119
endif
120
ifeq (ia32,$(arch))
121
    ASM_FLAGS += --32
122
endif
123
ifeq ($(cfg),debug)
99
ifeq ($(cfg),debug)
124
    ASM_FLAGS += -g
100
    ASM_FLAGS += -g
125
endif
101
endif
(-)a/build/FreeBSD.gcc.inc (-14 / +4 lines)
Lines 27-40 Link Here
27
WARNING_KEY = -Wall
27
WARNING_KEY = -Wall
28
DYLIB_KEY = -shared
28
DYLIB_KEY = -shared
29
29
30
CPLUS = g++ 
30
CPLUS = $(CXX)
31
CONLY = gcc
31
CONLY = $(CC)
32
LIB_LINK_FLAGS = -shared
32
LIB_LINK_FLAGS = -shared
33
LIBS = -lpthread 
33
LIBS = -lpthread 
34
C_FLAGS = $(CPLUS_FLAGS)
34
C_FLAGS = $(CPLUS_FLAGS)
35
35
36
ifeq ($(cfg), release)
36
ifeq ($(cfg), release)
37
        CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD
37
        CPLUS_FLAGS = -g -DUSE_PTHREAD
38
endif
38
endif
39
ifeq ($(cfg), debug)
39
ifeq ($(cfg), debug)
40
        CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
40
        CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD
Lines 51-72 Link Here
51
    CPLUS_FLAGS += $(PIC_KEY)
51
    CPLUS_FLAGS += $(PIC_KEY)
52
endif 
52
endif 
53
53
54
ifeq (intel64,$(arch))
55
    CPLUS_FLAGS += -m64
56
    LIB_LINK_FLAGS += -m64
57
endif 
58
59
ifeq (ia32,$(arch))
60
    CPLUS_FLAGS += -m32
61
    LIB_LINK_FLAGS += -m32
62
endif 
63
64
#------------------------------------------------------------------------------
54
#------------------------------------------------------------------------------
65
# Setting assembler data.
55
# Setting assembler data.
66
#------------------------------------------------------------------------------
56
#------------------------------------------------------------------------------
67
ASSEMBLY_SOURCE=$(arch)-gas
57
ASSEMBLY_SOURCE=$(arch)-gas
68
ifeq (ia64,$(arch))
58
ifeq (ia64,$(arch))
69
    ASM=as
59
    ASM=$(AS)
70
    TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
60
    TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o
71
    MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
61
    MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o
72
endif 
62
endif 
(-)a/build/linux.clang.inc (-23 / +3 lines)
Lines 31-45 Link Here
31
EXPORT_KEY = -Wl,--version-script,
31
EXPORT_KEY = -Wl,--version-script,
32
LIBDL = -ldl
32
LIBDL = -ldl
33
33
34
CPLUS = clang++
34
CPLUS := $(CXX)
35
CONLY = clang
35
CONLY := $(CC)
36
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
36
LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
37
LIBS += -lpthread -lrt
37
LIBS += -lpthread -lrt
38
LINK_FLAGS = -Wl,-rpath-link=.
38
LINK_FLAGS = -Wl,-rpath-link=.
39
C_FLAGS = $(CPLUS_FLAGS)
39
C_FLAGS = $(CPLUS_FLAGS)
40
40
41
ifeq ($(cfg), release)
41
ifeq ($(cfg), release)
42
        CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
42
        CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD
43
endif
43
endif
44
ifeq ($(cfg), debug)
44
ifeq ($(cfg), debug)
45
        CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
45
        CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
Lines 61-84 Link Here
61
61
62
ifeq (intel64,$(arch))
62
ifeq (intel64,$(arch))
63
    ITT_NOTIFY = -DDO_ITT_NOTIFY
63
    ITT_NOTIFY = -DDO_ITT_NOTIFY
64
    CPLUS_FLAGS += -m64
65
    LIB_LINK_FLAGS += -m64
66
endif
64
endif
67
65
68
ifeq (ia32,$(arch))
66
ifeq (ia32,$(arch))
69
    ITT_NOTIFY = -DDO_ITT_NOTIFY
67
    ITT_NOTIFY = -DDO_ITT_NOTIFY
70
    CPLUS_FLAGS += -m32 -march=pentium4
71
    LIB_LINK_FLAGS += -m32
72
endif
73
74
ifeq (ppc64,$(arch))
75
    CPLUS_FLAGS += -m64
76
    LIB_LINK_FLAGS += -m64
77
endif
78
79
ifeq (ppc32,$(arch))
80
    CPLUS_FLAGS += -m32
81
    LIB_LINK_FLAGS += -m32
82
endif
68
endif
83
69
84
ifeq (bg,$(arch))
70
ifeq (bg,$(arch))
Lines 90-101 Link Here
90
# Setting assembler data.
76
# Setting assembler data.
91
#------------------------------------------------------------------------------
77
#------------------------------------------------------------------------------
92
ASM = as
78
ASM = as
93
ifeq (intel64,$(arch))
94
    ASM_FLAGS += --64
95
endif
96
ifeq (ia32,$(arch))
97
    ASM_FLAGS += --32
98
endif
99
ifeq ($(cfg),debug)
79
ifeq ($(cfg),debug)
100
    ASM_FLAGS += -g
80
    ASM_FLAGS += -g
101
endif
81
endif

Return to bug 545190