[kaffe] CVS kaffe (robilad): resynced with GNU Classpath

Kaffe CVS cvs-commits at kaffe.org
Fri Dec 23 07:27:40 PST 2005


PatchSet 7034 
Date: 2005/12/23 15:17:16
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with GNU Classpath

2005-12-23  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/external/classpath: Resynched GNU Classpath.

Members: 
	ChangeLog:1.4553->1.4554 
	developers/resync-classpath.sh:1.5->1.6 
	libraries/javalib/external/classpath/ChangeLog:1.9->1.10 
	libraries/javalib/external/classpath/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/aclocal.m4:1.10->1.11 
	libraries/javalib/external/classpath/config.sub:1.9->1.10 
	libraries/javalib/external/classpath/configure:1.13->1.14 
	libraries/javalib/external/classpath/doc/Makefile.in:1.7->1.8 
	libraries/javalib/external/classpath/doc/hacking.info:1.3->1.4 
	libraries/javalib/external/classpath/doc/vmintegration.info:1.3->1.4 
	libraries/javalib/external/classpath/doc/api/Makefile.in:1.7->1.8 
	libraries/javalib/external/classpath/examples/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/external/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.9->1.10 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.9->1.10 
	libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/gnu/java/nio/charset/Provider.java:1.1->1.2 
	libraries/javalib/external/classpath/gnu/xml/stream/SAXParser.java:1.3->1.4 
	libraries/javalib/external/classpath/gnu/xml/stream/XMLParser.java:1.3->1.4 
	libraries/javalib/external/classpath/include/Makefile.am:1.1->1.2 
	libraries/javalib/external/classpath/include/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/javax/swing/JInternalFrame.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/JLayeredPane.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/UIDefaults.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java:1.3->1.4 
	libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTextUI.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/plaf/basic/BasicTreeUI.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/text/AbstractDocument.java:1.3->1.4 
	libraries/javalib/external/classpath/javax/swing/text/DefaultEditorKit.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/text/DefaultStyledDocument.java:1.4->1.5 
	libraries/javalib/external/classpath/javax/swing/text/JTextComponent.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/text/StyleContext.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/text/html/BlockView.java:1.2->1.3 
	libraries/javalib/external/classpath/javax/swing/text/html/CSSParser.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/HTMLEditorKit.java:1.6->1.7 
	libraries/javalib/external/classpath/javax/swing/text/html/StyleSheet.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/tree/DefaultTreeModel.java:1.2->1.3 
	libraries/javalib/external/classpath/lib/Makefile.in:1.13->1.14 
	libraries/javalib/external/classpath/native/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/native/jawt/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/target/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/target/Linux/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/resource/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/resource/gnu/regexp/MessagesBundle_it.properties:1.9->1.10 
	libraries/javalib/external/classpath/scripts/Makefile.in:1.9->1.10 
	libraries/javalib/external/classpath/scripts/classpath.spec.in:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4553 kaffe/ChangeLog:1.4554
--- kaffe/ChangeLog:1.4553	Fri Dec 23 11:41:54 2005
+++ kaffe/ChangeLog	Fri Dec 23 15:17:16 2005
@@ -1,3 +1,7 @@
+2005-12-23  Dalibor Topic  <robilad at kaffe.org>
+
+        * libraries/javalib/external/classpath: Resynched GNU Classpath.
+
 2005-12-23  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/boehm-gc/boehm: Upgraded to Boehm-GC 6.6
Index: kaffe/developers/resync-classpath.sh
diff -u kaffe/developers/resync-classpath.sh:1.5 kaffe/developers/resync-classpath.sh:1.6
--- kaffe/developers/resync-classpath.sh:1.5	Wed Dec 14 12:31:38 2005
+++ kaffe/developers/resync-classpath.sh	Fri Dec 23 15:17:18 2005
@@ -63,7 +63,7 @@
 
 echo "Copying all files from classpath's CVS"
 for i in `cat ${WORKDIR}/new_file_list`; do
-    cp -f ${WORKDIR}/build/classpath-*/${i} ${i};
+    cp -pf ${WORKDIR}/build/classpath-*/${i} ${i};
 done
 
 )
Index: kaffe/libraries/javalib/external/classpath/ChangeLog
diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.9 kaffe/libraries/javalib/external/classpath/ChangeLog:1.10
--- kaffe/libraries/javalib/external/classpath/ChangeLog:1.9	Mon Dec 19 22:41:53 2005
+++ kaffe/libraries/javalib/external/classpath/ChangeLog	Fri Dec 23 15:17:19 2005
@@ -1,3 +1,293 @@
+2005-12-23  Chris Burdess  <dog at gnu.org>
+
+	* gnu/xml/stream/SAXParser.java,
+	  gnu/xml/stream/XMLParser.java: Interim commit during W3C XML
+	  conformance testing.
+
+2005-12-22  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/JInternalFrame.java
+	(show): Removed call moveToFront. Listeners already call
+	toFront, which calls moveToFront.
+	* javax/swing/JLayeredPane.java
+	(setPosition): Positions are assigned from the "front" 
+	to the "back", and drawn from the back towards the front. Added
+	a loop to swap all the components, so they are in the correct 
+	layer.
+
+2005-12-22  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/text/DefaultStyledDocument.java:
+	(ElementBuffer.insertContentTag): Get the attributes from the tag. 
+	Return early if direction is JoinNextDirection but there is no next 
+	Element.  
+	(createDefaultRoot): Don't call createBranchElement here just 
+	instantiate a new BranchElement.
+	(insertUpdate): Removed unneeded fields newElement, newElement2.  When
+	building the buffer ElementSpecs, no need to check each time if we 
+	should join to the previous or next Element, just check the first and
+	last ElementSpecs after the buffer has been completely built.
+
+2005-12-22  Tom Tromey  <tromey at redhat.com>
+
+	* .externalToolBuilders/ClasspathJar.launch: New file.
+	* .project: Updated.
+
+2005-12-21  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added focusInputMaps for
+	Button, CheckBox, EditorPane, List, Slider, TabbedPane,
+	ToggleButton, Tree. Also, removed TODO comments that
+	dealt with icons. BasicLookAndFeel does not have icons.
+
+2005-12-22  Mark Wielaard  <mark at klomp.org>
+
+	* gnu/java/nio/charset/Provider.java (provider): Wrap initialization
+	of standard provider in a PrivilegedAction.
+	
+2005-12-21  Lillian Angel  <langel at redhat.com>
+	
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added focus input map for
+	EditorPane. Removed keyBindings.
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(createKeyMap): Added check to prevent NPE.
+
+2005-12-21  Lillian Angel  <langel at redhat.com>
+
+	PR classpath/25517
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added focus map for FormattedTextField. Mauve
+	test updated for this.
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(createKeyMap): Fixed to get key bindings from the input map. There
+	is not .keyBindings default in BasicL&F (same with the JDK).
+	(installKeyBoardActions): Removed unneeded code.	
+
+2005-12-21  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Typo in mauve test. Reverted last patch.
+
+2005-12-21  Mark Wielaard  <mark at klomp.org>
+
+	* include/Makefile.am: Rename gnu_java_awt_peer_gtk_CairoGraphics.h
+	to gnu_java_awt_peer_gtk_GdkGraphics2D.h.
+
+2005-12-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+	* .project: Add ClasspathHeaders.launch.
+	* .externalToolBuilders/Autogen.launch: Run automatically when
+	Makefile.am or configure.ac is updated.
+	* .externalToolBuilders/CompileNative.launch: Run automatically.
+	* .externalToolBuilders/Configure.launch: Run automatically when
+	top-level Makefile.in changes.
+	* include/Makefile.am (CLASSDIR): New variable.  Replace lib
+	references with $(CLASSDIR).
+	* .externalToolBuilders/ClasspathHeaders.launch: New builder.
+
+2005-12-21  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Fixed key binding for TextField.focusInputMap.
+
+2005-12-21  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/text/DefaultEditorKit.java:
+	(read): Changed the call to insertString to leave out the trailing
+	new line.
+
+2005-12-21  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/UIDefaults.java
+	(createValue): Added check in. Bind might be an instance of KeyStroke.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Changed key bindings for PasswordField, TextArea,
+	TextPane, TextField to be instances of KeyStroke.
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(installKeyBoardActions): Added call to replace textComponent's top-level
+	action map to parentActionMap. Also, removed unneeded code.
+
+2005-12-21  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/text/DefaultStyledDocument.java:
+	(insertUpdate): If the AttributeSet argument is null use an empty 
+	AttributeSet for comparisons. No need to create a new LeafElement to 
+	compare AttributeSets (ie - remove the hack added yesterday).
+	* javax/swing/text/StyleContext.java:
+	(SmallAttributeSet.isEqual): Don't return false for null arguments, 
+	this should throw an NPE instead.  Also, for performance, check that
+	sizes are equal and one set contains the other, rather than checking 
+	that each set contains the other.
+
+2005-12-20  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added all key bindings for PasswordField
+	focusInputMap.
+
+2005-12-20  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/UIDefaults.java:
+	(LazyInputMap): InputMap should be an InputMapUIResource.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added all key bindings for Text*.
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(installKeyboardActions): Fixed call to replaceUIActionMap
+	to create a new ActionMap from textComponent's actions. Prevents
+	an infinite loop. Fixed loop to set the parentActionMap and the 
+	parentInputMap.
+	(ActionListenerProxy): Removed. No longer needed.
+	(convertModifiers): Likewise.
+	(creatActionMap): New function creates the action map to
+	be installed on the text component.
+
+2005-12-20  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initComponentDefaults): Added focusInputMap added
+	for PasswordField.
+	* javax/swing/text/JTextComponent.java
+	(allKeys): Fixed to prevent NPE.
+
+2005-12-20  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicLookAndFeel.java
+	(initClassDefaults): Fixed typo.
+	(initComponentDefaults): Removed keyBindings defaults for
+	Text*. Added focusInputMap for Text*.
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(installKeyBoardActions): Added code to load the focusInputMap
+	and install all the actions for each key.
+	(ActionListenerProxy): New class implemented.
+	(converModifiers): New method to convert the modifiers.
+	(getActionMap): Removed function. Not needed.
+	(createActionMap): Likewise.
+	* javax/swing/text/JTextComponent.java
+	(JTextComponent): Removed code to load the keymap.
+
+2005-12-20  Lillian Angel <langel at redhat.com>
+	
+	* javax/swing/text/DefaultEditorKit.java:
+	Added implementation for beginLineAction and
+	endLineAction.
+	* javax/swing/text/JTextComponent.java
+	(JTextComponent): Added key bindings for HOME and END.
+
+2005-12-20  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/plaf/basic/BasicTreeUI.java
+	(pathWasExpanded): Removed unneeded revalidate call.
+	(pathWasCollapsed): Likewise.
+	(installUI): Fixed to check for null root.
+	(paint): Fixed to always update path.
+	(toggleExpandState): Removed call to update path.
+	(editingStopped): Likewise.
+	(editingCanceled): Likewise.
+	(treeStructureChanged): Likewise.
+	(treeExpanded): Likewise.
+	(treeCollapsed): Likewise.
+	(treeNodesChanged): Likewise.	
+	(treeNodesInserted): Likewise.
+	(treeNodesRemoved): Likewise.
+	(updateCurrentVisiblePath): Added check for null root. If root is null,
+	nothing should be painted or in the path.
+	* javax/swing/tree/DefaultTreeModel.java
+	(setRoot): Root can be null.
+
+2005-12-20  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	Fixes bug #25506
+	* javax/swing/text/AbstractDocument.java:
+	(insertString): Fire insert update whether the DocumentEvent was
+	changed or not.
+
+2005-12-20  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/text/DefaultStyledDocument.java:
+	(ElementBuffer.insertContentTag): If the direction is 
+	OriginateDirection split all the time, don't check the attribute sets.
+	Removed the special case for the first insertion.  These cases should
+	fall under the direction JoinPreviousDirection. Changed the comments to
+	reflect this.
+	(insertUpdate): Added a hack to get the right result when comparing
+	the attributes of the new ElementSpec to the attributes of either
+	the previous or next Element.
+
+2005-12-19  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/CSSParser.java
+	(CSSParser): Initialized tokenBuffer with some
+	arbitrary size. This makes append much more efficent since
+	a new array will not been created with each append.
+	(append): Fixed append to create a new larger array if
+	needed.
+	(nextToken): Finished implemented. Should decrease the
+	tokenBufferLength if an identifier was read. This way " and '
+	are not added to the buffer.
+	(parse): Implemented to call the appropriate parsing function
+	based on parameter.
+	(getNextStatement): Implemented.
+	(parseAtRule): Added some helpful comments for implementing.
+	(parseRuleSet): Likewise.
+	(parseIdentifiers): Likewise.
+	(readComment): Likewise.
+	* javax/swing/text/html/StyleSheet.java
+	(addRule): Implemented.
+	(loadRules): Implemented.
+	(importStyleSheet): Removed implementation for now. It causes
+	a loop. Added FIXME
+	(startRule): Implemented.
+	(handleProperty): Implemented.
+	(addSelector): Implemented.
+
+2005-12-19  Lillian Angel  <langel at redhat.com>
+
+	* javax/swing/text/html/BlockView.java
+	(getStyleSheet): Implemented.
+	* javax/swing/text/html/CSSParser.java: New private class,
+	partially implemented.
+	* javax/swing/text/html/HTMLEditorKit.java
+	(createDefaultDocument): Fixed to create HTMLDocument with
+	default style sheet.
+	(getStyleSheet): Fixed to initialize style sheet if null.
+	* javax/swing/text/html/StyleSheet.java
+	(CssParser): New private inner class, partially implemented.
+
+2005-12-19  Anthony Balkissoon  <abalkiss at redhat.com>
+
+	* javax/swing/text/DefaultStyledDocument.java:
+	(endOffset): New field.
+	(ElementBuffer.insert): If length is 0 return early.  Set the endOffset
+	variable here.
+	(ElementBuffer.insertContentTag): Added special case for when insertion
+	covers entire range of the current Element.  Replaced (offset + length)
+	with endOffset everywhere.  Added checks to see if the insertion has 
+	the same attributes as the surrounding Element(s), in which case we
+	don't split them, we join them.
+	(SectionElement.getName): Return the field SectionElementName instead 
+	of hardcoding a return value.
+	(getLogicalStyle): As the specs require, if the attributes from the 
+	resolve parent aren't of type Style, return null.
+	(setCharacterAttributes): Exit early if length is 0.  Obtain a 
+	write lock for the body of this method.  Changed the way we iterate
+	through the paragraphs to be more efficient and more intuitive.  Added
+	AttributeUndoableEdits to the DocumentEvent and fired the 
+	UndoableEditUpdate.
+	(setLogicalStyle): Return early if the Element is null.  Obtain a write
+	lock for the body of this method.  Fire the appropriate DocumentEvent.
+	(setParagraphAttributes): Changed the way we iterated through the 
+	paragraphs because it was incorrect and unintuitive.  Obtained a write
+	lock within a try/finally block.  Added AttributeUndoableEdits to the 
+	DocumentEvent and fired the event.
+	(insertUpdate): Changed the way we iterate because we cannot assume 
+	the Segment holds the characters starting from index 0.  Give the 
+	startTag the same attributes as the paragraph.  Removed the useless
+	offset += len line because len is 0.
+	(printElements): New temporary debugging method.
+	(attributeSetsAreSame): New method.
+
 2005-12-19  Dalibor Topic  <robilad at kaffe.org>
 
 	* native/fdlibm/mprec.h (DEBUG): Include stdlib.h for
Index: kaffe/libraries/javalib/external/classpath/Makefile.in
diff -u kaffe/libraries/javalib/external/classpath/Makefile.in:1.9 kaffe/libraries/javalib/external/classpath/Makefile.in:1.10
--- kaffe/libraries/javalib/external/classpath/Makefile.in:1.9	Tue Dec 20 16:28:39 2005
+++ kaffe/libraries/javalib/external/classpath/Makefile.in	Fri Dec 23 15:17:19 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Index: kaffe/libraries/javalib/external/classpath/aclocal.m4
diff -u kaffe/libraries/javalib/external/classpath/aclocal.m4:1.10 kaffe/libraries/javalib/external/classpath/aclocal.m4:1.11
--- kaffe/libraries/javalib/external/classpath/aclocal.m4:1.10	Tue Dec 20 16:28:39 2005
+++ kaffe/libraries/javalib/external/classpath/aclocal.m4	Fri Dec 23 15:17:19 2005
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -13,7 +13,8 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 47 AC_PROG_LIBTOOL
+# Debian $Rev: 214 $
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +124,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +144,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,7 +164,6 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -183,17 +183,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-_LT_CC_BASENAME([$compiler])
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -234,56 +232,11 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -356,15 +309,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -533,7 +486,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -584,22 +537,6 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -631,7 +568,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -641,10 +578,8 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     # So say no if there are warnings
+     if test ! -s conftest.err; then
        $2=yes
      fi
    fi
@@ -670,16 +605,11 @@
    LDFLAGS="$LDFLAGS $3"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
+     # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
      else
        $2=yes
      fi
@@ -738,55 +668,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
+ *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
 	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -812,7 +698,7 @@
 
 
 # _LT_AC_CHECK_DLFCN
-# ------------------
+# --------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -820,7 +706,7 @@
 
 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
+# ------------------------------------------------------------------
 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
@@ -886,19 +772,17 @@
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
-  else
-    puts (dlerror ());
 
     exit (status);
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    (./conftest; exit; ) 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
+      x$lt_unknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -910,7 +794,7 @@
 
 
 # AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
+# -------------------
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
@@ -981,7 +865,7 @@
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -994,7 +878,7 @@
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      LDFLAGS="$LDFLAGS $link_static_flag"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_AC_TRY_DLOPEN_SELF(
@@ -1042,7 +926,7 @@
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -1054,13 +938,11 @@
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+     if test ! -s out/conftest.err; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   chmod u+w .
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -1124,8 +1006,8 @@
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1292,7 +1174,7 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi[[45]]*)
+bsdi4*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1320,8 +1202,7 @@
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -1351,7 +1232,7 @@
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -1374,7 +1255,7 @@
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -1409,17 +1290,8 @@
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -1437,19 +1309,14 @@
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+  *) # from 3.2 on
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
   esac
   ;;
 
@@ -1469,7 +1336,7 @@
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case $host_cpu in
+  case "$host_cpu" in
   ia64*)
     shrext_cmds='.so'
     hardcode_into_libs=yes
@@ -1509,18 +1376,6 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -1580,7 +1435,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1593,6 +1448,18 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -1642,13 +1509,8 @@
 
 openbsd*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
+  need_version=yes
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -1686,6 +1548,13 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1711,7 +1580,7 @@
   need_version=yes
   ;;
 
-sysv4 | sysv4.3*)
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -1744,29 +1613,6 @@
   fi
   ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no

*** Patch too long, truncated ***




More information about the kaffe mailing list