Lines 1-6
Link Here
|
1 |
--- SConstruct.orig 2021-04-29 23:06:52 UTC |
1 |
--- SConstruct.orig 2021-07-15 20:56:31 UTC |
2 |
+++ SConstruct |
2 |
+++ SConstruct |
3 |
@@ -1324,9 +1324,9 @@ if has_option('variables-help'): |
3 |
@@ -1328,9 +1328,9 @@ if has_option('variables-help'): |
4 |
print(env_vars.GenerateHelpText(env)) |
4 |
print(env_vars.GenerateHelpText(env)) |
5 |
Exit(0) |
5 |
Exit(0) |
6 |
|
6 |
|
Lines 13-19
Link Here
|
13 |
|
13 |
|
14 |
if get_option('install-action') != 'default' and get_option('ninja') != "disabled": |
14 |
if get_option('install-action') != 'default' and get_option('ninja') != "disabled": |
15 |
env.FatalError("Cannot use non-default install actions when generating Ninja.") |
15 |
env.FatalError("Cannot use non-default install actions when generating Ninja.") |
16 |
@@ -2498,7 +2498,7 @@ if env.TargetOSIs('posix'): |
16 |
@@ -2507,7 +2507,7 @@ if env.TargetOSIs('posix'): |
17 |
# If runtime hardening is requested, then build anything |
17 |
# If runtime hardening is requested, then build anything |
18 |
# destined for an executable with the necessary flags for PIE. |
18 |
# destined for an executable with the necessary flags for PIE. |
19 |
env.AppendUnique( |
19 |
env.AppendUnique( |
Lines 22-28
Link Here
|
22 |
PROGLINKFLAGS=['-pie'], |
22 |
PROGLINKFLAGS=['-pie'], |
23 |
) |
23 |
) |
24 |
|
24 |
|
25 |
@@ -2675,8 +2675,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs( |
25 |
@@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too |
26 |
# setting it for both C and C++ by setting both of CFLAGS and |
26 |
# setting it for both C and C++ by setting both of CFLAGS and |
27 |
# CXXFLAGS. |
27 |
# CXXFLAGS. |
28 |
|
28 |
|
Lines 36-38
Link Here
|
36 |
"i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, |
36 |
"i386" : { "-march=" : "nocona", "-mtune=" : "generic" }, |
37 |
"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, |
37 |
"ppc64le" : { "-mcpu=" : "power8", "-mtune=" : "power8", "-mcmodel=" : "medium" }, |
38 |
"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, |
38 |
"s390x" : { "-march=" : "z196", "-mtune=" : "zEC12" }, |
|
|
39 |
@@ -4520,7 +4524,8 @@ def doConfigure(myenv): |
40 |
myenv = conf.Finish() |
41 |
|
42 |
if env['TARGET_ARCH'] == "aarch64": |
43 |
- AddToCCFLAGSIfSupported(myenv, "-moutline-atomics") |
44 |
+ # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html |
45 |
+ AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics") |
46 |
|
47 |
conf = Configure(myenv) |
48 |
usdt_enabled = get_option('enable-usdt-probes') |