Add D.U.M.A., the Electric Fence successor.
2 wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/m68k/dl-machine.h.diff?r1=1.53&r2=1.55&cvsroot=glibc'
6 In file included from dynamic-link.h:21,
8 ../sysdeps/m68k/dl-machine.h:108: error: parse error before '.' token
9 ../sysdeps/m68k/dl-machine.h:109: error: stray '@' in program
10 ../sysdeps/m68k/dl-machine.h:120: error: syntax error at '#' token
11 ../sysdeps/m68k/dl-machine.h:123: error: stray '\' in program
12 ../sysdeps/m68k/dl-machine.h:123: error: missing terminating " character
13 ../sysdeps/m68k/dl-machine.h:148: error: stray '@' in program
14 ../sysdeps/m68k/dl-machine.h:152: error: syntax error at '#' token
15 ../sysdeps/m68k/dl-machine.h:156: error: stray '@' in program
16 ../sysdeps/m68k/dl-machine.h:161: error: stray '@' in program
17 ../sysdeps/m68k/dl-machine.h:163: error: stray '@' in program
18 ../sysdeps/m68k/dl-machine.h:166: error: stray '@' in program
19 In file included from dynamic-link.h:21,
21 ../sysdeps/m68k/dl-machine.h:175:4: invalid preprocessing directive #Call
22 ../sysdeps/m68k/dl-machine.h:179: error: stray '@' in program
23 ../sysdeps/m68k/dl-machine.h:180: error: stray '@' in program
24 ../sysdeps/m68k/dl-machine.h:181: error: syntax error at '#' token
25 ../sysdeps/m68k/dl-machine.h:182: error: syntax error at '#' token
26 ../sysdeps/m68k/dl-machine.h:184: error: stray '@' in program
27 ../sysdeps/m68k/dl-machine.h:187: error: missing terminating ' character
28 ../sysdeps/m68k/dl-machine.h:190: error: missing terminating " character
29 dl-load.c: In function `_dl_map_object_from_fd':
30 dl-load.c:1089: warning: use of cast expressions as lvalues is deprecated
31 dl-load.c:1089: warning: use of cast expressions as lvalues is deprecated
32 dl-load.c:1109: warning: use of cast expressions as lvalues is deprecated
33 dl-load.c:1109: warning: use of cast expressions as lvalues is deprecated
34 make[2]: *** [/home/dank/wk/crosstool-0.28-rc24/build/m68k-unknown-linux-gnu/gcc-3.4.0-glibc-2.2.5/build-glibc/elf/dl-load.o] Error 1
36 ===================================================================
37 RCS file: /cvs/glibc/libc/sysdeps/m68k/dl-machine.h,v
38 retrieving revision 1.53
39 retrieving revision 1.55
41 --- libc/sysdeps/m68k/dl-machine.h 2001/08/26 22:26:36 1.53
42 +++ libc/sysdeps/m68k/dl-machine.h 2002/02/01 10:28:20 1.55
44 /* Machine-dependent ELF dynamic relocation inline functions. m68k version.
45 - Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
46 + Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
47 This file is part of the GNU C Library.
49 The GNU C Library is free software; you can redistribute it and/or
52 got[2] = (Elf32_Addr) &_dl_runtime_profile;
54 - if (_dl_name_match_p (_dl_profile, l))
55 + if (_dl_name_match_p (GL(dl_profile), l))
57 /* This is the object we are looking for. Say that we really
58 want profiling and the timers are started. */
59 - _dl_profile_map = l;
60 + GL(dl_profile_map) = l;
65 /* This code is used in dl-runtime.c to call the `fixup' function
66 and then redirect to the address it returns. */
67 #define TRAMPOLINE_TEMPLATE(tramp_name, fixup_name) \
68 -"| Trampoline for " #fixup_name "
69 - .globl " #tramp_name "
70 - .type " #tramp_name ", @function
72 - | Save %a0 (struct return address) and %a1.
75 - | Call the real address resolver.
76 - jbsr " #fixup_name "
77 - | Restore register %a0 and %a1.
82 - | Call real function.
84 +"| Trampoline for " #fixup_name "\n\
85 + .globl " #tramp_name "\n\
86 + .type " #tramp_name ", @function\n\
88 + | Save %a0 (struct return address) and %a1.\n\
89 + move.l %a0, -(%sp)\n\
90 + move.l %a1, -(%sp)\n\
91 + | Call the real address resolver.\n\
92 + jbsr " #fixup_name "\n\
93 + | Restore register %a0 and %a1.\n\
94 + move.l (%sp)+, %a1\n\
95 + move.l (%sp)+, %a0\n\
98 + | Call real function.\n\
100 .size " #tramp_name ", . - " #tramp_name "\n"
102 #define ELF_MACHINE_RUNTIME_TRAMPOLINE \
103 @@ -143,50 +143,50 @@
104 its return value is the user program's entry point. */
106 #define RTLD_START asm ("\
109 - .type _start,@function
116 - .globl _dl_start_user
117 - .type _dl_start_user,@function
119 - | Save the user entry point address in %a4.
121 - | Point %a5 at the GOT.
122 - lea _GLOBAL_OFFSET_TABLE_@GOTPC(%pc), %a5
123 - | Remember the highest stack address.
124 - move.l %sp, ([__libc_stack_end@GOT.w, %a5])
125 - | See if we were run as a command with the executable file
126 - | name as an extra leading argument.
127 - move.l ([_dl_skip_args@GOT.w, %a5]), %d0
128 - | Pop the original argument count
130 - | Subtract _dl_skip_args from it.
132 - | Adjust the stack pointer to skip _dl_skip_args words.
133 - lea (%sp, %d0*4), %sp
134 - | Push back the modified argument count.
136 - # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
140 - move.l ([_dl_loaded@GOT.w, %a5]), -(%sp)
141 - jbsr _dl_init@PLTPC
144 - | Pass our finalizer function to the user in %a1.
145 - move.l _dl_fini@GOT.w(%a5), %a1
146 - | Initialize %fp with the stack pointer.
148 - | Jump to the user's entry point.
150 - .size _dl_start_user, . - _dl_start_user
153 + .type _start,@function\n\
155 + move.l %sp, -(%sp)\n\
160 + .globl _dl_start_user\n\
161 + .type _dl_start_user,@function\n\
163 + | Save the user entry point address in %a4.\n\
165 + | Point %a5 at the GOT.\n\
166 + lea _GLOBAL_OFFSET_TABLE_@GOTPC(%pc), %a5\n\
167 + | Remember the highest stack address.\n\
168 + move.l %sp, ([__libc_stack_end@GOT.w, %a5])\n\
169 + | See if we were run as a command with the executable file\n\
170 + | name as an extra leading argument.\n\
171 + move.l ([_dl_skip_args@GOT.w, %a5]), %d0\n\
172 + | Pop the original argument count\n\
173 + move.l (%sp)+, %d1\n\
174 + | Subtract _dl_skip_args from it.\n\
176 + | Adjust the stack pointer to skip _dl_skip_args words.\n\
177 + lea (%sp, %d0*4), %sp\n\
178 + | Push back the modified argument count.\n\
179 + move.l %d1, -(%sp)\n\
180 + # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env)\n\
181 + pea 8(%sp, %d1*4)\n\
183 + move.l %d1, -(%sp)\n\
184 + move.l ([_rtld_global@GOT.w, %a5]), -(%sp)\n\
185 + jbsr _dl_init@PLTPC\n\
188 + | Pass our finalizer function to the user in %a1.\n\
189 + move.l _dl_fini@GOT.w(%a5), %a1\n\
190 + | Initialize %fp with the stack pointer.\n\
192 + | Jump to the user's entry point.\n\
194 + .size _dl_start_user, . - _dl_start_user\n\
197 /* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
201 if (sym->st_size > refsym->st_size
202 - || (sym->st_size < refsym->st_size && _dl_verbose))
203 + || (sym->st_size < refsym->st_size && GL(dl_verbose)))
205 extern char **_dl_argv;