summaryrefslogtreecommitdiffstats
path: root/backends
diff options
context:
space:
mode:
authorRoland McGrath <[email protected]>2005-12-08 01:35:42 +0000
committerRoland McGrath <[email protected]>2005-12-08 01:35:42 +0000
commitd804e72cf0b39827289d2d08a74fa12e0d8a39b9 (patch)
tree5906ca97604d4424fc3e99d9f5fd23871e37fd7e /backends
parent55984a8685c08e3158d5b9432878abf8dcc7ddf9 (diff)
2005-12-07 Roland McGrath <[email protected]>
* ecp.c (main): Use elf_end to clean up.
Diffstat (limited to 'backends')
-rw-r--r--backends/ChangeLog4
-rw-r--r--backends/common-reloc.c11
2 files changed, 5 insertions, 10 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog
index 2c05737b..defd725f 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,7 +1,3 @@
-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 b1805373..0575e131 100644
--- a/backends/common-reloc.c
+++ b/backends/common-reloc.c
@@ -14,12 +14,11 @@
#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 (RELOC_PREFIX, name)
-#define R_NAME_1(prefix, type) R_NAME_2 (prefix, type)
-#define R_NAME_2(prefix, type) #prefix #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 (R_TYPE (name))
+#define R_NAME_1(type) #type
#define RELOC_TYPES STRINGIFIED_PASTE (BACKEND, reloc.def)
#define STRINGIFIED_PASTE(a, b) STRINGIFY (PASTE (a, b))