Changeset 762

Timestamp:

Sep 30, 2003, 8:18:11 PM (22 years ago)

Author:

bird

Message:

Re-did the external/communal 'G' hack.

File:

• trunk/src/gcc/gcc/dbxout.c (modified) (2 diffs, 1 prop)

trunk/src/gcc/gcc/dbxout.c

@@ -2318 +2318 @@
           current_sym_code = N_GSYM;
 #ifdef EMX
-          /* bird: This is hacks for two things. The first part, to use the
-             value of a 'G', is intended to help resolving global symbols
-             when the variable name isn't equal to the assembler name. f.ex.:
+          /* bird: Two hacks.
+             1) Get right address for globals. We're using the value field of
+                the entry for this. This makes the following code work:
                 class foo { foo() {static const char *psz= "foo";} };
-             The 2nd hack is for external symbols, which we need debug info for
-             on EMX due to HLL conversion. In that case we need to find the
-             variable somehow and generates a special alias symbol for it.
-             The alias is a pretty unique name which includes the string
-             '$hll$' which is what we'll look for. ld accept multiple
-             definitions of aliases so it's not really a problem there. The
-             value of these 'G' stabs are always -12357.  */
+             2) Hack 1 doesn't work for external or communal data. They would
+                both require a fixup of the stabs value to work - which a.out
+                naturally doesn't support (ELF does though).
+                So, what we'll do is to make an extra entry before the 'G'
+                entry which tells us the symbol name.
+                In this case the value of the 'G' entry is -12357.  */
           if (use_gnu_debug_info_extensions)
             {
@@ -2334 +2333 @@
               if (DECL_EXTERNAL (decl) || DECL_COMMON (decl))
                 {
-                  struct timeval tv;
-                  /* We'll make a special alias for the external and .comm
-                     symbol which the a.out -> omf copy will detect.
-                     Todo: This should really be _after_ the symbol. */
-                  dbxout_symbol_name (decl, suffix, letter);
-                  gettimeofday(&tv, NULL);
-                  fprintf (asmfile, "$hll$%s$%lx%08lx\",%d,0,0,0\n",
-                           DECL_EXTERNAL (decl) ? "ext" : "comm",
-                           tv.tv_sec, tv.tv_usec, /*N_INDR | N_EXT*/11);
                   fprintf (asmfile, "\t.stabs\t\"");
                   output_addr_const (asmfile, current_sym_addr);
-                  fprintf (asmfile, "\",%d,0,0,0\n", /*N_EXT*/ 1);
+#if 0
+                  fprintf (asmfile, "\",%d,0,0,0\n", /*N_EXT | N_UNDF*/1);
+#else
+                  fprintf (asmfile, "\",%d,0,0,0\n", /*extension*/ 0xfe);
+#endif
                   current_sym_addr = 0;
                   current_sym_value = -12357;