Take LINKER_FREEBSD_VERSION from numerical field after dash

[dim]

Summary

With COMPILER_FREEBSD_VERSION, we use a numeric value that we bump each
time we make a change that requires re-bootstrapping, but with the
linker variant, we instead take the entire part after "FreeBSD", as in
this example version output:

LLD 9.0.1 (FreeBSD c1a0a213378a458fbea1a5c77b315c7dce08fd05-1300006) (compatible with GNU linkers)

E.g., LINKER_FREEBSD_VERSION is currently being set to
"c1a0a213378a458fbea1a5c77b315c7dce08fd05-1300006". This means that
*any* new upstream lld version will cause re-bootstrapping.

We should only look at the numerical field we append after a dash
instead. This review attempts to make it so.

The only thing I am not happy about is the post-processing of awk output
in Makefile.inc1. I notice that our awk does not have gensub(), so it
can't substitute a numbered sub-regex with \1, \2, etc. Suggestions
welcome. :)

head/Makefile.inc1

 
 static int
 nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol)
 {
         int ret = ENODEV;
 
 #ifdef ARM_INTRNG
-        ret = intr_irq_config(irq, trig, pol);
+        device_printf(dev, "bus_config_intr is obsolete and not supported!\n");
+        ret = EOPNOTSUPP;
 #else
         if (arm_config_irq)
                 ret = (*arm_config_irq)(irq, trig, pol);
 #endif
         return (ret);
 }
 
 static int
 nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
     driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep)
 {
+#ifndef ARM_INTRNG
         int irq;
+#endif
 
         if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
                 flags |= INTR_EXCL;
 
-        for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
 #ifdef ARM_INTRNG
-                intr_irq_add_handler(child, filt, intr, arg, irq, flags,
-                    cookiep);
+        return(intr_setup_irq(child, res, filt, intr, arg, flags, cookiep));
 #else
+        for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
                 arm_setup_irqhandler(device_get_nameunit(child),
                     filt, intr, arg, irq, flags, cookiep);
                 arm_unmask_irq(irq);
-#endif
         }
         return (0);
+#endif
 }
 
 static int
 nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
 {
 
 #ifdef ARM_INTRNG
-        return (intr_irq_remove_handler(child, rman_get_start(r), ih));
+        return (intr_teardown_irq(child, r, ih));
 #else
         return (arm_remove_irqhandler(rman_get_start(r), ih));
 #endif
 }
 
 #ifdef ARM_INTRNG
 static int
 nexus_describe_intr(device_t dev, device_t child, struct resource *irq,
     void *cookie, const char *descr)
 {
 
-        return (intr_irq_describe(rman_get_start(irq), cookie, descr));
+        return (intr_describe_irq(child, irq, cookie, descr));
 }
 
 #ifdef SMP
 static int
 nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
 {
 
-        return (intr_irq_bind(rman_get_start(irq), cpu));
+        return (intr_bind_irq(child, irq, cpu));
 }
 #endif
 #endif
 
 static int
 nexus_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {

head/share/mk/bsd.linker.mk

 
 static int
 nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol)
 {
         int ret = ENODEV;
 
 #ifdef ARM_INTRNG
-        ret = intr_irq_config(irq, trig, pol);
+        device_printf(dev, "bus_config_intr is obsolete and not supported!\n");
+        ret = EOPNOTSUPP;
 #else
         if (arm_config_irq)
                 ret = (*arm_config_irq)(irq, trig, pol);
 #endif
         return (ret);
 }
 
 static int
 nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
     driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep)
 {
+#ifndef ARM_INTRNG
         int irq;
+#endif
 
         if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
                 flags |= INTR_EXCL;
 
-        for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
 #ifdef ARM_INTRNG
-                intr_irq_add_handler(child, filt, intr, arg, irq, flags,
-                    cookiep);
+        return(intr_setup_irq(child, res, filt, intr, arg, flags, cookiep));
 #else
+        for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
                 arm_setup_irqhandler(device_get_nameunit(child),
                     filt, intr, arg, irq, flags, cookiep);
                 arm_unmask_irq(irq);
-#endif
         }
         return (0);
+#endif
 }
 
 static int
 nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
 {
 
 #ifdef ARM_INTRNG
-        return (intr_irq_remove_handler(child, rman_get_start(r), ih));
+        return (intr_teardown_irq(child, r, ih));
 #else
         return (arm_remove_irqhandler(rman_get_start(r), ih));
 #endif
 }
 
 #ifdef ARM_INTRNG
 static int
 nexus_describe_intr(device_t dev, device_t child, struct resource *irq,
     void *cookie, const char *descr)
 {
 
-        return (intr_irq_describe(rman_get_start(irq), cookie, descr));
+        return (intr_describe_irq(child, irq, cookie, descr));
 }
 
 #ifdef SMP
 static int
 nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
 {
 
-        return (intr_irq_bind(rman_get_start(irq), cpu));
+        return (intr_bind_irq(child, irq, cpu));
 }
 #endif
 #endif
 
 static int
 nexus_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {