|
From: <sv...@va...> - 2006-12-28 17:42:13
|
Author: sewardj
Date: 2006-12-28 17:42:06 +0000 (Thu, 28 Dec 2006)
New Revision: 6454
Log:
Merge r6452 (Avoid name clash on ppc64-linux.)
Modified:
branches/VALGRIND_3_2_BRANCH/perf/tinycc.c
Modified: branches/VALGRIND_3_2_BRANCH/perf/tinycc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/perf/tinycc.c 2006-12-28 06:52:27 UTC (r=
ev 6453)
+++ branches/VALGRIND_3_2_BRANCH/perf/tinycc.c 2006-12-28 17:42:06 UTC (r=
ev 6454)
@@ -1572,7 +1572,7 @@
#define R_PPC_SECTOFF_HI 35
#define R_PPC_SECTOFF_HA 36
/* Keep this the last entry. */
-#define R_PPC_NUM 37
+#define R_PPC_NUMm 37
=20
/* The remaining relocs are from the Embedded ELF ABI, and are not
in the SVR4 ELF ABI. */
|