summaryrefslogtreecommitdiffstats
path: root/backends
diff options
context:
space:
mode:
authorRoland McGrath <[email protected]>2005-12-12 00:04:33 +0000
committerRoland McGrath <[email protected]>2005-12-12 00:04:33 +0000
commitba72ab102a8ca35371072311379d2474f8ec674f (patch)
treeae3d29685a0d0e5a61df84cdbfe3b888af132fb3 /backends
parentf64a44262134500154f96c368a7d3d6e59f593c6 (diff)
merge of 9439e2a1c1530d75ff753bccf8e64bd1f560e60f
and c32e76fd50f8c65de92bccb5f68a19d91d1dedc9
Diffstat (limited to 'backends')
-rw-r--r--backends/ChangeLog4
-rw-r--r--backends/common-reloc.c11
2 files changed, 10 insertions, 5 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog
index defd725f..2c05737b 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-10 Ulrich Drepper
+
+ * common-reloc.c (R_NAME): Generate string correctly.
+
2005-12-05 Roland McGrath <[email protected]>
* i386_regs.c (i386_register_name): Use a table for the first 8 regs.
diff --git a/backends/common-reloc.c b/backends/common-reloc.c
index 0575e131..b1805373 100644
--- a/backends/common-reloc.c
+++ b/backends/common-reloc.c
@@ -14,11 +14,12 @@
#include "libebl_CPU.h"
#include <assert.h>
-#define R_TYPE(name) PASTE (RELOC_PREFIX, name)
-#define PASTE(a, b) PASTE_1 (a, b)
-#define PASTE_1(a, b) a##b
-#define R_NAME(name) R_NAME_1 (R_TYPE (name))
-#define R_NAME_1(type) #type
+#define R_TYPE(name) PASTE (RELOC_PREFIX, name)
+#define PASTE(a, b) PASTE_1 (a, b)
+#define PASTE_1(a, b) a##b
+#define R_NAME(name) R_NAME_1 (RELOC_PREFIX, name)
+#define R_NAME_1(prefix, type) R_NAME_2 (prefix, type)
+#define R_NAME_2(prefix, type) #prefix #type
#define RELOC_TYPES STRINGIFIED_PASTE (BACKEND, reloc.def)
#define STRINGIFIED_PASTE(a, b) STRINGIFY (PASTE (a, b))