Fortran: Revert to non-multilib-specific ISO_Fortran_binding.h

[thirdparty/gcc.git] / libgfortran / Makefile.in

diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 6fc9bafe07ad729094e14373aff1e8e02f913cd6..a3cb6f4c5ca076bf8dd8ac1a903c68c64eeda91a 100644 (file)
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -725,7 +725,7 @@ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = $(srcdir)/gfortran.map
 @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.map-sun
 gfor_c_HEADERS = ISO_Fortran_binding.h
-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
+gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
            $(lt_host_flags)
 
@@ -7045,15 +7045,9 @@ fpu-target.inc: fpu-target.h $(srcdir)/libgfortran.h
 # Place ISO_Fortran_binding.h also under include/ in the build directory such
 # that it can be used for in-built-tree testsuite runs without interference of
 # other files in the build dir - like intrinsic .mod files or other .h files.
-ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding-1-tmpl.h \
-                      $(srcdir)/ISO_Fortran_binding-2-tmpl.h \
-                      $(srcdir)/ISO_Fortran_binding-3-tmpl.h \
-                      kinds.inc
+ISO_Fortran_binding.h: $(srcdir)/ISO_Fortran_binding.h
        -rm -f $@
-       cp $(srcdir)/ISO_Fortran_binding-1-tmpl.h $@
-       $(COMPILE) -E -dD $(srcdir)/ISO_Fortran_binding-2-tmpl.h \
-       | grep '^#define CFI_type' >> $@
-       cat $(srcdir)/ISO_Fortran_binding-3-tmpl.h >> $@
+       cp $(srcdir)/ISO_Fortran_binding.h $@
        $(MKDIR_P) include
        -rm -f include/ISO_Fortran_binding.h
        cp $@ include/ISO_Fortran_binding.h