On 10/04/2016 08:54 AM, Bernd Schmidt wrote:
On 10/04/2016 04:34 PM, Martin Sebor wrote:
I copied the conditional from config/linux.h but I admit I don't
fully understand when the macro is defined.
AFAICT it's done in config.gcc, for a limited set of targets.
Should I still remove it from targhooks.c?
That is compiled for all targets, not just for those which define the
macro, so yes.
Yes, the glibc and uclibc hooks are the same. I don't know what
the convention is for these target hooks (i.e., whether they are
expected to be duplicated across targets even if they are the
same to reduce the risk of breaking one target as a result of
changing another, or whether duplication should be avoided even
at this risk). From your comment it sounds like it should be
the latter and I'm okay with that.
There's arguments for both. In this particular case I don't see a strong
reason not to have a general hook available.
Sounds good. Attached is an updated patch reflecting these changes.
Restested by building the powerpc64-linux and tic6x-uclinux cross
toolchains. (Sharing the Glibc and uClibc implementation of the
target hook and defining it in targhooks.c also obviates the patch
I sent in for bug 77837 last night so it seems like a win-win.)
Martin
PR bootstrap/77819 - undefined reference to gnu_libc_printf_pointer_format with uClibc
gcc/ChangeLog:
PR bootstrap/77819
* config/linux.h (TARGET_PRINTF_POINTER_FORMAT): Define macro.
* config/linux.c (gnu_libc_printf_pointer_format): Remove.
* targhooks.c [DEFAULT_LIBC == LIBC_UCLIBC) && SINGLE_LIBC]
(default_printf_pointer_format): Define function.
* targhooks.c (linux_printf_pointer_format): Define new function.
* targhooks.h (linux_printf_pointer_format): Declare.
(gnu_libc_printf_pointer_format): Remove declaration.
diff --git a/gcc/config/linux.c b/gcc/config/linux.c
index 9aac38b..a393d3b 100644
--- a/gcc/config/linux.c
+++ b/gcc/config/linux.c
@@ -24,9 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "linux-protos.h"
-#undef TARGET_PRINTF_POINTER_FORMAT
-#define TARGET_PRINTF_POINTER_FORMAT gnu_libc_printf_pointer_format
-
bool
linux_libc_has_function (enum function_class fn_class)
{
@@ -40,16 +37,3 @@ linux_libc_has_function (enum function_class fn_class)
return false;
}
-
-/* Glibc formats pointers as if by "%zx" except for the null pointer
- which outputs "(nil)". It ignores the pound ('#') format flag but
- interprets the space and plus flags the same as in the integer
- directive. */
-
-const char*
-gnu_libc_printf_pointer_format (tree arg, const char **flags)
-{
- *flags = " +";
-
- return arg && integer_zerop (arg) ? "(nil)" : "%#zx";
-}
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
index 3ff005b..7211da2 100644
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -209,6 +209,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif
-/* The format string to which "%p" corresponds. */
+/* The format string to which "%p" corresponds (same in Glibc and
+ uClibc. */
#undef TARGET_PRINTF_POINTER_FORMAT
-#define TARGET_PRINTF_POINTER_FORMAT gnu_libc_printf_pointer_format
+#define TARGET_PRINTF_POINTER_FORMAT linux_printf_pointer_format
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index d75650f..c7977be 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1523,6 +1523,22 @@ default_printf_pointer_format (tree, const char **flags)
return "%zx";
}
+/* For Glibc and uClibc targets also define the hook here because
+ otherwise it would have to be duplicated in each target's .c file
+ (such as in bfin/bfin.c and c6x/c6x.c, etc.)
+ Glibc and uClibc format pointers as if by "%zx" except for the null
+ pointer which outputs "(nil)". It ignores the pound ('#') format
+ flag but interprets the space and plus flags the same as in the integer
+ directive. */
+
+const char*
+linux_printf_pointer_format (tree arg, const char **flags)
+{
+ *flags = " +";
+
+ return arg && integer_zerop (arg) ? "(nil)" : "%#zx";
+}
+
tree
default_builtin_tm_load_store (tree ARG_UNUSED (type))
{
diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index 3356f0a..afb1c00 100644
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -192,7 +192,7 @@ extern bool no_c99_libc_has_function (enum function_class);
extern bool gnu_libc_has_function (enum function_class);
extern const char* default_printf_pointer_format (tree, const char **);
-extern const char* gnu_libc_printf_pointer_format (tree, const char **);
+extern const char* linux_printf_pointer_format (tree, const char **);
extern const char* solaris_printf_pointer_format (tree, const char **);
extern tree default_builtin_tm_load_store (tree);
