X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libobjc%2FMakefile.in;h=46c8540701086c3f83b0df3c07dd1d300c9fe05a;hb=a929b39aa32a6bc65158bd8e32ce96bc1c906065;hp=e91fff716a10ef76af869f11802bb040b2c219d8;hpb=4f570b66f187078ecf074830b0c56d29030e7a8a;p=gcc.git

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index e91fff716a1..46c85407010 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -1,6 +1,5 @@
 # Makefile for GNU Objective C runtime library.
-# Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1993-2020 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -32,7 +31,7 @@ VPATH = @glibcpp_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 target_noncanonical = @target_noncanonical@
-gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
 host_subdir = @host_subdir@
 top_srcdir = @top_srcdir@
 multi_basedir = @multi_basedir@
@@ -48,8 +47,6 @@ extra_ldflags_libobjc = @extra_ldflags_libobjc@
 
 top_builddir = .
 
--include ../boehm-gc/threads.mk
-
 libdir = $(exec_prefix)/lib
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
 
@@ -75,8 +72,10 @@ RANLIB = @RANLIB@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
+XCFLAGS = @XCFLAGS@
 WARN_CFLAGS = -W -Wall -Wwrite-strings -Wstrict-prototypes
-ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(WARN_CFLAGS) \
+ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) \
+	$(XCFLAGS) $(CFLAGS) $(WARN_CFLAGS) \
 	-DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing -fexceptions
 
 # Libtool
@@ -96,11 +95,13 @@ LIBTOOL_CLEAN   = $(LIBTOOL) --mode=clean
 OBJC_GCFLAGS=@OBJC_GCFLAGS@
 OBJC_BOEHM_GC=@OBJC_BOEHM_GC@
 OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@
-OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)
+OBJC_BOEHM_GC_LIBS=@OBJC_BOEHM_GC_LIBS@
 
 INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \
   -I$(srcdir)/$(MULTISRCTOP)../gcc/config \
   -I$(MULTIBUILDTOP)../../$(host_subdir)/gcc \
+  -I$(srcdir)/$(MULTISRCTOP)../libgcc \
+  -I$(MULTIBUILDTOP)../libgcc \
   -I$(srcdir)/$(MULTISRCTOP)../include \
   $(OBJC_BOEHM_GC_INCLUDES)
 
@@ -117,39 +118,11 @@ OBJC_H = \
   NXConstStr.h \
   Object.h \
   Protocol.h \
-  encoding.h \
   message.h \
-  objc-api.h \
   objc-decls.h \
   runtime.h \
   thr.h
 
-# User-visible header files containing deprecated APIs, from the
-# objc/deprecated directory
-OBJC_DEPRECATED_H = \
-  METHOD_NULL.h \
-  MetaClass.h \
-  Object.h \
-  Protocol.h \
-  objc_get_uninstalled_dtable.h \
-  objc_malloc.h \
-  objc_msg_sendv.h \
-  objc_object_alloc.h \
-  objc_unexpected_exception.h \
-  objc_valloc.h \
-  struct_objc_category.h \
-  struct_objc_class.h \
-  struct_objc_ivar.h \
-  struct_objc_ivar_list.h \
-  struct_objc_method.h \
-  struct_objc_method_list.h \
-  struct_objc_module.h \
-  struct_objc_protocol.h \
-  struct_objc_protocol_list.h \
-  struct_objc_selector.h \
-  struct_objc_static_instances.h \
-  struct_objc_symtab.h
-
 # Objective-C source files to compile
 OBJC_SOURCE_FILES = \
    NXConstStr.m \
@@ -268,16 +241,14 @@ sendmsg_gc.lo: sendmsg.c runtime-info.h
 # These files have separate rules because they require special
 # compiler flags.
 
-# -Wno-deprecated-declarations is to silence warnings from using 
-# _objc_unexpected_exception.
 exception.lo: exception.c
 	$(LIBTOOL_COMPILE) $(CC) $< -c \
-	   $(ALL_CFLAGS) $(INCLUDES) -fexceptions -Wno-deprecated-declarations \
+	   $(ALL_CFLAGS) $(INCLUDES) -fexceptions \
 	   -o $@
 
 exception_gc.lo: exception.c
 	$(LIBTOOL_COMPILE) $(CC) $< -c \
-	   $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -fexceptions -Wno-deprecated-declarations \
+	   $(ALL_CFLAGS) $(INCLUDES) $(OBJC_GCFLAGS) -fexceptions \
 	   -o $@
 
 doc: info dvi pdf html
@@ -322,10 +293,12 @@ aclocal_deps = \
 	$(srcdir)/../config/multi.m4 \
 	$(srcdir)/../config/override.m4 \
 	$(srcdir)/../config/proginstall.m4 \
+	$(srcdir)/../config/toolexeclibdir.m4 \
 	$(srcdir)/../ltoptions.m4 \
 	$(srcdir)/../ltsugar.m4 \
 	$(srcdir)/../ltversion.m4 \
 	$(srcdir)/../lt~obsolete.m4 \
+	$(srcdir)/../config/cet.m4 \
 	$(srcdir)/acinclude.m4
 
 $(srcdir)/configure: @MAINT@ configure.ac $(srcdir)/aclocal.m4
@@ -354,11 +327,6 @@ install-headers:
 	  realfile=$(srcdir)/objc/$${file}; \
 	  $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc; \
 	done
-	$(multi_basedir)/mkinstalldirs $(DESTDIR)$(libsubdir)/$(includedirname)/objc/deprecated
-	for file in $(OBJC_DEPRECATED_H); do \
-	  realfile=$(srcdir)/objc/deprecated/$${file}; \
-	  $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/$(includedirname)/objc/deprecated; \
-	done
 
 check uninstall install-strip dist installcheck installdirs: