remove internationalization

3 files changed, 4 insertions, 19 deletions

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index c3ade07..fd70644 100755
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -112,7 +112,7 @@ HFILES = alloca-conf.h
 # (alphabetical), and add them to REQUIRED_OFILES or funcs in
 # configure.in.
 CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \
-	bzero.c choose-temp.c clock.c concat.c cplus-dem.c fdmatch.c \
+	bzero.c choose-temp.c clock.c concat.c fdmatch.c \
 	fnmatch.c getcwd.c getopt.c getopt1.c getpagesize.c \
 	getruntime.c floatformat.c hex.c index.c insque.c memchr.c \
 	memcmp.c memcpy.c memmove.c memset.c mkstemp.c objalloc.c obstack.c \
@@ -123,7 +123,7 @@ CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \
 	waitpid.c xatexit.c xexit.c xmalloc.c xstrdup.c xstrerror.c
 
 # These are always included in the library.
-REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o \
+REQUIRED_OFILES = argv.o choose-temp.o concat.o \
   fdmatch.o fnmatch.o getopt.o getopt1.o getruntime.o hex.o \
   floatformat.o mkstemp.o objalloc.o obstack.o pexecute.o spaces.o \
   splay-tree.o strerror.o strsignal.o xatexit.o xexit.o xmalloc.o \
@@ -222,7 +222,6 @@ basename.o: $(INCDIR)/libiberty.h
 choose-temp.o: config.h
 clock.o: config.h
 concat.o: $(INCDIR)/libiberty.h
-cplus-dem.o: config.h $(INCDIR)/demangle.h
 fdmatch.o: $(INCDIR)/libiberty.h
 fnmatch.o: config.h $(INCDIR)/fnmatch.h
 getcwd.o: config.h
diff --git a/libiberty/getopt.c b/libiberty/getopt.c
index c41531e..ec5dc43 100755
--- a/libiberty/getopt.c
+++ b/libiberty/getopt.c
@@ -80,14 +80,7 @@
 #endif
 
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  define _(msgid)	gettext (msgid)
-# else
-#  define _(msgid)	(msgid)
-# endif
+#define _(msgid)	(msgid)
 #endif
 
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
diff --git a/libiberty/obstack.c b/libiberty/obstack.c
index bc318b3..f2fbb25 100755
--- a/libiberty/obstack.c
+++ b/libiberty/obstack.c
@@ -451,14 +451,7 @@ _obstack_memory_used (h)
 
 /* Define the error handler.  */
 #ifndef _
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  ifndef _
-#   define _(Str) gettext (Str)
-#  endif
-# else
-#  define _(Str) (Str)
-# endif
+#define _(Str) (Str)
 #endif
 
 static void