bpo-38960: DTrace build fix for FreeBSD. (GH-17451)

David Carlier · encukou · commit aabdeb766b7f · 2020-01-28T13:53:32.000+01:00
DTrace build fix for FreeBSD.

- allowing passing an extra flag as it need to define the arch size.
- casting some probe's arguments.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst
@@ -0,0 +1 @@
+Fix DTrace build issues on FreeBSD. Patch by David Carlier.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -5447,7 +5447,7 @@ dtrace_function_entry(PyFrameObject *f)
     funcname = PyUnicode_AsUTF8(f->f_code->co_name);
     lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
 
-    PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno);
+    PyDTrace_FUNCTION_ENTRY((char *)filename, (char *)funcname, lineno);
 }
 
 static void
@@ -5461,7 +5461,7 @@ dtrace_function_return(PyFrameObject *f)
     funcname = PyUnicode_AsUTF8(f->f_code->co_name);
     lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
 
-    PyDTrace_FUNCTION_RETURN(filename, funcname, lineno);
+    PyDTrace_FUNCTION_RETURN((char *)filename, (char *)funcname, lineno);
 }
 
 /* DTrace equivalent of maybe_call_line_trace. */
@@ -5493,7 +5493,7 @@ maybe_dtrace_line(PyFrameObject *frame,
         co_name = PyUnicode_AsUTF8(frame->f_code->co_name);
         if (!co_name)
             co_name = "?";
-        PyDTrace_LINE(co_filename, co_name, line);
+        PyDTrace_LINE((char *)co_filename, (char *)co_name, line);
     }
     *instr_prev = frame->f_lasti;
 }
diff --git a/Python/import.c b/Python/import.c
@@ -1762,14 +1762,14 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
     }
 
     if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
-        PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name));
+        PyDTrace_IMPORT_FIND_LOAD_START((char *)PyUnicode_AsUTF8(abs_name));
 
     mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
                                         &PyId__find_and_load, abs_name,
                                         interp->import_func, NULL);
 
     if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED())
-        PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name),
+        PyDTrace_IMPORT_FIND_LOAD_DONE((char *)PyUnicode_AsUTF8(abs_name),
                                        mod != NULL);
 
     if (import_time) {
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -204,7 +204,7 @@ PySys_Audit(const char *event, const char *argFormat, ...)
 
     /* Dtrace USDT point */
     if (dtrace) {
-        PyDTrace_AUDIT(event, (void *)eventArgs);
+        PyDTrace_AUDIT((char *)event, (void *)eventArgs);
     }
 
     /* Call interpreter hooks */
diff --git a/configure b/configure
@@ -11386,7 +11386,6 @@ $as_echo "$with_dtrace" >&6; }
 
 
 DTRACE=
-DFLAGS=
 DTRACE_HEADERS=
 DTRACE_OBJS=
 
@@ -11452,7 +11451,7 @@ if ${ac_cv_dtrace_link+:} false; then :
 else
               ac_cv_dtrace_link=no
             echo 'BEGIN{}' > conftest.d
-            "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
+            "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                 ac_cv_dtrace_link=yes
 
 fi
diff --git a/configure.ac b/configure.ac
@@ -3500,7 +3500,6 @@ AC_SUBST(DFLAGS)
 AC_SUBST(DTRACE_HEADERS)
 AC_SUBST(DTRACE_OBJS)
 DTRACE=
-DFLAGS=
 DTRACE_HEADERS=
 DTRACE_OBJS=
 
@@ -3521,7 +3520,7 @@ then
         [ac_cv_dtrace_link], [dnl
             ac_cv_dtrace_link=no
             echo 'BEGIN{}' > conftest.d
-            "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
+            "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                 ac_cv_dtrace_link=yes
       ])
     if test "$ac_cv_dtrace_link" = "yes"; then

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix DTrace build issues on FreeBSD. Patch by David Carlier.`
Original file line number	Diff line number	Diff line change
`@@ -5447,7 +5447,7 @@ dtrace_function_entry(PyFrameObject *f)`
`5447`	`5447`	`funcname = PyUnicode_AsUTF8(f->f_code->co_name);`
`5448`	`5448`	`lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);`
`5449`	`5449`
`5450`		`- PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno);`
	`5450`	`+ PyDTrace_FUNCTION_ENTRY((char )filename, (char )funcname, lineno);`
`5451`	`5451`	`}`
`5452`	`5452`
`5453`	`5453`	`static void`
`@@ -5461,7 +5461,7 @@ dtrace_function_return(PyFrameObject *f)`
`5461`	`5461`	`funcname = PyUnicode_AsUTF8(f->f_code->co_name);`
`5462`	`5462`	`lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);`
`5463`	`5463`
`5464`		`- PyDTrace_FUNCTION_RETURN(filename, funcname, lineno);`
	`5464`	`+ PyDTrace_FUNCTION_RETURN((char )filename, (char )funcname, lineno);`
`5465`	`5465`	`}`
`5466`	`5466`
`5467`	`5467`	`/* DTrace equivalent of maybe_call_line_trace. */`
`@@ -5493,7 +5493,7 @@ maybe_dtrace_line(PyFrameObject *frame,`
`5493`	`5493`	`co_name = PyUnicode_AsUTF8(frame->f_code->co_name);`
`5494`	`5494`	`if (!co_name)`
`5495`	`5495`	`co_name = "?";`
`5496`		`- PyDTrace_LINE(co_filename, co_name, line);`
	`5496`	`+ PyDTrace_LINE((char )co_filename, (char )co_name, line);`
`5497`	`5497`	`}`
`5498`	`5498`	`*instr_prev = frame->f_lasti;`
`5499`	`5499`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ PySys_Audit(const char event, const char argFormat, ...)`
`204`	`204`
`205`	`205`	`/* Dtrace USDT point */`
`206`	`206`	`if (dtrace) {`
`207`		`- PyDTrace_AUDIT(event, (void *)eventArgs);`
	`207`	`+ PyDTrace_AUDIT((char )event, (void )eventArgs);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/* Call interpreter hooks */`