This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

alpha-dec-osf4.0d port broken last two snapshots, simple patch


The alpha-dec-osf4.0d port has been broken the past two snapshots.
The problem is that /usr/include/elf_abi.h contains the following
line:

#define ELF_AR_STRTAB_NAME      "//"

which is converted to:

#define ELF_AR_STRTAB_NAME      "

This simple patch should fix it.  However, I don't have autogen
installed, thus this should be considered a speculative patch...

One strange thing: I couldn't find any change to inclhack.def around
that time that explicitly broke the alpha port two weeks ago.  How
long ago did // comment processing change?

--- gcc/fixinc/inclhack.def.bak	Tue Mar 30 01:01:22 1999
+++ gcc/fixinc/inclhack.def	Tue Mar 30 01:31:10 1999
@@ -318,16 +318,26 @@
 
  *  There is a similar problem with the VxWorks drv/netif/if_med.h file.
 
+ *  Now that we delete the // comments instead of converting them to / * * /,
+ *  traditional hacks like irix_bogus_cxx_cmnt, no longer work (which
+ *  strangely enough was also used on alpha-dec-osf4.0d).  If we skip the
+ *  hack whenever we see " / / ", then the need for the secondary hack
+ *  disappears.  Note: I don't know how to ensure that the first quote
+ *  exists, thus we just check for the trailing quote directly abutting
+ *  the //.  Note: We should never touch a line that has // completely
+ *  within quotes but this is somewhat hard to check for.
+
  *  And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
  */
 fix = {
     hackname = no_double_slash;
     test     = '-z "`echo ${file}|egrep \'++$|\.hh$|\.H$\'`"';
-    select = '//[^*]';
-    sed    = '/\/\/[^*]/' "s|//.*$||g";
+    select = '//[^"*]';
+    sed    = '/\/\/[^"*]/' "s|//.*$||g";
 };
 
 
+#IFDEF no_more
 /*
  *  Multiline comment after typedef on IRIX 4.0.1.
  */
@@ -341,6 +351,7 @@
      */
     sed      = 's@"/\*"\*/@"//"@';
 };
+#endif
 
 
 /*


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]